#

tzsk

5 天以前 71592bfa6e09c482ba6c12d4bacedd470fedbec8

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

@@ -67,6 +67,7 @@
                        if (!Cools.isEmpty(wrkMast.getBarcode())) {
                            locMast.setBarcode(wrkMast.getBarcode());
                        }
                        log.warn("Flag - 13,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "D");
                        locMast.setLocSts("D");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
@@ -93,6 +94,8 @@
                            locDetl.sync(wrkDetl);
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setProddate(wrkDetl.getProddate());//生产日期
                            locDetl.setDeadline(wrkDetl.getDeadline());//到期日期
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
@@ -121,6 +124,7 @@
                    }
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocSts().equals("S")) {
                        log.warn("Flag - 14,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -206,6 +210,8 @@
                        locDetl.setBatch(detlDto.getBatch()); // 批号
                        locDetl.setThreeCode(detlDto.getCsocode());
                        locDetl.setDeadTime(detlDto.getIsoseq());
                        locDetl.setProddate(detlDto.getProddate());
                        locDetl.setDeadline(detlDto.getDeadline());
                        locDetl.setAppeTime(now);
                        locDetl.setAppeUser(9527L);
                        locDetl.setModiTime(now);
@@ -217,6 +223,7 @@

                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                        log.warn("Flag - 15,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -232,6 +239,7 @@
                    //清空源库位数据 P ====>> O
                    LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
                    if (locMast1.getLocSts().equals("P")) {
                        log.warn("Flag - 16,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                        locMast1.setLocSts("O"); // 清空库位
                        locMast1.setModiTime(new Date());
                        if (!locMastService.updateById(locMast1)) {
@@ -262,6 +270,8 @@
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setProddate(wrkDetl.getProddate());//生产日期
                            locDetl.setDeadline(wrkDetl.getDeadline());//到期日期
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
@@ -271,6 +281,7 @@
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                        log.warn("Flag - 17,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "F");
                        locMast.setLocSts("F");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -294,6 +305,8 @@
                        locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                        locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                        locDetl.setProddate(wrkDetl.getProddate());
                        locDetl.setDeadline(wrkDetl.getDeadline());
                        locDetl.setModiTime(now);
                        locDetl.setAppeTime(now);
                        if (!locDetlService.insert(locDetl)) {
@@ -302,6 +315,7 @@
                    }
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocSts().equals("S")) {
                        log.warn("Flag - 18,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), wrkMast.getFullPlt().equals("Y")?"F":"D");
                        locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);
@@ -326,6 +340,7 @@
                    // 修改源库位状态 ==> O
                    LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
                    if (null != sourceLoc) {
                        log.warn("Flag - 19,{}库位状态变更,{} => {}", sourceLoc.getLocNo(), sourceLoc.getLocSts(), "O");
                        sourceLoc.setBarcode("");
                        sourceLoc.setLocSts("O");
                        sourceLoc.setModiTime(now);
@@ -336,6 +351,7 @@
                        locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
                    }
                    // 修改目标库位状态 ==> .locSts
                    log.warn("Flag - 20,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), locSts);
                    locMast.setLocSts(locSts);
                    locMast.setBarcode(wrkMast.getBarcode());
                    locMast.setIoTime(now);
@@ -391,6 +407,7 @@
                    }
                    // 修改源库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        log.warn("Flag - 21,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
@@ -404,6 +421,7 @@
                case 107:
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocSts().equals("P")) {
                        log.warn("Flag - 22,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);
@@ -418,6 +436,7 @@
                case 110:
                    // 修改库位状态 R ===>> O
                    if (locMast.getLocSts().equals("R")) {
                        log.warn("Flag - 23,{}库位状态变更,{} => {}", locMast.getLocNo(), locMast.getLocSts(), "O");
                        locMast.setLocSts("O");
                        locMast.setBarcode("");
                        locMast.setModiTime(now);