From 537a57d5e81d4c6da8a0eca1690f61644a1dc462 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 12 十月 2023 22:32:43 +0800
Subject: [PATCH] 出入库快速结束，异常终止
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 2 +-
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 6 +++---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 3 +++
3 files changed, 7 insertions(+), 4 deletions(-)
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 ab08098..200a5de 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
@@ -511,9 +511,9 @@
data = inoutService.inoutQueryById(param);
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
- }
+// if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+// return "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
+// }
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "褰撳墠淇℃伅宸插仛寮傚父澶勭悊锛屼笉鏀寔閲嶅鎵ц锛�";
}
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 2a878c5..2ece18d 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
@@ -317,6 +317,9 @@
if (null == data.getEmptyWeightTime()) {
data.setEmptyWeightTime(new Date());
}
+ if (null == data.getFullWeightTime()) {
+ data.setFullWeightTime(new Date());
+ }
//璋冩暣鏃堕棿宸�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 73bd4ac..b824b24 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -197,7 +197,7 @@
</set>
<where>
- COMPANY_ID_ = #{param.companyId},
+ COMPANY_ID_ = #{param.companyId}
AND ID_ = #{param.id}
</where>
</update>
--
Gitblit v1.9.3