1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完...

zwl

2025-11-18 608fb6f9529ce51291ef682638a5efc7dd51ac63

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

@@ -158,6 +158,24 @@
                        } catch (Exception ignore) {
                        }

                        // 更新子订单完成数量
                        OrderDetl1 orderDetl1 = orderDetl1Service.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl1 == null) {
                            orderDetl1 = orderDetl1Service.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
                        }
                        try {
                            if (!Cools.isEmpty(orderDetl)) {
                                if (!orderDetl1Service.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(), wrkDetl.getAnfme())) {
//                                    exceptionHandle("全板入库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("全板入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                }
                            }
                        } catch (Exception ignore) {
                        }

                    }
                    // 写入中间表数据
                    write(wrkMast, wrkDetls);
@@ -223,7 +241,7 @@
                            try {
                                if (!Cools.isEmpty(orderDetl1)) {
                                    if (!orderDetl1Service.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                            orderDetl.getBatch(), wrkDetl.getAnfme())) {
                                            batch, wrkDetl.getAnfme())) {
//                                    exceptionHandle("全板出库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
                                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -554,15 +572,15 @@
                //源单号
                exdInstockTarge.setFsourcebillno(bacode.getIcmono());
                //源单细表ID
                exdInstockTarge.setFsourceentryid(i);
                exdInstockTarge.setFsourceentryid(1);
                //源单单据类型
                exdInstockTarge.setFsourcetrantype(85);
                //库位ID
                exdInstockTarge.setFdcspid(0);
                //仓库ID
                Integer Fdcstockid = 19382;
                if(!Cools.isEmpty(bacode.getProdinkind())){
                    ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", bacode.getProdinkind()));
                if(!Cools.isEmpty(wrkDetl.getBrand())){
                    ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", wrkDetl.getBrand()));
                    Fdcstockid = Integer.valueOf(fname.getId());
                }

@@ -581,6 +599,8 @@
                exdInstockTarge.setStatus(0);
                //仓库
                exdInstockTarge.setProdinkind(bacode.getProdinkind());
                //生产入库对一坨物料进行绑定。唯一值
                exdInstockTarge.setFbillno(wrkDetl.getOrigin());
                //exdInstockTarge.setProdInKind("特采库");
                if(!exdInstockTargetService.insert(exdInstockTarge)){
                    throw new CoolException("验布入库完成插入入库表失败");