Przeglądaj źródła

钢坯装运单列表编辑目的地数据同步

qiangxuan 2 miesięcy temu
rodzic
commit
25ca004700

+ 10 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -152,6 +152,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         });
 
         StorageBill storageBill = loadingParams.getStorageBill();
+        if (storageBill != null && "1024".equals(storageBill.getTypeConfigId())){
+            result.put("fail", "请先确认目的地,垛位装车失败!");
+            return result;
+        }
+
         String rollHeightStorageBillId = String.valueOf(IdWorker.getId());
         handleStackDepartCommon(billetHotsend, stackingAndLoadingVehiclesList, loadingParams, billetHotsendTypeConfig, storageBill, rollHeightStorageBillId, rollClubCommonList);
 
@@ -579,6 +584,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         });
 
         StorageBill storageBill = loadingParams.getStorageBill();
+        if (storageBill != null && "1024".equals(storageBill.getTypeConfigId())){
+            result.put("fail", "请先确认目的地,垛位发车失败!");
+            return result;
+        }
+
         String rollHeightStorageBillId = String.valueOf(IdWorker.getId());
         handleStackDepartCommon(billetHotsend, stackingAndLoadingVehiclesList, loadingParams, billetHotsendTypeConfig, storageBill, rollHeightStorageBillId, rollClubCommonList);
         Map<String, List<RollClubCommon>> rollClubCommonListttt = groupByShiftAttributes(rollClubCommonList);

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

@@ -359,6 +359,11 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 	public Result<String> edit(@RequestBody StorageBill storageBill) {
 		StorageBill old = storageBillService.getById(storageBill.getId());
 		storageBillService.updateById(storageBill);
+		if(oConvertUtils.isNotEmpty(storageBill.getDestination())){
+			log.info("{}{}", "钢坯装运单编辑,未知目的地数据开始同步:", storageBill.getLicensePlate());
+			JSONObject jsonObject = storageBillService.billetAutoTmpDataSyn(storageBill);
+			log.info("{}{}", "钢坯装运单编辑,未知目的地数据同步结果:", jsonObject);
+		}
 		operateLogService.add(old,storageBill,StorageBill.class);
 		return Result.OK("编辑成功!");
 	}