#

lsh

2024-01-17 be25fdca12071375d82a09f78c1235322b4106d0

#

 src/main/java/com/zy/asrs/entity/param/SingleUnstackingCompleteParam.java

@@ -21,26 +21,14 @@
        private String boxNo;//        是    字符串    木箱编号（唯一字段，出库依据，出库时按照木箱编号出库）
    }

    public Integer getSourceDevNo$(){
        if (!Cools.isEmpty(this.palletizingNo)){
            switch (this.palletizingNo){
                case "1":
                    return 119;
                case "2":
                    return 121;
                default:
                    return null;
            }
        }
        return null;
    }

    public Integer getDevNo$(){
        if (!Cools.isEmpty(this.palletizingNo)){
            switch (this.palletizingNo){
                case "1":
                case "118":
                case "119":
                    return 131;
                case "2":
                case "120":
                case "121":
                    return 135;
                default:
                    return null;

 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java

@@ -50,7 +50,9 @@
                    continue;
                }
                if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
                    continue;
                    if (!wrkMast.getStaNo().equals(122)){
                        continue;
                    }
                }
                if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
                    continue;

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

@@ -61,7 +61,7 @@
            if (!basDevpEnd.getLoading().equals("Y") || !basDevpEnd.getAutoing().equals("Y") || !basDevpEnd.getInEnable().equals("Y")){
                return FAIL;
            }
            if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0) || basDevpEnd.getWrkNo()>10000){
            if ((basDevpEnd.getWrkNo()<9900 && basDevpEnd.getWrkNo()!=0  ) || basDevpEnd.getWrkNo()>10000  || basDevpEnd.getReportSign()!=0){
                return FAIL;
            }
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
@@ -78,23 +78,25 @@
                }
                SingleMountUnstackingCompleteParam singleMountUnstackingCompleteParam = new SingleMountUnstackingCompleteParam(wrkMast,wrkDetls);
                singleMountUnstackingCompleteParam.setStaStart(staNo);
                singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:131);
                singleMountUnstackingCompleteParam.setStaEnd(staEnd);
                ReturnT<String> result = null;
                result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
//                System.out.println(result);
//                if (true){
//                    for (WrkDetl wrkDetl:wrkDetls){
//                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
//                        wrkDetlSingle.sync(wrkDetl);
//                        wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
//                        wrkDetlSingleService.insert(wrkDetlSingle);
//                    }
//                    wrkMast.setSheetNo("1");
//                    wrkMastService.updateById(wrkMast);
//                    basDevp.setReportSign(1);
//                    basDevpService.updateById(basDevp);
//                    return SUCCESS;
//                }
                if (true){
                    for (WrkDetl wrkDetl:wrkDetls){
                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
                        wrkDetlSingle.sync(wrkDetl);
                        wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
                        wrkDetlSingleService.insert(wrkDetlSingle);
                    }
                    wrkMast.setSheetNo("1");
                    wrkMastService.updateById(wrkMast);
                    basDevp.setReportSign(1);
                    basDevpService.updateById(basDevp);
                    basDevpEnd.setReportSign(1);
                    basDevpService.updateById(basDevp);
                    return SUCCESS;
                }
                if (result.getCode()==200){
                    for (WrkDetl wrkDetl:wrkDetls){
                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
@@ -106,6 +108,8 @@
                    wrkMastService.updateById(wrkMast);
                    basDevp.setReportSign(1);
                    basDevpService.updateById(basDevp);
                    basDevpEnd.setReportSign(1);
                    basDevpService.updateById(basDevp);
                    return SUCCESS;
                }else {
                    log.error("拆垛信息上传失败");

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -46,6 +46,7 @@
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />
        <result column="tk_type" property="tkType" />
        <result column="roll_up" property="rollUp" />

    </resultMap>