编辑时总支数维护逻辑调整

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -469,10 +469,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		if("1024".equals(old.getTypeConfigId()) && oConvertUtils.isNotEmpty(storageBill.getDestination())){
 			// 合并更新字段
 			BeanUtils.copyProperties(storageBill, old);
-			log.info("钢坯装运单编辑，前端同步总支数：{}", old.getAmountTotal());
 			old.setAmountTotal(originalAmountTotal);
-
-			log.info("钢坯装运单编辑，同步装运单原始总支数：{}", old.getAmountTotal());
 			JSONObject jsonObject = storageBillService.billetAutoTmpDataSyn(old);
 
 			log.info("钢坯装运单编辑，未知目的地数据同步结果：{}", jsonObject);
@@ -481,6 +478,13 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 				int carNum = calculateCarNum(storageBill.getCcmNo(), storageBill.getLicensePlate(), storageBill.getShiftGroup(), storageBill.getShift());
 				storageBill.setCarNum(carNum + 1);
 			}
+			// 该装运单是否发车，如果已发车，AmountTotal使用前端传递的新值，未发车支数不允许编辑，使用装运单中支数旧值
+			if (oConvertUtils.isNotEmpty(storageBill.getOutTime())){
+				storageBill.setAmountTotal(storageBill.getAmountTotal());
+			}else {
+				// 原始支数旧值
+				storageBill.setAmountTotal(originalAmountTotal);
+			}
 			storageBillService.updateById(storageBill);
 		}
 		operateLogService.add(old,storageBill,StorageBill.class);