From 7b5c179e17c9a106dcce3b2b0574af833cf97132 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 23 六月 2023 23:41:55 +0800
Subject: [PATCH] 测试入库流程质检 提交
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 864fa2a..b89eccf 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
@@ -208,7 +208,7 @@
//鏇存柊缂撳瓨
updateInoutCache(newData);
-
+
return null;
}
@@ -281,12 +281,15 @@
@Override
public String toComplete(InoutParam param) throws Exception {
+ param.setUpdateTime(new Date());
+
if (null == param.getCompanyId()) {
param.setCompanyId(ContextUtil.getDefaultCompanyId());
}
// 娓呴櫎缂撳瓨
this.delFromCache(param.getDeptId(), param.getType(), param.getId());
+
inoutMapper.toComplete(param);
@@ -365,8 +368,8 @@
} else {
setInoutCache(data.getDeptId(), data);
}
- //鎺ㄩ�佸ぇ灞�
- notifyToScreen(data.getCompanyId(), data.getDeptId(), data.getProgress());
+
+
}
@@ -487,7 +490,7 @@
public String addInoutDataByLossOver(InoutData data) {
// 鑾峰彇涓婁竴杞︾殑娴佹按鏁版嵁
- // InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId());
+ // InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId());
// // 璁剧疆娴佹按鐨勫簱瀛�
// if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {
@@ -719,6 +722,7 @@
}
int num = inoutCheckMapper.updateSampleData(data);
+
return null;
}
@@ -748,24 +752,22 @@
}
@Override
- public String updateCheckData(InoutCheckData data) {
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setCompanyId(ContextUtil.subDeptId(null));
- }
-
+ public String updateCheckData(InoutData data) {
+ data.setUpdateTime(new Date());
int num = inoutCheckMapper.updateCheckData(data);
+
+ //鏇存柊缂撳瓨
+ updateInoutCache(data);
+
return null;
}
@Override
public List<InoutPrice> getPrice(InoutCheckParam param) {
- if(null == param.getStart()){
+ if (null == param.getStart()) {
param.setStart(new Date());
}
- if(null == param.getEnd()){
+ if (null == param.getEnd()) {
param.setEnd(new Date());
}
return inoutCheckMapper.getPrice(param);
--
Gitblit v1.9.3