From 4df7d6e74b42acb1c5716ed87f26d236568b60df Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期四, 25 十二月 2025 13:01:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 0c96d13..bf35826 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -216,6 +216,9 @@
             if (Objects.isNull(mats)) {
                 throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
             }
+            if (Objects.isNull(mats.getPro_type())) {
+                throw new CoolException("闆朵欢绫诲瀷涓嶈兘涓虹┖锛侊紒");
+            }
             Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", mats.getPro_komcode()));
             if (!Objects.isNull(matnr)) {
                 // 璁㈠崟鏃堕棿
@@ -225,7 +228,7 @@
                 }
                 matnr.setMaktx(mats.getPro_name());
                 matnr.setSpecs(mats.getPro_size());
-                matnr.setWeight(Double.parseDouble(mats.getPro_wet()));
+                matnr.setWeight(Objects.isNull(mats.getPro_wet()) ? 0.0 : Double.parseDouble(mats.getPro_wet()));
                 matnr.setSuppCode(mats.getPro_id());
                 matnr.setTagId(MatLocType.getTag(mats.getPro_type()));
                 matnr.setLocType(MatLocType.getTag(mats.getPro_type()));
@@ -277,7 +280,7 @@
         OrderParams orderParams = JSONObject.parseObject(JSONObject.toJSONString(params), OrderParams.class);
         // Order order = orderService.selectOne(new
         // EntityWrapper<Order>().eq("order_no", orderParams.getDispatch_no()));
-        Order order = new Order();
+        Order order = null;
         if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
             // 鍏ュ簱
             order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
@@ -293,10 +296,13 @@
                 // 澶囪揣鎸囩ず娲惧伐鍗曪紙EO/SO锛夊嚭搴�
                 order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
                         orderParams.getDispatch_no()));
+            } else {
+                throw new CoolException("鍗曟嵁绫诲瀷涓嶅瓨鍦紝涓嶆敮鎸佹坊鍔狅紒锛�");
             }
+        } else {
+            throw new CoolException("鍗曟嵁绫诲瀷涓嶅瓨鍦紝涓嶆敮鎸佹坊鍔狅紒锛�");
         }
         // 鍑哄簱
-
         if (type.equals("add") && !Objects.isNull(order)) {
             throw new CoolException("鍗曟嵁宸插瓨鍦�, 涓嶅彲閲嶅娣诲姞锛侊紒");
         }
@@ -359,6 +365,7 @@
         newOrder.setUuid(generateUUID(params));
         // 娴佹按鍙凤紙鍞竴锛�
         newOrder.setDefNumber(params.getKopen_id());
+        newOrder.setTargetLocation(params.getTarget_location());
         // 绠卞彿
         newOrder.setItemName(params.getPm_tktid());
         newOrder.setSettle(OrderSettle.ORDER_SETTLE_HOLDING.type);

--
Gitblit v1.9.1