空板改余料回库优化

skyouc

11 小时以前 8ae2f2dcfe7e263d42c21ed7644641c780445b95

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -236,7 +236,9 @@
            if (mast.getWrkSts() == 2) {
                if (mast.getIoType() == 10) {
                    //空板入库任务档
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", mast.getSourceLocNo()));
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
                            .eq("barcode", mast.getBarcode())
                            .eq("loc_no", mast.getSourceLocNo()));
                    if (Objects.isNull(locDetl)) {
                        throw new CoolException("明细数据不存在！！");
                    }
@@ -249,18 +251,42 @@
                        WrkDetl wrkDetl = new WrkDetl();
                        BeanUtils.copyProperties(locDetl, wrkDetl);
                        wrkDetl.setWrkNo(mast.getWrkNo());
                        wrkDetl.setStockQty(locDetl.getAnfme());
                        wrkDetl.setIoTime(new Date());
                        wrkDetl.setWeight(params.getWeight());
                        //余料长度
                        wrkDetl.setRealQty(val * matnr.getVolume());
                        wrkDetl.setAnfme(val * matnr.getVolume());
                        mast.setIoType(1);
                        mast.setIsSuplus(1);
                        mast.setOveMk("Y");
                        if (!wrkMastService.updateById(mast)) {
                            throw new CoolException("主档状态修改失败");
                            throw new CoolException("任务档修改失败！！");
                        }
                        // 更新原出库单
                        int indexOf = mast.getWrkCode().indexOf("-1");
                        if (indexOf != -1) {
                            String wrkNo = mast.getWrkCode().substring(0, indexOf);
                            WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
                            if (Objects.isNull(orgWrk)) {
                                throw new CoolException("数据错误，主任务档不存在或已删除！！");
                            }
                            orgWrk.setOveMk("Y");
                            if (!wrkMastService.updateById(orgWrk)) {
                                throw new CoolException("任务档修改失败！！");
                            }
                            //称重后，计算出真实长度
                            Double realQty = val * matnr.getVolume();
                            //库存减去称重长度
                            Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
                            //原出为数量与真实数量互换，保持一致性
                            wrkDetl.setAnfme(v);
                            wrkDetl.setWeight(params.getWeight());
                        if (!wrkDetlService.insert(wrkDetl)) {
                            throw new CoolException("明细保存失败！！");
                        }
                        } else {
                            throw new CoolException("任务号截取失败，请检查主任务档任档wrkCode字段");
                        }
                    }
                } else {
                    WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));