#

pang.jiabao

4 天以前 52b21b24130c75197c039ae0fd761e2ef5b43cb3

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

@@ -131,6 +131,11 @@
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            locDetl.setMatnr(wrkDetl.getMatnr());
                            locDetl.setMaktx(wrkDetl.getMaktx());
                            locDetl.setSpecs(wrkDetl.getSpecs());
                            locDetl.setUnit(wrkDetl.getUnit());
                            locDetl.setZpallet(wrkDetl.getZpallet());
                            if (!locDetlService.insert(locDetl)) {
//                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -186,7 +191,6 @@
                    }
                    // 遍历工作明细，更新库存明细和入库通知档
                    for (WrkDetl wrkDetl : wrkDetls8) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
                                , wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
                        if (null != locDetl) {
@@ -203,6 +207,11 @@
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            locDetl.setMatnr(wrkDetl.getMatnr());
                            locDetl.setMaktx(wrkDetl.getMaktx());
                            locDetl.setSpecs(wrkDetl.getSpecs());
                            locDetl.setUnit(wrkDetl.getUnit());
                            locDetl.setZpallet(wrkDetl.getZpallet());
                            if (!locDetlService.insert(locDetl)) {
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("拣料途中并板 ===>> 添加库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -309,6 +318,11 @@
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            locDetl.setMatnr(wrkDetl.getMatnr());
                            locDetl.setMaktx(wrkDetl.getMaktx());
                            locDetl.setSpecs(wrkDetl.getSpecs());
                            locDetl.setUnit(wrkDetl.getUnit());
                            locDetl.setZpallet(wrkDetl.getZpallet());
                            if (!locDetlService.insert(locDetl)) {
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("并板入库 ===>> 新增库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -702,7 +716,7 @@

        locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
        locCache.setModiTime(new Date());
        locCache.setBarcode("");
        locCache.setBarcode(wrkMast.getBarcode());
        locCache.setModiTime(new Date());
        locCache.setIoTime(new Date());
        if (!locCacheService.updateById(locCache)) {