#order.setmemo(0)

zjj

4 天以前 fc9ebcd99b4cea492a0a04a6df8bf115c0234d27

#order.setmemo(0)

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

@@ -39,6 +39,8 @@
    private DocTypeService docTypeService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private OrderService orderService;

    @Override
    public Order selectByNo(String orderNo) {
@@ -83,6 +85,7 @@
                }
            }
            order.setMemo("0");
            orderService.updateById(order);
            if (!this.updateSettle(order.getId(), 4L, null)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }

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

@@ -42,18 +42,18 @@
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            // 修改订单状态 作业中 ===>> 已完成
            if (!Cools.isEmpty(wrkDetls)) {
                Iterator<WrkDetl> iterator = wrkDetls.iterator();
                while (iterator.hasNext()) {
                    WrkDetl wrkDetl = iterator.next();
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        orderService.checkComplete(wrkDetl.getOrderNo());
                        iterator.remove();
                    }
                }
            }
//            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//            // 修改订单状态 作业中 ===>> 已完成
//            if (!Cools.isEmpty(wrkDetls)) {
//                Iterator<WrkDetl> iterator = wrkDetls.iterator();
//                while (iterator.hasNext()) {
//                    WrkDetl wrkDetl = iterator.next();
//                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
//                        orderService.checkComplete(wrkDetl.getOrderNo());
//                        iterator.remove();
//                    }
//                }
//            }

            // 入库 --------------------------------------------------------------------------------
            if (wrkMast.getWrkSts() == 5) {

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

@@ -469,6 +469,8 @@
                        if (mastFinished) {
                            Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
                            if (!Cools.isEmpty(order)) {
                                order.setMemo("0");//状态转换成开始下推
                                orderService.updateById(order);
                                orderService.updateSettle(order.getId(),4L,1L);

                            }