#

whycq

2024-01-10 268d26b3a97ca9bf6893418aa2d6aeced0c75682

#

 src/main/java/com/zy/asrs/controller/MatV2Controller.java

@@ -148,4 +148,11 @@
        return R.ok();
    }

    @RequestMapping(value = "/matV2/auth")
    @ManagerAuth
    public R find(@RequestParam("matnr") String matnr,@RequestParam("type") Integer type) {
        MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", matnr));

        return R.ok();
    }
}

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

@@ -904,26 +904,27 @@
                    }
                    // 生成新的出库作业
//                        stockOutRe(wrkMast, wrkDetls);
                }
                //修改订单主表状态,没有作业数量时才可以修改
                boolean flag = true;
                List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
                for(OrderDetl orderDetl : orderDetls){
                    if(orderDetl.getWorkQty() > 0){
                        flag = false;
                    //修改订单主表状态,没有作业数量时才可以修改
                    boolean flag = true;
                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
                    for(OrderDetl orderDetl : orderDetls){
                        if(orderDetl.getWorkQty() > 0){
                            flag = false;
                        }
                    }
                    if(flag){
                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
                        if(!Cools.isEmpty(order) && order.getSettle()==2){
                            order.setSettle(1L);
                            order.setUpdateBy(userId);
                            order.setUpdateTime(now);
                        }
                        if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
                            throw new CoolException("修改订单状态失败");
                        }
                    }
                }
                if(flag){
                    Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
                    if(!Cools.isEmpty(order) && order.getSettle()==2){
                        order.setSettle(1L);
                        order.setUpdateBy(userId);
                        order.setUpdateTime(now);
                    }
                    if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
                        throw new CoolException("修改订单状态失败");
                    }
                }

            }

        }

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

@@ -353,12 +353,12 @@

                    for (WrkDetl w: wrkDetls101) {
                        //更改订单数量
                        OrderDetl orderDetl=orderDetlService.selectItem(w.getOrderNo(),w.getMatnr(),w.getBatch());
                        orderDetl.setQty(orderDetl.getQty()+w.getAnfme());
                        if(!orderDetlService.updateById(orderDetl)){
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("全板出库 ===>> 修改订单数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                        }
//                        OrderDetl orderDetl=orderDetlService.selectItem(w.getOrderNo(),w.getMatnr(),w.getBatch());
//                        orderDetl.setQty(orderDetl.getQty()+w.getAnfme());
//                        if(!orderDetlService.updateById(orderDetl)){
//                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                            return FAIL.setMsg("全板出库 ===>> 修改订单数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
//                        }
                    }

                    // 删除工作档源库位的库存明细

 src/main/resources/license.lic

Binary files differ