From fe02dd7aad196823b16f4153d897ec4eea33c0ee Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 01 九月 2023 16:44:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/resources/mapper/TestMastMapper.xml | 8 ++++----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 972d127..69bd66a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2374,12 +2374,12 @@
}else if(devpThread.startSignal[i][0]==3){
locMast.setPackStatus(7);
testMast.setModiTime(new Date());
- }else if(devpThread.startSignal[i][0]==4){
+ }else if(devpThread.startSignal[i][0]==4 && testMast.getStatus()!=4){
locMast.setPackStatus(3);
testMast.setStatus(4);
testMast.setModiTime(new Date());
testMastService.insertPackQualified(true,new Date());
- }else if(devpThread.startSignal[i][0]==5){
+ }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4){
locMast.setPackStatus(4);
testMast.setStatus(4);
testMast.setModiTime(new Date());
diff --git a/src/main/resources/mapper/TestMastMapper.xml b/src/main/resources/mapper/TestMastMapper.xml
index 860df0f..9d0e430 100644
--- a/src/main/resources/mapper/TestMastMapper.xml
+++ b/src/main/resources/mapper/TestMastMapper.xml
@@ -15,13 +15,13 @@
</resultMap>
<insert id="insertPackQualified">
- insert into man_pack_qualified(qualified,unqualified,create_time)
- values(1,0,#{now})
+ insert into man_pack_qualified(qualified,unqualified,create_time,status)
+ values(1,0,#{now},1)
</insert>
<insert id="insertUnPackQualified">
- insert into man_pack_qualified(qualified,unqualified,create_time)
- values(0,1,#{now})
+ insert into man_pack_qualified(qualified,unqualified,create_time,status)
+ values(0,1,#{now},1)
</insert>
</mapper>
--
Gitblit v1.9.1