From 2495e9ab75e6c45af1d6e14414711d8cc79fe2ca Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 30 五月 2023 16:13:13 +0800
Subject: [PATCH] 出入库优化-登记2
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 82 ++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 46 deletions(-)
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 c1396a9..88ab4fd 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
@@ -118,59 +118,44 @@
@Override
public String insertData(InoutData data) {
+ try {
+ data.setUpdateTime(new Date());
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
- // 鑾峰彇褰撳墠浠撳簱鐨勫疄闄呭簱瀛�
- if (StringUtils.isNotEmpty(data.getDepotId())) {
- if (null == data.getFoodYear() || null == data.getFoodType()) {
- Depot depot = commonService.getCacheDepot(data.getCompanyId(), data.getDepotId());
- if (null == data.getFoodYear()) {
- data.setFoodYear(depot.getFoodYear());
- }
- if (null == data.getFoodType()) {
- data.setFoodType(depot.getFoodType());
+ String id = this.createId(data.getRegisterTime(), data.getCompanyId());
+ if (StringUtils.isEmpty(data.getId())) {
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ data.setId("R_" + id);
+ } else if (InoutConstant.TYPE_OUT.equals(data.getType())) {
+ data.setId("C_" + id);
+ } else if (Constant.LOSS_OVER_OVER.equals(data.getType())) {
+ data.setId("R_" + id);
+ } else if (Constant.LOSS_OVER_LOSS.equals(data.getType())) {
+ data.setId("C_" + id);
+ } else {
+ data.setId("M_" + id);
}
}
- }
-
- if (null == data.getRegisterTime()) {
- data.setRegisterTime(new Date());
- }
-
- String id = this.createId(data.getRegisterTime(), data.getCompanyId());
-
- if (StringUtils.isEmpty(data.getId())) {
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
- data.setId("R_" + id);
- } else if (InoutConstant.TYPE_OUT.equals(data.getType())) {
- data.setId("C_" + id);
- } else if (Constant.LOSS_OVER_OVER.equals(data.getType())) {
- data.setId("R_" + id);
- } else if (Constant.LOSS_OVER_LOSS.equals(data.getType())) {
- data.setId("C_" + id);
- } else {
- data.setId("M_" + id);
+ if (StringUtils.isEmpty(data.getCheckId())) {
+ data.setCheckId(id);
}
- }
- if (StringUtils.isEmpty(data.getCheckId())) {
- data.setCheckId(id);
- }
- if (null == data.getDeptId()) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- if (null == data.getUserName()) {
- data.setUserName("");
- }
- inoutMapper.insertData(data);
+ if (null == data.getUserName()) {
+ data.setUserName("");
+ }
- // 濡傛灉涓嶆槸鎵嬪姩琛ュ綍鐨勬暟鎹紝娣诲姞鍒扮紦瀛樹腑
- if (!InoutConstant.RECORD_STATUS_ADD.equals(data.getRecordStatus())) {
+ inoutMapper.insertData(data);
+
this.addInoutCache(data);
+
+ } catch (Exception e) {
+ log.error("------------鍑哄叆搴撴墽琛屼繚瀛樺嚭閿�---{}", e);
+ return "鍚庡彴寮傚父锛�" + e.getMessage();
}
+
return null;
}
@@ -234,9 +219,9 @@
List<InoutData> records = inoutMapper.pageRecordData(page, param);
//鍒ゆ柇鍏ュ簱閲嶉噺鏄惁涓虹┖锛屼负绌哄垯璧嬪�肩粨绠楅噸閲�
- if(records != null){
+ if (records != null) {
for (InoutData record : records) {
- if(record.getRecordWeight() == null || record.getRecordWeight() == 0.0){
+ if (record.getRecordWeight() == null || record.getRecordWeight() == 0.0) {
record.setRecordWeight(record.getSettleWeight());
}
}
@@ -677,6 +662,11 @@
return result.getNumValue1();
}
+ @Override
+ public int checkExist(InoutParam param) {
+ return inoutMapper.checkExist(param);
+ }
+
/**
* 鏈畬鎴愭祦绋嬪瓨鍏ョ紦瀛�
*
--
Gitblit v1.9.3