From f46a102b5f5ab7e2c74c9d05f9d6e06c358b8c02 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 20:29:53 +0800
Subject: [PATCH] 优化出入库信息2
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 11 -----------
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 1 -
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 2 ++
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 13 +++++++++++--
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 11 +++--------
5 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index 4c26c08..a7629be 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -663,6 +663,8 @@
@RequestMapping("/submit-handle")
@Transactional
public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
+
+ log.debug("-------------submitHandle------------------");
return inoutManager.submitHandle(data);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 6296090..086f121 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -445,7 +445,6 @@
this.updateCheckItems(data, true);
}
-
return null;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 99927be..4a296b2 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -267,7 +267,6 @@
bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
"yyyy-MM-dd HH:mm:ss"));
bill.setSerId(data.getId());
-// bill.setSpecType(StringUtils.isEmpty(data.getSpecType()) ? "鏁ｇ伯" : data.getSpecType());
if ("5016".equals(data.getCompanyId())) {
bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
bill.setSerId(data.getId().substring(2));
@@ -275,7 +274,6 @@
}
//瀹㈡埛淇℃伅
- // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());
bill.setUserId(data.getUserId() == null ? "" : data.getUserId());
bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());
@@ -311,19 +309,10 @@
bill.setRecordWeight(data.getRecordWeight());
bill.setCheckStatus(data.getCheckStatus().equals(InoutConstant.STATUS_PASS) ? "鍚堟牸" : "涓嶅悎鏍�");
-// bill.setDeWet(data.getDeWet());
-// bill.setDeImpurity(data.getDeImpurity());
bill.setDeHandle(data.getDeHandle());
bill.setDeOther(data.getDeOther());
-// bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
bill.setSettleWeight(data.getSettleWeight());
-// if(data.getWet() != null && data.getWet() > 0){
-// bill.setWet(data.getWet() +"");
-// }
-// if(data.getImpurity() != null && data.getImpurity() > 0){
-// bill.setImpurity(data.getImpurity()+"");
-// }
bill.setPrice(data.getPrice() == null ? "" : data.getPrice() + "");
if (data.getSettleMoney() <= 0) {
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index ed3e4e3..0c5afad 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -152,9 +152,18 @@
data.setUserName("");
}
- inoutMapper.insertData(data);
+ InoutData newData;
+ if (EntityUtils.isEntity(data)) {
+ newData = new InoutData();
+ BeanUtils.copyProperties(data, newData, new String[]{"checkItems", "files"});
+ }else{
+ newData = data;
+ }
- updateInoutCache(data);
+ inoutMapper.insertData(newData);
+
+
+ updateInoutCache(newData);
} catch (Exception e) {
log.error("------------鍑哄叆搴撴墽琛屼繚瀛樺嚭閿�---{}", e);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index a73f04b..50a29a8 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -80,15 +80,10 @@
*/
@DataResolver
public String saveInoutData(InoutData data) throws Exception {
-
- //灏咲oradoEntity 杞崲涓烘櫘閫欵ntity
- InoutData newData = new InoutData();
- BeanUtils.copyProperties(data,newData);
-
- if (StringUtils.isEmpty(newData.getId())) {
- return inoutManager.addInoutData(newData);
+ if (StringUtils.isEmpty(data.getId())) {
+ return inoutManager.addInoutData(data);
} else {
- return inoutManager.updateInoutData(newData);
+ return inoutManager.updateInoutData(data);
}
}
--
Gitblit v1.9.3