增加重复配车校验2.0

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

@@ -103,15 +103,17 @@ public class DistributionServiceImpl implements DistributionService {
         return Tools.moreThanZeroResultJSON(num);
     }
 
-public void lockAndInsertDetail(  List<Store> list,  Distribution distribution , String userId, String belongId){
-    for (int i = 0; i < list.size(); i++) {
+    public void lockAndInsertDetail(  List<Store> list,  Distribution distribution , String userId, String belongId){
+        // 重新获取ID，第一次配车的时候会出现没有ID的情况
+        Distribution distribution1 = distributionMapper.selectByTruckNo(distribution.getTruckNo(), belongId);
+        for (int i = 0; i < list.size(); i++) {
         Store store = storeMapper.selectByPrimaryKey(list.get(i).getId());
-        if (!store.getLockFlag().equals("1") && distribution.getId()!= null && !distribution.getId().equals("")){
+        if (!store.getLockFlag().equals("1") && distribution1.getId()!= null && !distribution1.getId().equals("")){
             list.get(i).setLockFlag("1");
             num += storeMapper.updateByPrimaryKey(list.get(i));
-            DistributionDetail detail = getDistributionDetail(distribution, list.get(i), userId, belongId);
+            DistributionDetail detail = getDistributionDetail(distribution1, list.get(i), userId, belongId);
             num += distributionDetailMapper.insert(detail);
-            DistributionRecord record  = getDistributionRecord(distribution, list.get(i), "1",userId, belongId);
+            DistributionRecord record  = getDistributionRecord(distribution1, list.get(i), "1",userId, belongId);
             num += distributionRecordMapper.insert(record);
         }