Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1091,10 +1091,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceDetailEntities.add(advanceDetailModel);
 			}
 
-			int all = orderPackageCodes.size() + advanceDetailEntities.size();
-			if(all != trunklineAdvanceEntity.getTotalNum()){
-				advanceService.updateTotalNumById(trunklineAdvanceEntity.getId(),all);
-			}
+//			int all = orderPackageCodes.size() + advanceDetailEntities.size();
+//			if(all != trunklineAdvanceEntity.getTotalNum()){
+//				advanceService.updateTotalNumById(trunklineAdvanceEntity.getId(),all);
+//			}
 		}
 		advanceDetailService.saveBatch(advanceDetailEntities);
 
@@ -1218,10 +1218,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceDetailEntities.add(advanceDetailModel);
 			}
 
-			int all = orderPackageCodes.size() + advanceDetailEntities.size();
-			if(all != trunklineAdvanceEntity.getTotalNum()){
-				advanceService.updateTotalNumById(trunklineAdvanceEntity.getId(),all);
-			}
+//			int all = orderPackageCodes.size() + advanceDetailEntities.size();
+//			if(all != trunklineAdvanceEntity.getTotalNum()){
+//				advanceService.updateTotalNumById(trunklineAdvanceEntity.getId(),all);
+//			}
 
 		}
 		advanceDetailService.saveBatch(advanceDetailEntities);