From 965710511a77726d97380aca93d49f38f3224d59 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 28 May 2024 17:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E4=BF=AE=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProOrderWorkorderServiceImpl.java    | 54 ++++++++-----------
 .../mapper/plan/ProOrderWorkorderMapper.xml   |  3 +-
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 25e2f9a9..fcf98e0e 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -1172,7 +1172,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         }
 
         int count = 0;
-        for (ProOrderWorkorder workOrder : workOrders) {
+        for (int m=0;m<workOrders.size();m++) {
+            ProOrderWorkorder workOrder = workOrders.get(m);
             ProOrderWorkorderBatch batch = new ProOrderWorkorderBatch();
 
             batch.setBatchId(IdUtils.fastSimpleUUID());
@@ -1187,12 +1188,16 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
 
             if(proOrderWorkorderBatch.getNewBatchQuantity() != null){
                 Long newBatchQuantity = proOrderWorkorderBatch.getNewBatchQuantity();
-                if ("0".equals(workOrder.getParentOrder())) {
-                    // 设置父工单数量
-                    batch.setBatchQuantity(newBatchQuantity);
-                }else {
+
+                if(m==0){
                     // 设置子工单数量
-                    batch.setBatchQuantity(newBatchQuantity * coefficient);
+                    batch.setBatchQuantity(newBatchQuantity);
+                }else{
+                    BigDecimal pQuantity = new BigDecimal(workOrders.get(m).getQuantitySplit());
+                    BigDecimal cQuantity = new BigDecimal(workOrders.get(m-1).getQuantitySplit());
+
+                    batch.setBatchQuantity(pQuantity.divide(cQuantity)
+                            .multiply(new BigDecimal(newBatchQuantity)).longValue());
                 }
             }
 
@@ -1202,7 +1207,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         return count;
     }
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @DS("#header.poolName")
     public int updateWorkOrderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch) {
         String workOrderCode = proOrderWorkorderBatch.getWorkorderCode();
@@ -1211,24 +1216,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         String newBatchCode = proOrderWorkorderBatch.getNewBatchCode();
 
         List<ProOrderWorkorder> workOrders = proOrderWorkorderMapper.selectWorkOrderIdByBatch(workOrderCode);
-        // 系数
-        Long coefficient = 1L;
-        if(workOrders.size()==2){
-            // 获取子母工单数量
-            Optional<Long> pQuantity = workOrders.stream().filter(item -> "0".equals(item.getParentOrder()))
-                    .findFirst().map(ProOrderWorkorder::getQuantitySplit);
-            Optional<Long> cQuantity = workOrders.stream().filter(item -> !"0".equals(item.getParentOrder()))
-                    .findFirst().map(ProOrderWorkorder::getQuantitySplit);
-
-            if (pQuantity.isPresent() && cQuantity.isPresent()) {
-                coefficient = cQuantity.get() / pQuantity.get();
-            }
-        }else if(workOrders.size()==3){
-            //TODO;
-        }
 
         int count = 0;
-        for (ProOrderWorkorder workOrder : workOrders) {
+        for (int m=0;m<workOrders.size();m++) {
+            ProOrderWorkorder workOrder = workOrders.get(m);
             ProOrderWorkorderBatch batch = new ProOrderWorkorderBatch();
 
             batch.setBatchId(IdUtils.fastSimpleUUID());
@@ -1243,16 +1234,17 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
 
             if(proOrderWorkorderBatch.getNewBatchQuantity() != null){
                 Long newBatchQuantity = proOrderWorkorderBatch.getNewBatchQuantity();
-                if (newBatchQuantity == null) {
-                    return 0;
-                }
-                if ("0".equals(workOrder.getParentOrder())) {
-                    // 设置父工单数量
-                    batch.setNewBatchQuantity(newBatchQuantity);
-                }else {
+                if(m==0){
                     // 设置子工单数量
-                    batch.setNewBatchQuantity(newBatchQuantity * coefficient);
+                    batch.setNewBatchQuantity(newBatchQuantity);
+                }else{
+                    BigDecimal pQuantity = new BigDecimal(workOrders.get(m).getQuantitySplit());
+                    BigDecimal cQuantity = new BigDecimal(workOrders.get(m-1).getQuantitySplit());
+
+                    batch.setNewBatchQuantity(pQuantity.divide(cQuantity)
+                            .multiply(new BigDecimal(newBatchQuantity)).longValue());
                 }
+
             }
 
             count += proOrderWorkorderBatchMapper.updateWorkorderBatch(batch);
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index d793597a..cd2c3de2 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -625,13 +625,14 @@
           and powb.batch_code = #{batchCode}
         order by powb.batch_code
     </select>
-    
+
     <select id="selectWorkOrderIdByBatch" resultType="com.op.plan.domain.ProOrderWorkorder">
         select workorder_id workorderId,
                quantity_split quantitySplit,
                parent_order parentOrder
         from pro_order_workorder
         where belong_work_order = #{workorderCode} and del_flag = '0'
+        order by workorder_code_sap desc
     </select>
 
     <insert id="createPrepareDetails">