采购订单取消供应商控制

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 = "";