#

cl

5 天以前 ad0eed3e39e14880c2b8835c6ccd7c7551ce8015

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -434,7 +434,7 @@
                wrkDetl.sync(detlDto.getLocDetl());
                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                wrkDetl.setIoTime(wrkMast.getIoTime());
                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 作业数量
                wrkDetl.setStock(detlDto.getLocDetl().getAnfme());
@@ -546,7 +546,7 @@
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(mat);
                wrkDetl.setZpallet(wrkMast.getBarcode());
                wrkDetl.setIoTime(now);
                wrkDetl.setIoTime(wrkMast.getIoTime());
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setBatch(locDto.getBatch());
                wrkDetl.setOrderNo(locDto.getOrderNo());
@@ -570,7 +570,7 @@
                    WrkDetl wrkDetl = new WrkDetl();
                    wrkDetl.sync(mat);
                    wrkDetl.setZpallet(wrkMast.getBarcode());
                    wrkDetl.setIoTime(now);
                    wrkDetl.setIoTime(wrkMast.getIoTime());
                    wrkDetl.setWrkNo(workNo);
                    wrkDetl.setBatch(locDto.getBatch());
                    wrkDetl.setOrderNo(orderDto.getOrderNo());
@@ -598,6 +598,9 @@
                    if (orderDetl == null) {
                        orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
                    }
                    if (orderDetl == null) {
                        throw new CoolException("未找到订单明细，订单号：" + locDto.getOrderNo() + "，物料：" + locDto.getMatnr());
                    }
                    if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme(),locDto.getCsocode(),locDto.getIsoseq())) {
                        throw new CoolException("修改订单明细数量失败");
                    }
@@ -615,6 +618,9 @@
                        OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
                        if (orderDetl == null) {
                            orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null,locDto.getCsocode(),locDto.getIsoseq());
                        }
                        if (orderDetl == null) {
                            throw new CoolException("未找到订单明细，订单号：" + orderDto.getOrderNo() + "，物料：" + locDto.getMatnr());
                        }

                        orderAnfme = orderDetl.getAnfme() - orderDetl.getQty();
@@ -645,6 +651,10 @@
            }
        } else {
            throw new CoolException(taskDto.getLocNo() + "库位不是在库状态");
        }
        boolean debugd = false;
        if(debugd){
            throw new RuntimeException("debug rollback");
        }
    }

@@ -879,7 +889,7 @@
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(now);
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAnfme(locDetl.getAnfme());
            wrkDetl.setAppeTime(now);
            wrkDetl.setAppeUser(userId);