From a37ae92711390561c3dc63285dd6149f4f31f399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 19 Jul 2023 11:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/PurOrderController.java          | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
index 456407e07..a327603f0 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
@@ -96,31 +96,10 @@ public class PurOrderController {
         if (purOrderEntity.getId() == null) {
             purOrderService.insert(purOrderEntity);
         } else {
-            List<PurOrderDetailEntity> purOrderDetailEntityList = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
-            //判断是不是存在同一个供应商产品
-            Map<String, List<PurOrderDetailEntity>> purOrderDetailMap = purOrderDetailEntityList.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
-            if (purOrderDetailMap.size() > 1) {
-                for (String key : purOrderDetailMap.keySet()) {
-                    List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailMap.get(key);
-                    PurOrderEntity purOrderEntity1 = new PurOrderEntity();
-                    purOrderEntity1 = purOrderEntity;
-                    purOrderEntity1.setId(null);
-                    purOrderEntity1.setSupId(key);
-                    purOrderEntity1.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
-                    purOrderService.insert(purOrderEntity1);
-                    for (PurOrderDetailEntity purOrderDetailEntity : purOrderDetailEntities) {
-                        purOrderDetailEntity.setId(null);
-                        purOrderDetailEntity.setOrderIdFk(purOrderEntity1.getId() + "");
-                    }
-                    purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailMap.get(key));
-                }
-                purOrderService.deleteById(id);
-                purOrderDetailService.deleteByOrderId(id + "");
-            } else {
-                purOrderService.update(purOrderEntity);
-            }
+            purOrderService.update(purOrderEntity);
         }
 
+
         return ResultVOUtils.success("提交成功！");
     }
 
@@ -172,6 +151,8 @@ public class PurOrderController {
     @RepeatSubmit()
     @PostMapping("/purchase/order/auditOrder")
     public BaseResponse auditOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) {
+
+
         Long userId = customerService.getUserId();
         PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
         purOrderEntity.setUpdateTime(new Date());
@@ -179,9 +160,32 @@ public class PurOrderController {
         purOrderEntity.setAuditUser(userId + "");
         purOrderEntity.setAuditTime(new Date());
         purOrderEntity.setStatus(postPurOrderRequest.getEditStatus());
-        purOrderService.update(purOrderEntity);
-
-
+        if(postPurOrderRequest.getEditStatus()==4){
+            purOrderService.update(purOrderEntity);
+        }else if(postPurOrderRequest.getEditStatus()==3){
+            Long id=purOrderEntity.getId();
+            List<PurOrderDetailEntity> purOrderDetailEntityList = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
+            //判断是不是存在同一个供应商产品
+            Map<String, List<PurOrderDetailEntity>> purOrderDetailMap = purOrderDetailEntityList.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
+            if (purOrderDetailMap.size() > 1) {
+                for (String key : purOrderDetailMap.keySet()) {
+                    List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailMap.get(key);
+                    PurOrderEntity purOrderEntity1 = new PurOrderEntity();
+                    purOrderEntity1 = purOrderEntity;
+                    purOrderEntity1.setId(null);
+                    purOrderEntity1.setSupId(key);
+                    purOrderEntity1.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
+                    purOrderService.insert(purOrderEntity1);
+                    for (PurOrderDetailEntity purOrderDetailEntity : purOrderDetailEntities) {
+                        purOrderDetailEntity.setId(null);
+                        purOrderDetailEntity.setOrderIdFk(purOrderEntity1.getId() + "");
+                    }
+                    purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailMap.get(key));
+                }
+                purOrderService.deleteById(id);
+                purOrderDetailService.deleteByOrderId(id + "");
+            }
+        }
         purChangeService.purOrderChange(purOrderEntity);
 
 //        String billNo = "";