| src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/AutoEmptyOutHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1525,6 +1525,7 @@ mast.setSourceLocNo(wrkMast.getLocNo()); mast.setLocNo(locNo.getLocNo()); // 目标库位 = 出库时的源库位 mast.setModiTime(now); mast.setExitMk("Y"); mast.setWrkCode(workNo); mast.setModiUser(userId); if (!wrkMastService.insert(mast)) { @@ -1666,6 +1667,7 @@ mast.setSourceLocNo(sourceLocNo); mast.setLocNo(locNo); mast.setOnlineYn("N"); mast.setExitMk("Y"); mast.setModiTime(now); mast.setWrkCode(null); mast.setPacked(workNo); src/main/java/com/zy/asrs/task/handler/AutoEmptyOutHandler.java
@@ -203,12 +203,8 @@ wrkMast.setSourceStaNo(String.valueOf(sourceStaNo)); wrkMast.setStaNo(String.valueOf(targetStaNo)); wrkMast.setFullPlt("Y"); wrkMast.setPicking("N"); wrkMast.setExitMk("Y"); wrkMast.setEmptyMk("N"); wrkMast.setLinkMis("N"); wrkMast.setExitMk("N"); wrkMast.setPacked(null); wrkMast.setOnlineYn("N"); wrkMast.setOveMk("N"); wrkMast.setAppeUser(userId); wrkMast.setAppeTime(now); src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -74,21 +74,21 @@ if (wrkMast.getIoType() == 1) { // 入库通知单 if (!Cools.isEmpty(wrkMast.getBarcode())) { // JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode()); // if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) { // JSONObject data = res.getJSONObject("data"); // String tlocation = data == null ? null : data.getString("tlocation"); // if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) { // List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>() // .eq("loc_no", wrkMast.getLocNo())); // if (!Cools.isEmpty(detls)) { // for (LocDetl detl : detls) { // detl.setStandby1(tlocation); // locDetlService.updateById(detl); // } // } // } // } JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode()); if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) { JSONObject data = res.getJSONObject("data"); String tlocation = data == null ? null : data.getString("tlocation"); if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) { List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>() .eq("loc_no", wrkMast.getLocNo())); if (!Cools.isEmpty(detls)) { for (LocDetl detl : detls) { detl.setStandby1(tlocation); locDetlService.updateById(detl); } } } } // 保存入库通知档历史档 @@ -117,7 +117,7 @@ // 出库 -------------------------------------------------------------------------------- } else if (wrkMast.getWrkSts() == 15) { if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && !Objects.isNull(wrkMast.getExitMk())){ if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && wrkMast.getExitMk().equals("Y")){ List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo())); WrkDetl wrkDetl = wrkDetls1.get(0); JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null); src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -509,6 +509,7 @@ public void movLoc(WrkMast wrkMast) { LocMast locMast = locMastService.selectById(wrkMast.getLocNo()); if (Objects.isNull(locMast)) { throw new CoolException("目标库位不存在！！"); } @@ -620,19 +621,22 @@ wrkMastService.updateById(wrkMast1); } } movLoc(wrkMast); LocMast locMastTarget = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo())); // 修改库位状态 S ====>> F if (locMastTarget.getLocSts().equals("S")) { locMastTarget.setLocSts("F"); locMastTarget.setBarcode(wrkMast.getBarcode()); locMastTarget.setIoTime(now); locMastTarget.setModiTime(now); if (!locMastService.updateById(locMastTarget)) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return FAIL.setMsg("退库跨区域入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]"); if(!Objects.isNull(wrkMast.getLocNo())){ movLoc(wrkMast); LocMast locMastTarget = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo())); // 修改库位状态 S ====>> F if (locMastTarget.getLocSts().equals("S")) { locMastTarget.setLocSts("F"); locMastTarget.setBarcode(wrkMast.getBarcode()); locMastTarget.setIoTime(now); locMastTarget.setModiTime(now); if (!locMastService.updateById(locMastTarget)) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return FAIL.setMsg("退库跨区域入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]"); } } } if(!Objects.isNull(wrkMast.getPacked())){ LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", wrkMast.getSourceLocNo())); if (Objects.isNull(bLocNo)) {
