#

pjb

2024-07-04 4e7fce25f60aaf58603a3d2f3d749d1a83675c44

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

@@ -37,6 +37,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private ManPakOutService manPakOutService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -180,6 +182,19 @@
                                }
                            }
                        } catch (Exception ignore){}

                        //更新拣货单完成数量
                        EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
                        manPakOutEntityWrapper.eq("doc_num",wrkDetl.getOrderNo());
                        manPakOutEntityWrapper.eq("matnr",wrkDetl.getMatnr());
                        ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper);
                        if (manPakOut.getCount() + wrkDetl.getAnfme() >= manPakOut.getAnfme()){
                            manPakOut.setStatus(1);
                        }
                        manPakOut.setCount(manPakOut.getCount() + wrkDetl.getAnfme());
                        if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                            return FAIL.setMsg("更新拣货单完成数量失败");
                        }

                    }
                    // 修改库位状态 Q ====>> F
@@ -367,17 +382,45 @@
                            return FAIL.setMsg("全板出库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                        }
                    }
                    EntityWrapper<OrderDetl> orderDetlEntityWrapper = new EntityWrapper<>();
                    orderDetlEntityWrapper.eq("order_no",wrkDetls101.get(0).getOrderNo());
                    orderDetlEntityWrapper.eq("matnr",wrkDetls101.get(0).getMatnr());
                    OrderDetl orderDetl = new OrderDetl();
                    orderDetl.setQty(wrkDetls101.get(0).getAnfme());
                    orderDetl.setUpdateTime(now);
                    if (!orderDetlService.update(orderDetl,orderDetlEntityWrapper)){
                        return FAIL.setMsg("更新订单完成数量失败");

                    for (WrkDetl wrkDetl: wrkDetls101) {
                        if(Cools.isEmpty(wrkDetl)){
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("全板出库 ===>> 任务明细为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                        }
                        if (!wrkDetl.getOrderNo().isEmpty()){
                            //更新订单完成数量
                            EntityWrapper<OrderDetl> orderDetlEntityWrapper = new EntityWrapper<>();
                            orderDetlEntityWrapper.eq("order_no",wrkDetl.getOrderNo());
                            orderDetlEntityWrapper.eq("matnr",wrkDetl.getMatnr());

                            OrderDetl orderDetl = orderDetlService.selectOne(orderDetlEntityWrapper);

                            OrderDetl orderDetl1 = new OrderDetl();
                            orderDetl1.setQty(orderDetl.getQty() + wrkDetl.getAnfme());
                            orderDetl1.setUpdateTime(now);
                            if (!orderDetlService.update(orderDetl1,orderDetlEntityWrapper)){
                                return FAIL.setMsg("更新订单完成数量失败");
                            }
                            //更新立库拣货单完成数量
                            EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
                            manPakOutEntityWrapper.eq("doc_num",wrkDetl.getOrderNo());
                            manPakOutEntityWrapper.eq("matnr",wrkDetl.getMatnr());
                            manPakOutEntityWrapper.eq("loc_no","立库");
                            ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper);
                            if (manPakOut.getCount() + wrkDetl.getAnfme() >= manPakOut.getAnfme()){
                                manPakOut.setStatus(1);
                            }
                            manPakOut.setCount(manPakOut.getCount() + wrkDetl.getAnfme());
                            if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                                return FAIL.setMsg("更新拣货单完成数量失败");
                            }
                        }
                    }




                    Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
                    if (finsihed) {
                        Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());