From 655f0eaba18ec8c56058a87270bf7e15790b6aab Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 17 十二月 2025 11:05:56 +0800
Subject: [PATCH] 添加备货单接口对接

---
 src/main/java/com/zy/api/entity/OutOrderParams.java            |   34 +++++
 src/main/java/com/zy/api/entity/StockUpOrderParams.java        |   19 +++
 src/main/java/com/zy/api/enums/OrderWkType.java                |    2 
 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java |  203 ++++++++++++++++++++++++---------
 src/main/java/com/zy/api/service/KopenApiService.java          |   10 +
 src/main/java/com/zy/api/entity/PubOrderParams.java            |    2 
 src/main/java/com/zy/api/controller/KopenApiController.java    |   44 +++++++
 src/main/java/com/zy/api/entity/OrderParams.java               |   21 +++
 src/main/java/com/zy/api/entity/OrderItemsParam.java           |    3 
 9 files changed, 280 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index bdbe26e..7826534 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -5,6 +5,7 @@
 import com.zy.api.entity.OrderParams;
 import com.zy.api.entity.PubOrderParams;
 import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.entity.StockUpOrderParams;
 import com.zy.api.entity.SyncMatParmas;
 import com.zy.api.service.KopenApiService;
 import io.swagger.annotations.ApiOperation;
@@ -103,4 +104,47 @@
         return kopenApiService.sendOutDispatch(params);
     }
 
+
+    //  /**
+    //  * 澶囪揣鎸囩ず娲惧伐鍗曞弽棣�
+    //  * @author Ryan
+    //  * @date 2025/11/24 15:22
+    //  * @param params
+    //  * @return com.core.common.R
+    //  */
+    // @ApiOperation("澶囪揣鎸囩ず娲惧伐鍗曞弽棣�")
+    // @PostMapping("/getOutDispatchResult")
+    // public R getOutDispatchResult(@RequestBody ReportOrderParam params) {
+    //     if (Objects.isNull(params)) {
+    //         return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+    //     }
+    //     if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
+    //         return R.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
+    //     }
+    //     return kopenApiService.getOutDispatchResult(params);
+    // }
+
+
+    /**
+     * 澶囪揣鍗曚笅鍙�
+     * @author Ryan
+     * @date 2025/11/24 15:21
+     * @param params
+     * @return com.core.common.R
+     */
+    @ApiOperation("澶囪揣鍗曚笅鍙�")
+    @PostMapping("/getOutDetails")
+    public R getOutDetails(@RequestBody StockUpOrderParams params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
+            return R.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
+        }
+        return kopenApiService.getOutDetails(params);
+    }
+
+
+    
+
 }
diff --git a/src/main/java/com/zy/api/entity/OrderItemsParam.java b/src/main/java/com/zy/api/entity/OrderItemsParam.java
index 4fbf902..11d1e63 100644
--- a/src/main/java/com/zy/api/entity/OrderItemsParam.java
+++ b/src/main/java/com/zy/api/entity/OrderItemsParam.java
@@ -39,4 +39,7 @@
     @ApiModelProperty("鍙樻洿鏁伴噺")
     private Integer new_qty;
 
+    @ApiModelProperty("鎹嗙粦/鍙枡/鏁伴噺鏁伴噺")
+    private Integer pick_qty;
+
 }
diff --git a/src/main/java/com/zy/api/entity/OrderParams.java b/src/main/java/com/zy/api/entity/OrderParams.java
index 82685ba..0dcdc30 100644
--- a/src/main/java/com/zy/api/entity/OrderParams.java
+++ b/src/main/java/com/zy/api/entity/OrderParams.java
@@ -26,7 +26,7 @@
     @ApiModelProperty("鍏徃ID")
     private String company_id;
 
-    @ApiModelProperty("鍏ュ簱绫诲瀷 1: 閲囪喘鍏ュ簱锛�2: 璋冩嫧鍏ュ簱锛�3: 閿�鍞��璐у叆搴擄紝4: 濂楀寘鍏ュ簱, 5:SO, 6:EO")
+    @ApiModelProperty("鍏ュ簱绫诲瀷 1: 閲囪喘鍏ュ簱锛�2: 璋冩嫧鍏ュ簱锛�3: 閿�鍞��璐у叆搴擄紝4: 濂楀寘鍏ュ簱, 5:SO, 6:EO, 7:鍑哄簱")
     private String type;
 
     @ApiModelProperty("绠卞彿")
@@ -42,6 +42,25 @@
     private String source_location;
 
 
+    @ApiModelProperty("鎷h揣鍗曞彿")
+    private String pick_no;
+
+    @ApiModelProperty("璁㈠崟鍙�")
+    private String order_no;
+
+
+    @ApiModelProperty("瀹㈡埛ID")
+    private String cus_id;
+
+
+    @ApiModelProperty("瀹㈡埛鍦板潃")
+    private String cus_address;
+
+
+
+
+
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String update_time;
diff --git a/src/main/java/com/zy/api/entity/OutOrderParams.java b/src/main/java/com/zy/api/entity/OutOrderParams.java
new file mode 100644
index 0000000..32aed18
--- /dev/null
+++ b/src/main/java/com/zy/api/entity/OutOrderParams.java
@@ -0,0 +1,34 @@
+package com.zy.api.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "OutOrderParams", description = "澶囪揣璁㈠崟鍙傛暟")
+public class OutOrderParams implements Serializable {
+
+    @ApiModelProperty("鏄庣粏澶囪揣鍗曞彿")
+    private String pick_no;
+
+    @ApiModelProperty("璁㈠崟鍙�")
+    private String order_no;
+
+    @ApiModelProperty("瀹㈡埛")
+    private String cus_id;
+
+    @ApiModelProperty("瀹㈡埛鍦板潃")
+    private String cus_address;
+
+    @ApiModelProperty("涓氬姟绫诲瀷")
+    private String type;
+
+    @ApiModelProperty("璁㈠崟鏄庣粏")
+    private List<OrderItemsParam> partList;
+
+
+}
diff --git a/src/main/java/com/zy/api/entity/PubOrderParams.java b/src/main/java/com/zy/api/entity/PubOrderParams.java
index aa0af92..2f90cdb 100644
--- a/src/main/java/com/zy/api/entity/PubOrderParams.java
+++ b/src/main/java/com/zy/api/entity/PubOrderParams.java
@@ -10,7 +10,7 @@
 @Data
 @Accessors(chain = true)
 @ApiModel(value = "PubOrderParams", description = "鍙戝竷璁㈠崟淇℃伅")
-public class PubOrderParams extends OrderParams{
+public class PubOrderParams extends OrderParams {
 
     @ApiModelProperty("鍏ュ簱鐗╂枡鍒楄〃")
     List<OrderItemsParam> details;
diff --git a/src/main/java/com/zy/api/entity/StockUpOrderParams.java b/src/main/java/com/zy/api/entity/StockUpOrderParams.java
new file mode 100644
index 0000000..6243370
--- /dev/null
+++ b/src/main/java/com/zy/api/entity/StockUpOrderParams.java
@@ -0,0 +1,19 @@
+package com.zy.api.entity;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "StockUpOrderParams", description = "澶囪揣璁㈠崟鍙傛暟")
+public class StockUpOrderParams extends OrderParams{
+
+
+    @ApiModelProperty("璁㈠崟鏄庣粏")
+    private List<OutOrderParams> details;
+
+}
diff --git a/src/main/java/com/zy/api/enums/OrderWkType.java b/src/main/java/com/zy/api/enums/OrderWkType.java
index 8f410fd..900f974 100644
--- a/src/main/java/com/zy/api/enums/OrderWkType.java
+++ b/src/main/java/com/zy/api/enums/OrderWkType.java
@@ -9,7 +9,7 @@
     ORDER_WK_BAG_IN("锛�", "濂楀寘鍏ュ簱"),
     ORDER_WK_ORDER_OUT_EO("EO", "澶囪揣鎸囩ず娲惧伐鍗曪紙EO锛�"),
     ORDER_WK_ORDER_OUT_SO("SO", "澶囪揣鎸囩ず娲惧伐鍗曪紙SO锛�"),
-    ORDER_WK_ORDER_OUT("29", "澶囪揣鍗�");
+    ORDER_WK_ORDER_OUT("14", "澶囪揣鍗�");
 
     OrderWkType(String val, String desc) {
         this.val = val;
diff --git a/src/main/java/com/zy/api/service/KopenApiService.java b/src/main/java/com/zy/api/service/KopenApiService.java
index e9305e3..a773a3c 100644
--- a/src/main/java/com/zy/api/service/KopenApiService.java
+++ b/src/main/java/com/zy/api/service/KopenApiService.java
@@ -3,6 +3,7 @@
 import com.core.common.R;
 import com.zy.api.entity.PubOrderParams;
 import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.entity.StockUpOrderParams;
 import com.zy.api.entity.SyncMatParmas;
 
 public interface KopenApiService {
@@ -47,4 +48,13 @@
      * @return
      */
     R sendOutDispatch(PubOrderParams params);
+
+    /**
+     * 澶囪揣鍗曚笅鍙�
+     * @author Ryan
+     * @date 2025/11/24 15:40
+     * @param params
+     * @return com.core.common.R
+     */
+    R getOutDetails(StockUpOrderParams params);
 }
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 d62396f..ed6ff98 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -4,9 +4,12 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.R;
 import com.core.exception.CoolException;
+import com.zy.api.entity.OrderItemsParam;
 import com.zy.api.entity.OrderParams;
+import com.zy.api.entity.OutOrderParams;
 import com.zy.api.entity.PubOrderParams;
 import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.entity.StockUpOrderParams;
 import com.zy.api.entity.SyncMatParmas;
 import com.zy.api.enums.MatLocType;
 import com.zy.api.enums.OrderType;
@@ -29,7 +32,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 @Service("kopenApiServiceImpl")
@@ -45,10 +50,10 @@
     /**
      * 鎺ユ敹涓嬪彂璁㈠崟淇℃伅
      *
-     * @author Ryan
-     * @date 2025/11/24 14:49
      * @param params
      * @return com.core.common.R
+     * @author Ryan
+     * @date 2025/11/24 14:49
      */
     @Override
     public R receiveOrders(PubOrderParams params) {
@@ -61,7 +66,7 @@
 
     /**
      * 涓婃灦娲惧伐鍗曞弽棣�
-     * 
+     *
      * @author Ryan
      * @date 2025/11/24 15:33
      */
@@ -96,13 +101,14 @@
     }
 
     /* */
+
     /**
      * 澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�
-     * 
-     * @author Ryan
-     * @date 2025/11/24 15:21
+     *
      * @param params
      * @return com.core.common.R
+     * @author Ryan
+     * @date 2025/11/24 15:21
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -126,52 +132,55 @@
         return R.ok("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙戞垚鍔燂紒锛�");
     }
 
-    /**
-     * 澶囪揣鎸囩ず娲惧伐鍗�
-     * 
-     * @author Ryan
-     * @date 2025/12/16 9:15
-     * @param params
-     */
-    private void outOrderAddAndUpdate(PubOrderParams params, String type) {
-        if (Objects.isNull(params)) {
-            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
-        }
-        if (Objects.isNull(params.getType())) {
-            throw new CoolException("璁㈠崟绫诲瀷涓嶈兘涓虹┖锛侊紒");
-        }
+    // /**
+    // * 澶囪揣鎸囩ず娲惧伐鍗�
+    // *
+    // * @author Ryan
+    // * @date 2025/12/16 9:15
+    // * @param params
+    // */
+    // private void outOrderAddAndUpdate(PubOrderParams params, String type) {
+    // if (Objects.isNull(params)) {
+    // throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+    // }
+    // if (Objects.isNull(params.getType())) {
+    // throw new CoolException("璁㈠崟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+    // }
 
-        OrderParams orderParams = JSONObject.parseObject(JSONObject.toJSONString(params), OrderParams.class);
-        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getInv_no()));
-        if (type.equals("add") && !Objects.isNull(order)) {
-            throw new CoolException("鍗曟嵁宸插瓨鍦�, 涓嶅彲閲嶅娣诲姞锛侊紒");
-        }
-        // 鍒ゆ柇璁㈠崟鏄惁瀛樺湪
-        if (Objects.isNull(order)) {
-            /** 涓嶅瓨鍦紝鏂板璁㈠崟 */
-            generateOrders(params);
-        } else {
-            /** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
-            // 鍒犻櫎鏃ц鍗曟槑缁�
-            if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
-                throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
-            }
-            ;
-            if (!orderService.deleteById(order.getId())) {
-                throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
-            }
-            generateOrders(params);
-        }
+    // OrderParams orderParams =
+    // JSONObject.parseObject(JSONObject.toJSONString(params), OrderParams.class);
+    // Order order = orderService.selectOne(new
+    // EntityWrapper<Order>().eq("order_no", orderParams.getInv_no()));
+    // if (type.equals("add") && !Objects.isNull(order)) {
+    // throw new CoolException("鍗曟嵁宸插瓨鍦�, 涓嶅彲閲嶅娣诲姞锛侊紒");
+    // }
+    // // 鍒ゆ柇璁㈠崟鏄惁瀛樺湪
+    // if (Objects.isNull(order)) {
+    // /** 涓嶅瓨鍦紝鏂板璁㈠崟 */
+    // generateOrders(params);
+    // } else {
+    // /** 瀛樺湪锛屽垹闄よ�佽鍗曪紝鏇存柊鎻掑叆鏂拌鍗� */
+    // // 鍒犻櫎鏃ц鍗曟槑缁�
+    // if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id",
+    // order.getId()))) {
+    // throw new CoolException("璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+    // }
+    // ;
+    // if (!orderService.deleteById(order.getId())) {
+    // throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+    // }
+    // generateOrders(params);
+    // }
 
-    }
+    // }
 
     /**
      * 鍩虹闆朵欢鍙樻洿
      *
-     * @author Ryan
-     * @date 2025/11/24 15:05
      * @param params
      * @return com.core.common.R
+     * @author Ryan
+     * @date 2025/11/24 15:05
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -234,14 +243,29 @@
             throw new CoolException("璁㈠崟绫诲瀷涓嶈兘涓虹┖锛侊紒");
         }
         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();
         if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
             // 鍏ュ簱
-          order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getInv_no()));
-        } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
+            order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
+                    orderParams.getDispatch_no()));
+        } else if
+        (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
             // 鍑哄簱
-           order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderParams.getDispatch_no()));
+            if (OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
+                // 澶囪揣鍗曞嚭搴�
+                order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
+                        orderParams.getPick_no()));
+            } else if (OrderWkType.ORDER_WK_ORDER_OUT_EO.val.equals(params.getType())
+                    || OrderWkType.ORDER_WK_ORDER_OUT_SO.val.equals(params.getType())) {
+                // 澶囪揣鎸囩ず娲惧伐鍗曪紙EO/SO锛夊嚭搴�
+                order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
+                        orderParams.getDispatch_no()));
+            }
         }
+        // 鍑哄簱
+
         if (type.equals("add") && !Objects.isNull(order)) {
             throw new CoolException("鍗曟嵁宸插瓨鍦�, 涓嶅彲閲嶅娣诲姞锛侊紒");
         }
@@ -269,29 +293,40 @@
 
     /**
      * 鐢熸垚璁㈠崟淇℃伅
-     * 
+     *
      * @param params
      */
     @Transactional(rollbackFor = Exception.class)
     public void generateOrders(PubOrderParams params) {
         // 灏嗘暟鎹綋鏂拌鍗曟彃鍏�
         Order newOrder = new Order();
+        // 娲惧伐鍗曞彿
+        newOrder.setOrderNo(params.getDispatch_no());
         if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
             // 鍏ュ簱
             newOrder.setPakinPakoutStatus(1);
             newOrder.setDocType(Long.parseLong(params.getType()));
-            newOrder.setOrderNo(params.getInv_no());
+            newOrder.setNumber(params.getInv_no());
         } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
             // 鍑哄簱
+            if (OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
+                // 澶囪揣鍗曞嚭搴�
+                newOrder.setOrderNo(params.getPick_no());
+                newOrder.setNumber(params.getDispatch_no());
+                newOrder.setCstmrName(params.getCus_id());
+                newOrder.setTel(params.getCus_address());
+                newOrder.setDocType(Long.parseLong(OrderTypeEnum.STOCK.type + ""));
+            } else if (OrderWkType.ORDER_WK_ORDER_OUT_EO.val.equals(params.getType())
+                    || OrderWkType.ORDER_WK_ORDER_OUT_SO.val.equals(params.getType())) {
+                // 澶囪揣鎸囩ず娲惧伐鍗曪紙EO/SO锛夊嚭搴�
+                newOrder.setDocType(Long.parseLong(OrderTypeEnum.TRANSFER.type + ""));
+            }
             newOrder.setPakinPakoutStatus(2);
-            newOrder.setDocType(Long.parseLong(OrderTypeEnum.TRANSFER.type + ""));
-            newOrder.setOrderNo(params.getDispatch_no());
         }
+
         newOrder.setUuid(generateUUID(params));
         // 娴佹按鍙凤紙鍞竴锛�
         newOrder.setDefNumber(params.getKopen_id());
-        // 娲惧伐鍗曞彿
-        newOrder.setNumber(params.getDispatch_no());
         // 绠卞彿
         newOrder.setItemName(params.getPm_tktid());
         newOrder.setSettle(OrderSettle.ORDER_SETTLE_HOLDING.type);
@@ -323,8 +358,14 @@
                     orderItem.setAnfme(Math.round(item.getInv_qty() * 10000) / 10000.0);
                 } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
                     // 鍑哄簱
-                    newOrder.setPakinPakoutStatus(2);
-                    orderItem.setAnfme(Math.round(item.getOrder_qty() * 10000) / 10000.0);
+                    if (OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
+                        // 澶囪揣鍗曞嚭搴�
+                        orderItem.setAnfme(Math.round(item.getPick_qty() * 10000) / 10000.0);
+                    } else if (OrderWkType.ORDER_WK_ORDER_OUT_EO.val.equals(params.getType())
+                            || OrderWkType.ORDER_WK_ORDER_OUT_SO.val.equals(params.getType())) {
+                        // 澶囪揣鎸囩ず娲惧伐鍗曪紙EO/SO锛夊嚭搴�
+                        orderItem.setAnfme(Math.round(item.getOrder_qty() * 10000) / 10000.0);
+                    }
                 }
                 orderItem.setMatnr(matnr.getMatnr());
                 orderItem.setMaktx(matnr.getMaktx());
@@ -344,4 +385,56 @@
         }
     }
 
+    /**
+     * 澶囪揣鍗曚笅鍙�
+     *
+     * @param params
+     * @return com.core.common.R
+     * @author Ryan
+     * @date 2025/11/24 15:40
+     */
+    @Override
+    public R getOutDetails(StockUpOrderParams params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        // 鏍¢獙鍙傛暟
+        if (Objects.isNull(params.getDispatch_no())) {
+            return R.error("娲惧伐鍗曠紪鍙蜂笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(params.getKopen_id())) {
+            return R.error("娴佹按鍙蜂笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(params.getCompany_id())) {
+            return R.error("鍏徃ID涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
+            return R.error("璁㈠崟鏄庣粏涓嶈兘涓虹┖锛侊紒");
+        }
+
+        List<OrderItemsParam> items = new ArrayList<>();
+        if (params.getDetails() != null) {
+            for (OutOrderParams detail : params.getDetails()) {
+                if (detail.getPartList() != null) {
+                    items.addAll(detail.getPartList());
+                }
+            }
+        }
+
+        params.getDetails().forEach(item -> {
+            PubOrderParams pubOrderParams = new PubOrderParams();
+            BeanUtils.copyProperties(params, pubOrderParams);
+            pubOrderParams.setType(item.getType())
+                    .setPick_no(item.getPick_no())
+                    .setCus_address(item.getCus_address())
+                    .setOrder_no(item.getOrder_no())
+                    .setUpdate_time(params.getUpdate_time())
+                    .setCus_id(item.getCus_id());
+            pubOrderParams.setDetails(item.getPartList());
+            addOrUpdateOrders(pubOrderParams, "add");
+        });
+
+        return R.ok("澶囪揣鍗曚笅鍙戞垚鍔燂紒锛�");
+    }
+
 }

--
Gitblit v1.9.1