堆垛 管理

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -334,7 +334,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		List<BilletBasicInfo> billetBasicInfoLists = billetBasicInfoService.list(queryWrapper1);
 		if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
 			// 循环三次处理
-			for (int i = 0; i < 6; i++) {
+			for (int i = 0; i < 10; i++) {
 				// 延迟10秒
 				try {
 					Thread.sleep(10000);

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -171,6 +171,17 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         log.info("C端起跺吊运单信息：" + JSON.toJSON(billetLiftingBillList));
         saveBatchBilletLiftingBills(billetLiftingBillList);
 
+        // 验证垛位容器是否被占位
+        LambdaQueryWrapper<StackingAndLoadingVehicles> queryWrapperCheck = new LambdaQueryWrapper<>();
+        queryWrapperCheck.eq(StackingAndLoadingVehicles::getCcmNo, ccmNo)
+                .eq(StackingAndLoadingVehicles::getLayer, jsonObject.getString("layer")).eq(StackingAndLoadingVehicles::getAddress, jsonObject.getString("address"));
+        // 查询垛位容器信息
+        StackingAndLoadingVehicles stackingAndLoadingVehiclesCheck = stackingAndLoadingVehiclesMapper.selectOne(queryWrapperCheck);
+        if (oConvertUtils.isNotEmpty(stackingAndLoadingVehiclesCheck) && oConvertUtils.isNotEmpty(stackingAndLoadingVehiclesCheck.getBilletNos())) {
+            log.info("{}{}", "该垛位容器位置已被占用，自动化新增堆垛失败!", jsonObject.toJSONString());
+            return;
+        }
+
         // 根据billetHotsendTypeConfigId 查询基础垛位信息
         BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(billetHotsendTypeConfigId);
         loadingParams.setBelongTable(billetHotsendTypeConfig.getBelongTable());