update001

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

@@ -349,6 +349,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		}
 		if (oConvertUtils.listIsEmpty(billetBasicInfoLists)){
 			log.info("{}{}", "钢坯基础信息不存在，C端自动化轧钢外运<保存>失败!", jsonObject);
+			//4 获取所有的坯号集合
+			LambdaQueryWrapper<BilletBasicInfo> queryWrapperTest = new LambdaQueryWrapper<>();
+			queryWrapper1.in(BilletBasicInfo::getBilletNo, Arrays.asList(billetNosparts));
+			List<BilletBasicInfo> billetBasicInfoListsTest = billetBasicInfoService.list(queryWrapper1);
+			log.info("{}{}", "C端查询钢坯实绩对象信息:", JSON.toJSON(billetBasicInfoListsTest));
 			BilletAutoException billetAutoException = createBilletAutoException(ccmNo, billetNos, shiftGroupHandle(ccmNo), shiftHandle(ccmNo), null);
 			billetAutoException.setMassage("钢坯基础信息不存在，自动化轧钢外运<保存>失败!");
 			billetAutoExceptionService.save(billetAutoException);
@@ -604,6 +609,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			BilletAutoException billetAutoException = createBilletAutoException(billetHotsend.getCcmNo(), String.join(",", billetNos), billetHotsend.getShiftGroup(), billetHotsend.getShift(), billetHotsendTypeConfig);
 			billetAutoException.setMassage("钢坯热送信息不存在，自动化棒线操作失败!");
 			billetAutoExceptionService.save(billetAutoException);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			result.put("fail", "钢坯热送传递单不存在，自动化棒线操作失败！");
 			return result;
 		}
@@ -1018,7 +1024,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			JSONObject jsonObject = commonBilletHotsenAndDetailsHandle(billetHotsend, billetHotsendDetailsVo, billetHotsendTypeConfig, storageBill, groupRollClubCommonList);
 			if (jsonObject.containsKey("fail")){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-				log.info("{}{}", "自动化棒线轧钢外运钢坯热送信息查询、明细 新增、更新失败！事务回滚", jsonObject);
+				log.info("{}{}", "C端自动化轧钢外运，钢坯热送信息查询、明细 新增、更新失败！事务回滚:", jsonObject);
 				return jsonObject;
 			}
 		}
@@ -1030,7 +1036,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.in(BilletBasicInfo::getBilletNo, billetNos);
 		List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapperls);
 		if (oConvertUtils.listIsEmpty(billetBasicInfoList)) {
-			log.info("{}{}", "钢坯基础信息为空，C端自动化钢坯轧钢外运保存失败！", billetNos);
+			log.info("{}{}", ">>>>>>钢坯实绩查询为空，C端自动化轧钢外运保存失败，事务回滚:", billetNos);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			result.put("fail", "钢坯基础信息为空，C端自动化钢坯轧钢外运保存失败！");
 			return result;
 		}

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

@@ -354,7 +354,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 .eq(StackingAndLoadingVehicles::getTypeConfigId, billetHotsendTypeConfig.getId())
                 .isNotNull(StackingAndLoadingVehicles::getBilletNos));
         if (oConvertUtils.isEmpty(stackingAndLoadingVehiclesInfo)){
-            log.info("{}{}", "查询垛位公共容器信息为空，C端自动化垛位装车保存失败：", jsonObject);
+            log.info("{}{}", "该垛位位置上钢坯基础信息为空，C端自动化垛位装车保存失败：", jsonObject);
             return;
         }
         stackingAndLoadingVehiclesLists.add(stackingAndLoadingVehiclesInfo);
@@ -794,6 +794,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
             if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
                 log.info("{}{}", "自动化堆垛保存失败，钢坯基础信息不存在！", x.getBilletNos());
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return;
             }
             List<String> heatNos = billetBasicInfoList.stream().map(BilletBasicInfo::getHeatNo).distinct().collect(Collectors.toList());
@@ -1064,14 +1065,15 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
 
             LambdaQueryWrapper<StackingAndLoadingVehicles> queryWrapperCheck = new LambdaQueryWrapper<>();
             queryWrapperCheck.eq(StackingAndLoadingVehicles::getCcmNo, x.getCcmNo())
-                    .eq(StackingAndLoadingVehicles::getLayer,  x.getLayer())
+                    .eq(StackingAndLoadingVehicles::getLayer, x.getLayer())
                     .eq(StackingAndLoadingVehicles::getAddress, x.getAddress())
                     .eq(StackingAndLoadingVehicles::getTypeConfigId, loadingParams.getBilletHotsendTypeConfigId())
                     .isNotNull(StackingAndLoadingVehicles::getBilletNos);
             // 查询垛位容器信息
             StackingAndLoadingVehicles stackingAndLoadingVehiclesCheck = stackingAndLoadingVehiclesMapper.selectOne(queryWrapperCheck);
-            if (oConvertUtils.isNotEmpty(stackingAndLoadingVehiclesCheck) && oConvertUtils.isNotEmpty(stackingAndLoadingVehiclesCheck.getBilletNos())) {
-                log.info("{}{}", "C端自动化起垛失败，该垛位容器位置已被占用!", x.getBilletNos());
+            if (oConvertUtils.isNotEmpty(stackingAndLoadingVehiclesCheck)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                log.info("{}{}", "C端自动化起垛失败，该垛位容器位置已被占用,事务回滚!", x.getBilletNos());
                 return;
             }
 
@@ -1089,7 +1091,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             queryWrapper.in(BilletBasicInfo::getBilletNo, Arrays.asList(parts));
             List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
             if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
-                log.info("{}{}", "自动化堆垛起跺保存失败，钢坯基础信息不存在！", x.getBilletNos());
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                log.info("{}{}", "C端自动化起跺失败，钢坯基础信息不存在，事务回滚:", x.getBilletNos());
                 return;
             }
             BilletBasicInfo billetBasicInfo = billetBasicInfoList.stream().findFirst().orElse(null);
@@ -1101,7 +1104,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             stackingAndLoadingVehicles.setSpec(billetBasicInfo.getSpec());
             stackingAndLoadingVehicles.setSteel(billetBasicInfo.getGrade());
             stackingAndLoadingVehicles.setCreateDate(new Date());
-            log.info("{}{}", "》》》》》》》自动化起跺容器中的信息：", JSON.toJSON(stackingAndLoadingVehicles));
+            log.info("{}{}", ">>>>>>自动化起跺容器中的信息：", JSON.toJSON(stackingAndLoadingVehicles));
             baseMapper.update(stackingAndLoadingVehicles, queryWrapperSA);
         });
         // 3 保存 起垛日志    stacking_up_log

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/storageBill/entity/StorageBill.java

@@ -189,7 +189,6 @@ public class StorageBill implements Serializable {
     @ApiModelProperty(value = "新站台or旧站台（0 新站台 1 旧站台）")
     private Integer newOldPlatform;
 
-
     /**
      * 确认支数时间
      */
@@ -198,4 +197,9 @@ public class StorageBill implements Serializable {
     @ApiModelProperty(value = "确认支数时间")
     private Date confirmNumTime;
 
+    /**总支数*/
+    @Excel(name = "看板总支数", width = 15)
+    @ApiModelProperty(value = "看板总支数")
+    private Integer panelAmountTotal;
+
 }

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/storageBill/service/impl/StorageBillServiceImpl.java

@@ -179,6 +179,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             }
 
             storageBill.setAmountTotal(0);
+            storageBill.setPanelAmountTotal(0);
             storageBill.setArrivalTime(new Date());// 到达时间
             storageBill.setPositionNum(Integer.valueOf(positionNum));
             storageBill.setShiftGroup(shiftGroup);