取消配车，取消出库合计减少程序检查

src/main/java/com/th/demo/service/impl/ware/DistributionServiceImpl.java

@@ -79,14 +79,27 @@ public class DistributionServiceImpl implements DistributionService {
         });
         List<Store> list = JSON.parseObject(jsonList, new TypeReference<List<Store>>() {
         });
-        if (distribution.getListDetail().size() == list.size()) {
-            distribution.setOutFlag("2");
-            num += distributionMapper.updateByPrimaryKey(distribution);
-        }
+
+        double cancelWeight = 0;
+        double cancelNum = 0;
+
         for (int i = 0; i < list.size(); i++) {
+            cancelWeight+=list.get(i).getWeight();
+            cancelNum+=list.get(i).getCount();
             list.get(i).setLockFlag("0");
             num += storeMapper.updateByPrimaryKey(list.get(i));
         }
+        if (distribution.getListDetail().size() == list.size()) {
+            distribution.setOutFlag("2");
+            distribution.setSumCount(distribution.getSumCount()-cancelNum);
+            distribution.setSumWeight(distribution.getSumWeight()-cancelWeight);
+            num += distributionMapper.updateByPrimaryKey(distribution);
+        }else{
+            distribution.setSumCount(distribution.getSumCount()-cancelNum);
+            distribution.setSumWeight(distribution.getSumWeight()-cancelWeight);
+            num += distributionMapper.updateByPrimaryKey(distribution);
+
+        }
         for (int i = 0; i < distribution.getListDetail().size(); i++) {
             for (int j = 0; j < list.size(); j++) {
                 if (distribution.getListDetail().get(i).getStore().getId().equals(list.get(j).getId())) {

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -113,6 +113,10 @@ public class OutServiceImpl implements OutService {
                 OutRecord outRecord = getOutRecord(store, "", "0", userId);
                 num += outRecordMapper.insert(outRecord);
                 num += storeMapper.insert(store);
+                Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
+                distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
+                distribution.setSumCount(distribution.getSumCount()- store.getCount());
+                num=distributionMapper.updateByPrimaryKey(distribution);
             }
             result = Tools.moreThanZeroResultJSON(num);
         } else {
@@ -129,6 +133,10 @@ public class OutServiceImpl implements OutService {
                 OutRecord outRecord = getOutRecord(store, "", "0", userId);
                 num += outRecordMapper.insert(outRecord);
                 num += storeMapper.insert(store);
+                Distribution distribution = distributionMapper.selectByPrimaryKey(listOutRecord.get(i).getDistributionId());
+                distribution.setSumWeight(distribution.getSumWeight()- store.getWeight());
+                distribution.setSumCount(distribution.getSumCount()- store.getCount());
+                num=distributionMapper.updateByPrimaryKey(distribution);
             }
             result = Tools.moreThanZeroResultJSON(num);
         }