#出库规则完成，盘点拣料出库测试完成

lty

2025-01-04 c23c5d3adeac7dca6cc10e4fe96b8d0693a06d16

#出库规则完成，盘点拣料出库测试完成

 pom.xml

@@ -115,7 +115,7 @@
    </dependencies>

    <build>
        <finalName>ddthasrs</finalName>
        <finalName>wms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java

@@ -57,11 +57,12 @@
        task.setOrder(i);

        //优先级排序 15.出库>14.入库>13.空板出库>12.空板入库>11.移库
        if(wrkMast.getIoType() == 1 ){//入库
        if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){//入库
            workIssuedResult.setPriorityCode(14);//优先级
            task.setTaskType(0);//入库
            task.setStartNode(inDevp);
            task.setEndNode(wrkMast.getLocNo());//目标库位


        }else if(wrkMast.getIoType() == 10 ){//空板入库
            workIssuedResult.setPriorityCode(12);//优先级
@@ -69,7 +70,7 @@
            task.setStartNode(inDevp);
            task.setEndNode(wrkMast.getLocNo());//目标库位

        }else if(wrkMast.getIoType() == 101 ){//出库
        }else if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107){//出库
            workIssuedResult.setPriorityCode(15);//优先级
            task.setTaskType(1);//出库
            task.setStartNode(wrkMast.getSourceLocNo());//源库位

 src/main/java/com/zy/common/web/WcsController.java

@@ -342,7 +342,28 @@
         * 完成,8-任务结束
         */
        if (statusParam.getTaskStatus()==0){
            wrkMast.setWrkSts(1L);//1.已接收
            //拣料和盘点再入库判断
            if((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14){
                Date now = new Date();
                wrkMast.setIoTime(now);
                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                wrkMast.setWrkSts(1L);//1.已接收
                wrkMast.setSourceStaNo(101); // 源站
                wrkMast.setStaNo(null); // 目标站
                wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                wrkMast.setSourceLocNo(""); // 源库位清空
                wrkMast.setModiTime(now);
                // 修改库位状态 Q.拣料/盘点/并板再入库
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                locMast.setLocSts("Q");
                locMast.setModiTime(new Date());
                if (!locMastService.updateById(locMast)) {

                    throw new CoolException("修改库位状态失败");
                }
            }else{
                wrkMast.setWrkSts(1L);//1.已接收
            }
        }else if (statusParam.getTaskStatus()==1){
            wrkMast.setWrkSts(2L);//2.任务开始
        }else if (statusParam.getTaskStatus()==2){
@@ -350,11 +371,12 @@
        }else if (statusParam.getTaskStatus()==3){
            wrkMast.setWrkSts(6L);//6.任务中断
        } else if (statusParam.getTaskStatus()==4 || statusParam.getTaskStatus()==8){
//            wrkMast.setWrkSts(7L);//6.放货完成
            if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11){
            if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 ||wrkMast.getIoType() == 57){
                wrkMast.setWrkSts(4L);//4.入库完成
            }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
            }else if (wrkMast.getIoType()==103 || wrkMast.getIoType()==107){
                wrkMast.setWrkSts(14L);//14.已出库未确认
            }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
                wrkMast.setWrkSts(7L);//7.出库完成
            }
        }
        wrkMastService.updateById(wrkMast);