From 78f1e743b888f3d9865fe622c629d48dae883a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Sat, 11 May 2024 11:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesShippingOrderManagementController.java  | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java
index 4c6f1e0..1e50122 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java
@@ -3,10 +3,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
 import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
@@ -17,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Api(description = "发运单管理主页面")
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShippingOrderManagement")
@@ -29,19 +29,16 @@ public class MesShippingOrderManagementController extends BaseMesController<MesS
 
     @PostMapping(value = "/shipping")
     @ApiOperation(value = "发运")
-    public ResultBean<MesShippingOrderManagement> saveShipping(@RequestBody MesShippingOrderManagement bean) {
+    public ResultBean<MesShippingOrderManagement> saveShipping(@RequestBody List<MesShippingOrderManagement> beanList) {
         try {
-//            validateInsert(bean);
             //新增初始化
-//            bean.setOrganizeCode("2031");
-            bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
-//            ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName());
-//            T t = (T) getBaseService().insert(bean);
-            shippingOrderManagementService.saveShipping(bean);
-//            afterInsert(t);
+            for (MesShippingOrderManagement orderManagement : beanList) {
+                orderManagement.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+                shippingOrderManagementService.saveShipping(orderManagement);
+            }
+
             return ResultBean.success("操作成功")
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
-                    .setResultObject(bean);
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException e) {
             return ResultBean.fail(e).build();
         } catch (Exception e) {