From fb8d2664da608d1cb1895c483b904c258f3b171d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 13:52:40 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/ioWorks/matQuery.js                         |    4 ++--
 src/main/java/zy/cloud/wms/manager/service/OrderService.java          |    2 +-
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java  |    5 ++---
 src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java |    4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/service/OrderService.java b/src/main/java/zy/cloud/wms/manager/service/OrderService.java
index a8c06e5..cfec7eb 100644
--- a/src/main/java/zy/cloud/wms/manager/service/OrderService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/OrderService.java
@@ -9,6 +9,6 @@
 
     Order selectByUuid(String uuid);
 
-    Integer insertReturnId(Order order);
+    Boolean insertReturnId(Order order);
 
 }
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java
index e27e6f0..78807fc 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java
@@ -23,8 +23,8 @@
     }
 
     @Override
-    public Integer insertReturnId(Order order) {
-        return this.baseMapper.insert(order);
+    public Boolean insertReturnId(Order order) {
+        return this.baseMapper.insert(order) > 0;
     }
 
 }
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 96a73ef..399e9f0 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -523,8 +523,7 @@
                 now,    // 淇敼鏃堕棿
                 null    // 澶囨敞
         );
-        Integer orderId = orderService.insertReturnId(order);
-        if (orderId == 0) {
+        if (!orderService.insert(order)) {
             throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
         }
         // 閬嶅巻鍟嗗搧鏁伴噺骞朵繚瀛�
@@ -535,7 +534,7 @@
                 continue;
             }
             OrderDetl orderDetl = new OrderDetl();
-            orderDetl.setOrderId(orderId.longValue());  // 璁㈠崟鍐呯爜
+            orderDetl.setOrderId(order.getId());  // 璁㈠崟鍐呯爜
             orderDetl.setAnfme(dto.getCount());         // 鏁伴噺
             orderDetl.setCreateBy(userId);
             orderDetl.setCreateTime(now);
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index e54cc5b..7a2b7f1 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -272,8 +272,8 @@
             docType: data.field.docType
             , orderNo: data.field.orderNo
             , orderTime: data.field.orderTime
-            , item: itemVal.getValue()[0].name
-            , cstmr: cstmrVal.getValue()[0].name
+            , item: itemVal.getValue()[0] ? itemVal.getValue()[0].name : null
+            , cstmr: cstmrVal.getValue()[0] ? cstmrVal.getValue()[0].name : null
             , list: matDetls
         })
         $.ajax({

--
Gitblit v1.9.1