完善出库时上传托盘码的逻辑以及用过的出库单重置

zyh

13 小时以前 510e90328547a8a0d03fa508a46070d1d8c780c2

完善出库时上传托盘码的逻辑以及用过的出库单重置

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

@@ -976,17 +976,19 @@
            OrderPakout order = orderPakoutService.selectByNo(mesCallOutApply.getOrderNo());
            // 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
            if (!Cools.isEmpty(order)) {
                if (order.getSettle() > 1L) {
                if (order.getSettle() > 1L && order.getSettle() < 6L) {
                    throw new CoolException(mesCallOutApply.getOrderNo() + "正在出库，无法修改单据");
                }
                orderPakoutService.remove(order.getId());
                else if (order.getSettle() == 6L) {
                    orderPakoutService.remove(order.getId());
                }
            }

            // 生成订单
            Date now = new Date();
            OrderPakout orderPakout = new OrderPakout();
            orderPakout.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
            orderPakout.setOrderNo(mesCallOutApply.getOrderNo());
            orderPakout.setOrderNo(mesCallOutApply.getTaskno());
            orderPakout.setOrderTime(DateUtils.convert(now));
            orderPakout.setDocType(docType.getDocId());
            orderPakout.setSettle(settle);

 src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java

@@ -128,6 +128,9 @@
                if (!taskService.insert(task)) {
                    throw new CoolException("保存工作档失败");
                } else {
                    wrkMast.setWrkSts(31L);//31.AGV搬运任务创建成功
                    wrkMast.setModiTime(date);
                    wrkMastService.updateById(wrkMast);
                    if (!wrkMast.getBarcode().isEmpty() && !wrkMast.getMemo().isEmpty()) {
                        JSONObject map = new JSONObject();
                        map.put("orderNo", TaskNo);
@@ -146,9 +149,6 @@
                            }
                        }
                    }
                    wrkMast.setWrkSts(31L);//31.AGV搬运任务创建成功
                    wrkMast.setModiTime(date);
                    wrkMastService.updateById(wrkMast);
                }
            }
        }