#入库测试完成

zjj

2023-06-09 180d28a0dcc7319c55380a3c6e433d9b009c3b01

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

@@ -903,17 +903,17 @@

        }

        // 订单关联
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        for (WrkDetl wrkDetl : wrkDetls) {
            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
                    throw new CoolException("订单数据回滚失败");
                }
                // 生成新的出库作业
//                        stockOutRe(wrkMast, wrkDetls);
            }
        }
//        // 订单关联
//        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//        for (WrkDetl wrkDetl : wrkDetls) {
//            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
//                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
//                    throw new CoolException("订单数据回滚失败");
//                }
//                // 生成新的出库作业
////                        stockOutRe(wrkMast, wrkDetls);
//            }
//        }

        // 取消操作人员记录
        wrkMast.setManuType("手动取消");
@@ -1197,7 +1197,12 @@
                if (!locNos.contains(locDetl.getLocNo())){
                    locNos.add(locDetl.getLocNo());
                    locNos2[i][0]=locDetl.getLocNo();
                    locNos2[i][1]=locDetl.getManu();
                    if (locDetl.getLocNo().substring(0,2) == "DT"){
                        locNos2[i][1]= "平库";
                    }else {
                        locNos2[i][1]= "立库";
                    }

                    i++;
                }
            }
@@ -1208,7 +1213,7 @@
                    for (ManLocDetl manLocDetl:manLocDetls){
                        manLocDetl.setPayment(1);
                        try{
                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("uuid",manLocDetl.getMatnr()));
                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));
                        }catch (Exception e){
                            throw new Exception("更新库存明细货物形态字段信息出错了");
                        }
@@ -1218,7 +1223,7 @@
                    for (LocDetl locDetl:locDetls){
                        locDetl.setPayment(1);
                        try{
                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("uuid",locDetl.getMatnr()));
                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));
                        }catch (Exception e){
                            throw new Exception("更新库存明细货物形态字段信息出错了");
                        }