Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

whycq

2023-09-01 fe02dd7aad196823b16f4153d897ec4eea33c0ee

Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs

 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());

 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>