承运商不为空+配车取消更新条数重量

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

@@ -39,6 +39,7 @@ public class DistributionServiceImpl implements DistributionService {
     String result = Type.FAIL;
     int num = 0;
 
+
     @Override
     public String queryWaitTrucks(String userId, String belongId) {
 
@@ -79,14 +80,24 @@ 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);
-        }
+
+        int detailnum = 0;
+        double detailwgt = 0;
+
         for (int i = 0; i < list.size(); i++) {
             list.get(i).setLockFlag("0");
+            detailnum += list.get(i).getCount();
+            detailwgt += list.get(i).getWeight();
             num += storeMapper.updateByPrimaryKey(list.get(i));
         }
+        if (distribution.getListDetail().size() == list.size()) {
+            distribution.setOutFlag("2");
+            num += distributionMapper.updateByPrimaryKey(distribution);
+        }else {
+            distribution.setSumCount(distribution.getSumCount() - detailnum);
+            distribution.setSumWeight(distribution.getSumWeight() - detailwgt);
+            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

@@ -145,6 +145,9 @@ public class OutServiceImpl implements OutService {
         Distribution distribution = JSON.parseObject(json, new TypeReference<Distribution>() {
         });
         distribution.setOutFlag("1");
+        if(distribution.getTransportName().equals("")||distribution.getTransportName() == null){
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "承运单位不可为空！");
+        }
         num += distributionMapper.updateByPrimaryKey(distribution);
         List<String> listStoreId = new ArrayList<String>();
         for (int i = 0; i < distribution.getListDetail().size(); i++) {