From 747785dd1c86595f65c85fdeda289f917196c467 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 17 十一月 2023 16:52:47 +0800
Subject: [PATCH] 优化agv工作档生成 组托时管控料箱码 拣料出库时生成工作党 AGV库存主档,工作主档的barcode也要记录料箱条码号 AGV工作党任务完成、取消优化 自动补货 管控不带料箱的托盘 盘点加上楼层选择

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 91d7dd7..dba14a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -175,7 +175,7 @@
             }
             for (DetlDto detlDto : detlDtos) {
                 // 淇敼璁㈠崟鏄庣粏鏁伴噺
-                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme(),detlDto.getCsocode(),detlDto.getIsoseq())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
                 }
             }
@@ -198,13 +198,13 @@
         orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
     }
 
-    public void report(Long orderId, Long userId) {
+    public void report(Long orderId, String username) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Order order = this.selectById(orderId);
         Map<String, Object> param = new HashMap<>();
         param.put("id",order.getOrderNo());
         param.put("dDate",sdf.format(new Date()));
-        param.put("cHandler",userId.toString());
+        param.put("cHandler",username);
 
         List<Map<String,Object>> orderDetlsParam = new ArrayList<>();
         param.put("orderDetails",orderDetlsParam);

--
Gitblit v1.9.1