#盘点

zhou zhou

20 小时以前 5315fe106471728406cbd521576c3fc5d9d28791

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

@@ -69,12 +69,6 @@
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private WcsController wcsController;
    @Autowired
    private RowLastnoService rowLastnoService;
@@ -91,9 +85,6 @@

    @Resource
    private LocMastMapper locMastMapper;

    @Resource
    private OrderPakoutService orderPakOutService;

    @Autowired
    private CheckOrderService checkOrderService;
@@ -1165,7 +1156,7 @@


    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void cancelWrkMast(String workNo, Long userId) {
        Date now = new Date();
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",workNo));
@@ -1272,6 +1263,30 @@

        }

        if (wrkMast.getIoType() == 107) {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            if (!Cools.isEmpty(wrkDetls.get(0).getOrderNo())){

                for (WrkDetl wrkDetl : wrkDetls) {
                    CheckOrderDetl checkOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<CheckOrderDetl>()
                            .eq("loc_no", wrkMast.getSourceLocNo())
                            .eq("matnr", wrkDetl.getMatnr())
                            .eq("batch", wrkDetl.getBatch())
                            .eq("order_no", wrkDetl.getOrderNo())
                    );
                    checkOrderDetl.setStatus(1);
                    checkOrderDetlService.updateById(checkOrderDetl);
                }
                CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", wrkDetls.get(0).getOrderNo()));
                List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", checkOrder.getId()));
                boolean is = checkOrderDetls.stream().allMatch(item -> item.getStatus().equals(1));
                checkOrder.setSettle(is?1L:12L);
                checkOrderService.updateById(checkOrder);
            }


        }

//        // 订单关联
//        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//        for (WrkDetl wrkDetl : wrkDetls) {