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-web/src/main/resources/static/admin/inout/in-check.js | 37 -------
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 153 +++++++++++++++---------------
igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java | 3
igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 2
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 6
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 23 ++--
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 29 ++---
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 1
igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java | 2
9 files changed, 110 insertions(+), 146 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
index b47276d..f72423d 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
@@ -83,7 +83,6 @@
checkStandardService.insertCheckItem(item);
}
}
-
return result;
}
}
\ No newline at end of file
diff --git a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
index 56819c7..7882336 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
@@ -38,7 +38,7 @@
/**
* 涓存椂缂撳瓨锛屽瓨鏀惧綋鍓嶇殑鍑哄叆搴撲俊鎭椂闂达紝鍑哄叆搴撶紦瀛樺彲鑳藉瓨鍦ㄤ袱澶╁畬鎴愮殑鎯呭喌锛屾椂闂磋皟鏁翠负48灏忔椂
*/
- public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60;
+ public static final long KEY_INOUT_LIST_TIME = 72 * 60 * 60;
/**
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 8c1031d..4c26c08 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
@@ -690,6 +690,19 @@
return inoutManager.submitComplete(data);
}
+
+ /**
+ * 璐ㄦ椤甸潰鎻愪氦
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-check")
+ @Transactional
+ public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data)throws Exception {
+ return inoutManager.submitCheck(data);
+ }
+
/**
* 鏇存柊鐢ㄦ埛閫夋嫨鍦扮锛屾牴鎹敤鎴稩P淇濆瓨鏈熼�夋嫨
*
@@ -753,17 +766,7 @@
return inoutManager.getCheckItemData(param);
}
- /**
- * 鍖栭獙椤甸潰鎻愪氦鏇存柊
- *
- * @param data
- * @return
- */
- @RequestMapping("/update-check")
- public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) {
- return inoutManager.updateCheckData(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 f9426de..31d0276 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
@@ -968,6 +968,84 @@
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
}
+ public PageResponse<InoutCheckData> submitCheck(InoutCheckData data) throws Exception {
+
+ // 鑾峰彇绯荤粺鍙傛暟閰嶇疆
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ if (null == inoutSysConf) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
+ }
+
+ // 鑾峰彇涓氬姟鏁版嵁淇℃伅
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ InoutData curData = inoutService.inoutProgressQuery(param);
+
+ if (null == curData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
+ }
+
+ if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
+ }
+
+
+ // 鏇存柊鍖栭獙椤逛俊鎭�
+ CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
+ if (StringUtils.isNotEmpty(checkResult.getMsg())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庡彴鎵ц寮傚父锛�" + checkResult.getMsg(), data);
+ }
+
+ // 璁剧疆鍖栭獙淇℃伅
+ if (checkResult.getDeSum() > 0) {
+ curData.setDeCheck(checkResult.getDeSum());
+ data.setDeCheck(checkResult.getDeSum());
+ }
+ if (checkResult.getAddSum() > 0) {
+ curData.setAddCheck(checkResult.getAddSum());
+ data.setAddCheck(checkResult.getAddSum());
+ }
+ if (null == data.getCheckTime()) {
+ curData.setCheckTime(new Date());
+ data.setCheckTime(new Date());
+ }
+ curData.setCheckStatus(data.getCheckStatus());
+
+
+ // 鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
+ String curProgress = curData.getProgress();
+ String nextProgress = getNextProgress(curProgress, curData.getType(), inoutSysConf);
+ curData = updateBasicInfo(curData, curProgress, nextProgress);
+
+ // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
+ if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) {
+ curData = checkNoPass(curData);
+ }
+
+ curData.setProgress(curData.getProgress());
+ curData.setType(curData.getType());
+
+ if (StringUtils.isEmpty(data.getCheckUser())) {
+ curData.setCheckUser(ContextUtil.getLoginUserCName());
+ }
+ if (null == data.getCheckTime()) {
+ curData.setCheckTime(new Date());
+ }
+
+ String msg = inoutService.updateCheckData(curData);
+
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
+ }
+
/**
* @param param
* @return
@@ -1016,83 +1094,8 @@
}
}
- @Transactional(rollbackFor = Exception.class)
- public PageResponse<InoutCheckData> updateCheckData(InoutCheckData data) {
- try {
- // 鑾峰彇涓氬姟鏁版嵁淇℃伅
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- InoutData curData = inoutService.inoutProgressQuery(param);
- if (null == curData) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
- }
- if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
- }
- // 鏇存柊鍖栭獙椤逛俊鎭�
- CheckUpdateResult checkResult = checkStandardManager
- .updateCheckItems(data.getCheckId(), data.getCompanyId(),
- data.getCheckItems());
- if (StringUtils.isNotEmpty(checkResult.getMsg())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴鎵ц寮傚父锛�" + checkResult.getMsg(), data);
- }
-
- // 璁剧疆鍖栭獙淇℃伅
- if (checkResult.getDeSum() > 0) {
- data.setDeCheck(checkResult.getDeSum());
- }
- if (checkResult.getAddSum() > 0) {
- data.setAddCheck(checkResult.getAddSum());
- }
- if (null == data.getCheckTime()) {
- data.setCheckTime(new Date());
- }
- curData.setCheckStatus(data.getCheckStatus());
-
- // 鑾峰彇绯荤粺鍙傛暟閰嶇疆
- InoutSysConf inoutSysConf = inoutCommonService
- .getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
- if (null == inoutSysConf) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
- }
- // 鏇存柊涓嬩竴娴佺▼鐘舵��
- if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) {
- curData = updateBasicInfo(curData, inoutSysConf);
- // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
- if (InoutConstant.STATUS_UNPASS
- .equals(curData.getCheckStatus())) {
- curData = checkNoPass(curData);
- }
- }
-
- // 鍖栭獙浜恒�佸寲楠屾椂闂�
- data.setCheckStatus(curData.getCheckStatus());
- data.setProgress(curData.getProgress());
- if (StringUtils.isEmpty(data.getCheckUser())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
- }
- if (null == data.getCheckTime()) {
- data.setCheckTime(new Date());
- }
-
- String msg = inoutService.updateCheckData(data);
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
- }
-
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
- } catch (Exception e) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�"
- + e.getMessage(), null);
- }
- }
/**
* 鑾峰彇鍗曚环淇℃伅
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java b/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java
index 7cf20fc..ea58106 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.ld.igds.inout.dto.InoutCheckData;
import com.ld.igds.inout.dto.InoutCheckParam;
+import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.models.InoutPrice;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -49,7 +50,7 @@
* @param data
* @return
*/
- int updateCheckData(@Param("data") InoutCheckData data);
+ int updateCheckData(@Param("data") InoutData data);
/**
* 鑾峰彇绮瀹氫环
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
index 774ea94..fec9413 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
@@ -254,7 +254,7 @@
* @return
* @throws Exception
*/
- String updateCheckData(InoutCheckData data);
+ String updateCheckData(InoutData data);
/**
* 鑾峰彇绮瀹氫环
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 cbbc2d9..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;
}
@@ -291,8 +291,6 @@
this.delFromCache(param.getDeptId(), param.getType(), param.getId());
-
-
inoutMapper.toComplete(param);
return null;
@@ -370,8 +368,8 @@
} else {
setInoutCache(data.getDeptId(), data);
}
- //鎺ㄩ�佸ぇ灞�
- notifyToScreen(data.getCompanyId(), data.getDeptId(), data.getProgress());
+
+
}
@@ -492,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())) {
@@ -754,27 +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);
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index e4a1112..9a31375 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -101,8 +101,9 @@
</select>
<!--鏇存柊鍖栭獙淇℃伅-->
- <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutCheckData">
- UPDATE D_INOUT_RECORD SET
+ <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutData">
+ UPDATE D_INOUT_RECORD
+ SET TYPE_ = #{data.type},
<if test="data.depotId != null">DEPOT_ID_ = #{data.depotId},</if>
<if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if>
<if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if>
@@ -114,7 +115,6 @@
<if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
<if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
- TYPE_ = #{data.type}
WHERE
COMPANY_ID_ =#{data.companyId}
AND ID_ =#{data.id}
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index 4157e94..249ebe0 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -542,7 +542,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/update-check",
+ url: "../../basic/inout/submit-check",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(curCheckData),
@@ -692,41 +692,6 @@
$("#form-param")[0].reset();
form.render();
}
-
-/**
- * 寮瑰嚭鎻愰啋妗�
- * @param msg 鎻愰啋淇℃伅
- * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
- */
-function notify(msg, data) {
- if (data) {
- //璧嬪��
- $("#resultMsg").text(msg);
- $("#resultUserName").text(data.userName);
- $("#resultPlateNum").text(data.plateNum);
- if ("IN" == data.type) {
- $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
- } else {
- $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
- }
- $("#resultIntelCard").text(data.intelCard);
-
- layer.open({
- type: 1,
- offset: ['150px', '200px'],
- area: '450px;',
- shade: 0.8,
- id: 'dialog_notify_info',
- btn: ['纭畾'],
- content: $('#dialog-from-notify'),
- yes: function (index) {
- layer.closeAll();
- }
- });
- } else {
- layer.alert(msg, {offset: ['300px', '300px']});
- }
-};
// ---------------------------绮浜у湴 -寮�濮� -------------------//
// 寮瑰嚭绮浜у湴涓嬫媺妗�
--
Gitblit v1.9.3