#库存迁移逻辑修改，从工作明细档进行处理

Junjie

2024-02-19 f3603d9f0eb85d2a42edbcadd0950889af2c24d2

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

@@ -138,20 +138,37 @@
                    }
                    log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，工作档明细列表：" + JSON.toJSONString(wrkDetls53));
                    for (WrkDetl wrkDetl : wrkDetls53) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
                        if (null != locDetl) {
                            log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，工作档明细：" + JSON.toJSONString(wrkDetl) + "，库存明细：" + JSON.toJSONString(locDetl));
                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),
                                    locMast.getLocNo(),
                                    wrkDetl.getMatnr(),
                                    wrkDetl.getBatch(),
                                    wrkDetl.getSuppCode(),
                                    wrkDetl.getThreeCode(),
                                    wrkDetl.getDeadTime())) {
                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        double anfme = wrkDetl.getStock() - wrkDetl.getAnfme();
                        if (anfme <= 0) {//库存 - 作业数量 <= 0 清掉该数据
                            continue;
                        }

                        LocDetl locDetl = new LocDetl();
                        locDetl.sync(wrkDetl);
                        locDetl.setLocNo(wrkMast.getLocNo());
                        locDetl.setAnfme(anfme);
                        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
                        locDetl.setAppeTime(now);
                        locDetl.setAppeUser(9527L);
                        locDetl.setModiTime(now);
                        locDetl.setModiUser(9527L);
                        if (!locDetlService.insert(locDetl)) {
                            exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }

//                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getSuppCode());
//                        if (null != locDetl) {
//                            log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，工作档明细：" + JSON.toJSONString(wrkDetl) + "，库存明细：" + JSON.toJSONString(locDetl));
//                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(),
//                                    locMast.getLocNo(),
//                                    wrkDetl.getMatnr(),
//                                    wrkDetl.getBatch(),
//                                    wrkDetl.getSuppCode(),
//                                    wrkDetl.getThreeCode(),
//                                    wrkDetl.getDeadTime())) {
//                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
//                            }
//                        }
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
@@ -273,6 +290,7 @@
                        if (!locMastService.updateById(sourceLoc)) {
                            exceptionHandle("库位移转 ===>> 修改源库位状态失败；[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }
                        locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
                    }
                    // 修改目标库位状态 ==> .locSts
                    locMast.setLocSts(locSts);