From 957a7ac4957da4f520ea0cd5fe74d1bbf6b308a8 Mon Sep 17 00:00:00 2001
From: hy2250089 <hy2250089@qq.com>
Date: Mon, 6 Jan 2020 17:10:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=8A=A0=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProductProcessServiceImpl.java       | 17 ++++----
 .../manage/web/OtherServiceController.java    | 42 +++++++++++++++++++
 2 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/OtherServiceController.java

diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
index 0dc460e..431cd7d 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
@@ -198,8 +198,9 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I
         List<ProcessHo> processHoList = productProcessHo.getProcessHoList();
         List<MtAloneProcess> processList;
         List<ProcessMaterials> processMaterialsList;
-        if(null != processHoList) {
+        if((null!=processHoList) && (0!=processHoList.size())) {
             processList = new ArrayList<MtAloneProcess>(processHoList.size());
+            processMaterialsList = new ArrayList<ProcessMaterials>();
             for (ProcessHo processHo : processHoList) {
                 MtAloneProcess process = new MtAloneProcess();
                 BeanUtils.copyProperties(processHo, process);
@@ -213,15 +214,8 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I
                 process.setCompanyId(currentUser.getCompanyId());
                 processList.add(process);
 
-            }
-            processService.save(processList);
-
-            processMaterialsList = new ArrayList<ProcessMaterials>();
-            for (int i=0; i<processList.size(); i++) {
-                MtAloneProcess process = processList.get(i);
-                ProcessHo processHo = processHoList.get(i);
                 List<ProcessMaterialsVo> processMaterialsVoList = processHo.getProcessMaterialsVoList();
-                if(null != processMaterialsVoList) {
+                if((null!=processMaterialsVoList) && (0!=processMaterialsVoList.size())){
                     for (ProcessMaterialsVo processMaterialsVo : processMaterialsVoList) {
                         ProcessMaterials processMaterials = new ProcessMaterials();
                         BeanUtils.copyProperties(processMaterialsVo, processMaterials);
@@ -238,7 +232,10 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I
                     }
                 }
             }
-            processMaterialsService.save(processMaterialsList);
+
+            processService.save(processList);
+            if (0 != processMaterialsList.size())
+                processMaterialsService.save(processMaterialsList);
         }
     }
 
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/OtherServiceController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/OtherServiceController.java
new file mode 100644
index 0000000..b57fd9d
--- /dev/null
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/OtherServiceController.java
@@ -0,0 +1,42 @@
+package com.deer.wms.produce.manage.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.deer.wms.intercept.annotation.User;
+import com.deer.wms.intercept.common.data.CurrentUser;
+import com.deer.wms.produce.manage.model.*;
+import com.deer.wms.project.seed.core.result.Result;
+import com.deer.wms.project.seed.core.result.ResultGenerator;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+* Created by  on 2019/09/09.
+*/
+@Api(description = "其他服务接口")
+@RestController
+@RequestMapping("/other/service")
+public class OtherServiceController {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    //获取所有客户
+    @GetMapping
+    public Result getClients() {
+        JSONObject jsonObject = restTemplate.getForObject("http://132.232.34.114:9060/wms/client/manages/list/new", JSONObject.class);
+        JSONObject data = jsonObject.getJSONObject("data");
+        JSONArray listJson = data.getJSONArray("list");
+        List list = JSON.parseObject(listJson.toJSONString(), ArrayList.class);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
+}