From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index c8d37ea..0e703ee 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -45,16 +45,16 @@
 
     @Override
     @Transactional
-    public boolean createOrder(List<CreateOrderParam> list) {
+    public boolean createOrder(List<CreateOrderParam> list, Long userId) {
         for (CreateOrderParam orderParam : list) {
-            createOrder(orderParam);
+            createOrder(orderParam, userId);
         }
         return true;
     }
 
     @Override
     @Transactional
-    public boolean createOrder(CreateOrderParam param) {
+    public boolean createOrder(CreateOrderParam param, Long userId) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         List<Order> orderList = this.list(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.getOrderNo()));
@@ -77,7 +77,8 @@
         order.setIoPri(orderUtils.getIoPri());
         order.setOrderTime(format.format(new Date()));
         order.setCreateTime(new Date());
-        order.setCreateBy(9527L);
+        order.setCreateBy(userId);
+        order.setUpdateBy(userId);
         boolean result = this.save(order);
         if (!result) {
             throw new CoolException("鐢熸垚璁㈠崟澶辫触");
@@ -125,7 +126,8 @@
             orderDetl.setMatId(mat.getId());
             orderDetl.setMemo(memo);
             orderDetl.setCreateTime(new Date());
-            orderDetl.setCreateBy(9527L);
+            orderDetl.setCreateBy(userId);
+            orderDetl.setUpdateBy(userId);
             boolean save = orderDetlService.save(orderDetl);
             if (!save) {
                 throw new CoolException("璁㈠崟鏄庣粏鍒涘缓澶辫触");
@@ -323,8 +325,6 @@
     @Override
     public List<OrderInfoDto> getDetlForOrderId(Long id, String matnr) {
         if (!Objects.isNull(matnr)) {
-//            Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>()
-//                    .eq(StringUtils.isNotBlank(matnr), Mat::getMatnr, matnr), false);
             if (Objects.isNull(matnr)) {
                 return this.baseMapper.getDetlForOrderId(id, null);
             } else {
@@ -334,4 +334,14 @@
             return this.baseMapper.getDetlForOrderId(id, null);
         }
     }
+
+    /**
+     * 鎻愪氦瀹岀粨璁㈠崟
+     * @param id
+     * @return
+     */
+    @Override
+    public Order doneOrder(Long id) {
+        return null;
+    }
 }

--
Gitblit v1.9.1