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

whycq

2023-09-06 b143fe586d7be6c12ec162bf5aebb3a99bff7e32

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

# Conflicts:
#	src/main/webapp/views/monitor/index.html

 src/main/java/com/zy/asrs/domain/enums/PackStatusType.java

@@ -33,7 +33,7 @@
        if(fireStatus == 1){
            return LOC_ERROR;
        } else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
            if (packStatus == 1 || locSts.equals("F")){
            if (packStatus == 1 && locSts.equals("F")){
                return LOC_WAIT_TESTINT;//待测
            } else if (packStatus == 2){
                return LOC_TESTING;     //测试中

 src/main/java/com/zy/asrs/mapper/TestMastMapper.java

@@ -11,6 +11,6 @@
@Mapper
@Repository
public interface TestMastMapper extends BaseMapper<TestMast> {
    void insertPackQualified(@Param("now")Date now);
    void insertUnPackQualified(@Param("now")Date now);
    void insertPackQualified(@Param("now")Date now,@Param("Pack")String Pack);
    void insertUnPackQualified(@Param("now")Date now,@Param("Pack")String Pack);
}

 src/main/java/com/zy/asrs/service/TestMastService.java

@@ -7,5 +7,5 @@

public interface TestMastService extends IService<TestMast> {

    void insertPackQualified(boolean qualified,Date now);
    void insertPackQualified(boolean qualified,Date now,String Pack);
}

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2378,12 +2378,12 @@
                                locMast.setPackStatus(3);
                                testMast.setStatus(4);
                                testMast.setModiTime(new Date());
                                testMastService.insertPackQualified(true,new Date());
                                testMastService.insertPackQualified(true,new Date(),testMast.getBarcode());
                            }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4){
                                locMast.setPackStatus(4);
                                testMast.setStatus(4);
                                testMast.setModiTime(new Date());
                                testMastService.insertPackQualified(false,new Date());
                                testMastService.insertPackQualified(false,new Date(),testMast.getBarcode());
                            }
//                            else if(devpThread.startSignal[i][0]==6||devpThread.startSignal[i][0]==7||devpThread.startSignal[i][0]==8){
//                                locMast.setPackStatus(devpThread.startSignal[i][0]+3);

 src/main/java/com/zy/asrs/service/impl/TestMastServiceImpl.java

@@ -12,11 +12,13 @@
public class TestMastServiceImpl extends ServiceImpl<TestMastMapper, TestMast> implements TestMastService {

    @Override
    public void insertPackQualified(boolean qualified, Date now){
    public void insertPackQualified(boolean qualified, Date now,String Pack){
        if (qualified){
            this.baseMapper.insertPackQualified(now);
            this.baseMapper.insertPackQualified(now,Pack);
        }else{
            this.baseMapper.insertUnPackQualified(now,Pack);
        }
        this.baseMapper.insertUnPackQualified(now);


    };


 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -45,7 +45,7 @@
        add(101);add(102);add(103);add(104);
        add(201);add(202);add(203);add(204);add(205);add(206);
        add(207);add(208);add(209);add(210);add(211);add(212);
        add(213);add(105);
        add(213);add(105);add(1000);
    }};

    /**

 src/main/resources/mapper/TestMastMapper.xml

@@ -15,13 +15,13 @@
    </resultMap>

    <insert id="insertPackQualified">
        insert into man_pack_qualified(qualified,unqualified,create_time,status)
        values(1,0,#{now},1)
        insert into man_pack_qualified(qualified,unqualified,create_time,status,total)
        values(1,0,#{now},1,#{Pack})
    </insert>

    <insert id="insertUnPackQualified">
        insert into man_pack_qualified(qualified,unqualified,create_time,status)
        values(0,1,#{now},1)
        insert into man_pack_qualified(qualified,unqualified,create_time,status,total)
        values(0,1,#{now},1,#{Pack})
    </insert>

</mapper>

 src/main/webapp/views/monitor/index.html

@@ -56,50 +56,7 @@
</body>
</html>
<script>
    // 左
    $('.time-tools').click(function () {
        exitFull();
    });
    $('.head-title').click(function () {
        full();
    });
    //开始全屏
    function full() {
        var docElm = document.documentElement;
        //W3C
        if (docElm.requestFullscreen) {
            docElm.requestFullscreen();
        }
        //FireFox
        else if (docElm.mozRequestFullScreen) {
            docElm.mozRequestFullScreen();
        }
        //Chrome等
        else if (docElm.webkitRequestFullScreen) {
            docElm.webkitRequestFullScreen();
        }
        //IE11
        else if (elem.msRequestFullscreen) {
            elem.msRequestFullscreen();
        }
    }

    //退出全屏
    function exitFull() {
        if (document.exitFullscreen) {
            document.exitFullscreen();
        }
        else if (document.mozCancelFullScreen) {
            document.mozCancelFullScreen();
        }
        else if (document.webkitCancelFullScreen) {
            document.webkitCancelFullScreen();
        }
        else if (document.msExitFullscreen) {
            document.msExitFullscreen();
        }
    }
    let url = 'http://192.168.4.188:8088/fnwms'
    let url = 'http://192.168.4.188:8085/fnwms'
    var item = [{locNo: '1',locSts: '1',mk: '1',packStatus$: '1'}]
    var year = '2020';
    var month = '05';