热送热装数据维护接口开发

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -493,7 +493,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubTwoDetailsList.add(rollClubTwoDetails);
 			});
 			rollClubTwoDetailsService.saveBatch(rollClubTwoDetailsList);
-			// 更新交班表中的热送总支数
+			// 更新交班表中的热装总支数
 			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollClubTwoDetailsList.size(), "roll_club_two", "hotCharge");
 		}
 
@@ -507,7 +507,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			rollClubThree.setSpec(String.valueOf(rollClubCommonList.stream().findFirst().orElse(null).getSpec())); //规格
 //			rollClubThree.setBlankOutput();// 出坯量
 //			rollClubThree.setDecideWeight();// 定重
-
 			LambdaQueryWrapper<RollClubThree> queryWrapper1 = new LambdaQueryWrapper<>();
 			queryWrapper1.eq(RollClubThree::getCcmNo, billetHotsend.getCcmNo())
 					.eq(RollClubThree::getHeatNo, billetHotsend.getHeatNo())
@@ -536,10 +535,12 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubThreeDetails.setSize(String.valueOf(x.getLength()));
 				rollClubThreeDetails.setSteel(x.getGrade());
 				rollClubThreeDetails.setCreateTime(new Date());
+				rollClubThreeDetails.setUpdateTime(new Date());
 				billetNos.add(x.getBilletNo());
 				rollClubThreeDetailsList.add(rollClubThreeDetails);
 			});
 			rollClubThreeDetailsService.saveBatch(rollClubThreeDetailsList);
+			// 更新交班表中的热装总支数
 			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollClubThreeDetailsList.size(), "roll_club_three", "hotCharge");
 		}
 
@@ -579,8 +580,9 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollHeightDetails.setShiftGroup(billetHotsend.getShiftGroup());
 				rollHeightDetails.setSize(String.valueOf(x.getLength()));
 				rollHeightDetails.setSteel(x.getGrade());
-				billetNos.add(x.getBilletNo());
 				rollHeightDetails.setCreateTime(new Date());
+				rollHeightDetails.setUpdateTime(new Date());
+				billetNos.add(x.getBilletNo());
 				rollHeightDetailsList.add(rollHeightDetails);
 			});
 			rollHeightDetailsService.saveBatch(rollHeightDetailsList);
@@ -632,6 +634,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollOutShippDetailsList.add(rollOutShippDetails);
 			});
 			rollOutShippDetailsService.saveBatch(rollOutShippDetailsList);
+			// 更新交班表中的热装总支数
 			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollOutShippDetailsList.size(), "roll_out_shipp", "hotCharge");
 		}
 		//查询并批量更新钢坯基础信息 belongTable
@@ -785,10 +788,12 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			if (oConvertUtils.isEmpty(rollClubOne1)){
 				rollClubOne.setCreateDate(new Date());
 				rollClubOne.setAmountTotal(rollClubCommonList.size());// 总支数
+				rollClubOne.setUpdateTime(new Date());
 				rollClubOneService.save(rollClubOne);
 			}else {
 				rollClubOne.setAmountTotal(rollClubOne1.getAmountTotal() + rollClubCommonList.size());// 总支数
 				rollClubOne.setId(rollClubOne1.getId());
+				rollClubOne.setUpdateTime(new Date());
 				rollClubOneService.updateById(rollClubOne);
 			}
 			// 保存棒一明细信息
@@ -802,10 +807,13 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubOneDetails.setSize(String.valueOf(x.getLength()));
 				rollClubOneDetails.setSteel(x.getGrade());
 				rollClubOneDetails.setCreateTime(new Date());
+				rollClubOneDetails.setUpdateTime(new Date());
 				billetNos.add(x.getBilletNo());
 				rollClubOneDetailsList.add(rollClubOneDetails);
 			});
 			rollClubOneDetailsService.saveBatch(rollClubOneDetailsList);
+			// 更新交班表中的热送总支数
+			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollClubOneDetailsList.size(), "roll_club_one", "hotSend");
 		}
 
 		if ("roll_club_two".equals(billetHotsendDetailsVo.getBelongTable())){
@@ -824,12 +832,14 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 					.eq(RollClubTwo::getShiftGroup, billetHotsend.getShiftGroup());
 			RollClubTwo rollClubTwo1 = rollClubTwoService.getOne(queryWrapper1);
 			if (oConvertUtils.isEmpty(rollClubTwo1)){
-				rollClubTwo.setCreateDate(new Date());
 				rollClubTwo.setAmountTotal(rollClubCommonList.size());// 总支数
+				rollClubTwo.setCreateDate(new Date());
+				rollClubTwo.setUpdateTime(new Date());
 				rollClubTwoService.save(rollClubTwo);
 			}else {
 				rollClubTwo.setId(rollClubTwo1.getId());
 				rollClubTwo.setAmountTotal(rollClubTwo1.getAmountTotal() + rollClubCommonList.size());// 总支数
+				rollClubTwo.setUpdateTime(new Date());
 				rollClubTwoService.updateById(rollClubTwo);
 			}
 			// 保存棒二明细信息
@@ -845,10 +855,13 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubTwoDetails.setSize(String.valueOf(x.getLength()));
 				rollClubTwoDetails.setSteel(x.getGrade());
 				rollClubTwoDetails.setCreateTime(new Date());
+				rollClubTwoDetails.setUpdateTime(new Date());
 				billetNos.add(x.getBilletNo());
 				rollClubTwoDetailsList.add(rollClubTwoDetails);
 			});
 			rollClubTwoDetailsService.saveBatch(rollClubTwoDetailsList);
+			// 更新交班表中的热装总支数
+			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollClubTwoDetailsList.size(), "roll_club_two", "hotCharge");
 		}
 		if ("roll_club_three".equals(billetHotsendDetailsVo.getBelongTable())){
 			// 保存棒三信息
@@ -886,13 +899,16 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubThreeDetails.setShiftGroup(billetHotsend.getShiftGroup());
 				rollClubThreeDetails.setStorageBillId(storageBill.getId());
 				rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
-				rollClubThreeDetails.setCreateTime(new Date());
 				rollClubThreeDetails.setSize(String.valueOf(x.getLength()));
 				rollClubThreeDetails.setSteel(x.getGrade());
+				rollClubThreeDetails.setCreateTime(new Date());
+				rollClubThreeDetails.setUpdateTime(new Date());
 				billetNos.add(x.getBilletNo());
 				rollClubThreeDetailsList.add(rollClubThreeDetails);
 			});
 			rollClubThreeDetailsService.saveBatch(rollClubThreeDetailsList);
+			// 更新交班表中的热装总支数
+			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollClubThreeDetailsList.size(), "roll_club_three", "hotCharge");
 		}
 		/**
 		 * 保存高线信息
@@ -929,12 +945,15 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollHeightDetails.setShift(billetHotsend.getShift());
 				rollHeightDetails.setShiftGroup(billetHotsend.getShiftGroup());
 				rollHeightDetails.setCreateTime(new Date());
+				rollHeightDetails.setUpdateTime(new Date());
 				rollHeightDetails.setSize(String.valueOf(x.getLength()));
 				rollHeightDetails.setSteel(x.getGrade());
 				billetNos.add(x.getBilletNo());
 				rollHeightDetailsList.add(rollHeightDetails);
 			});
 			rollHeightDetailsService.saveBatch(rollHeightDetailsList);
+			// 更新交班表中的热送总支数
+			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollHeightDetailsList.size(), "roll_height", "hotSend");
 		}
 
 		/**
@@ -974,12 +993,15 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollOutShippDetails.setStorageBillId(storageBill.getId());
 				rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
 				rollOutShippDetails.setCreateTime(new Date());
+				rollOutShippDetails.setUpdateTime(new Date());
 				rollOutShippDetails.setSize(String.valueOf(x.getLength()));
 				rollOutShippDetails.setSteel(x.getGrade());
 				billetNos.add(x.getBilletNo());
 				rollOutShippDetailsList.add(rollOutShippDetails);
 			});
 			rollOutShippDetailsService.saveBatch(rollOutShippDetailsList);
+			// 更新交班表中的热装总支数
+			updateShiftInfoByType(billetHotsend.getCcmNo(), billetHotsend.getShift(), billetHotsend.getShiftGroup(), rollOutShippDetailsList.size(), "roll_out_shipp", "hotCharge");
 		}
 		//查询并批量更新钢坯基础信息 belongTable
 		LambdaQueryWrapper<BilletBasicInfo> queryWrapperls = new LambdaQueryWrapper<BilletBasicInfo>()

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

@@ -537,13 +537,14 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             stackingDownLogList.add(stackingDownLog);
             if ("roll_club_two".equals(loadingParams.getDestinationTable())){
                 RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
+                BeanUtils.copyProperties(x, rollClubTwoDetails);
                 rollClubTwoDetails.setBilletNo(x.getBilletNos());
                 rollClubTwoDetails.setStorageBillId(loadingParams.getStorageBill().getId());
                 rollClubTwoDetails.setStackStorey(x.getLayer());
                 rollClubTwoDetails.setStackNum(x.getAddress());
                 rollClubTwoDetails.setLicensePlate(loadingParams.getStorageBill().getLicensePlate());
                 rollClubTwoDetails.setCreateTime(new Date());
-                BeanUtils.copyProperties(x, rollClubTwoDetails);
+                rollClubTwoDetails.setUpdateTime(new Date());
                 addRollClubTwoDetailsList.add(rollClubTwoDetails);
             }else if ("roll_club_three".equals(loadingParams.getDestinationTable())){
                 RollClubThreeDetails rollClubThreeDetails = new RollClubThreeDetails();
@@ -554,6 +555,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollClubThreeDetails.setStackNum(x.getAddress());
                 rollClubThreeDetails.setLicensePlate(loadingParams.getStorageBill().getLicensePlate());
                 rollClubThreeDetails.setCreateTime(new Date());
+                rollClubThreeDetails.setUpdateTime(new Date());
                 addRollClubThreeDetailsList.add(rollClubThreeDetails);
             }else if ("roll_out_shipp".equals(loadingParams.getDestinationTable())){
                 RollOutShippDetails rollOutShippDetails = new RollOutShippDetails();
@@ -564,6 +566,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollOutShippDetails.setStackNum(x.getAddress());
                 rollOutShippDetails.setLicensePlate(loadingParams.getStorageBill().getLicensePlate());
                 rollOutShippDetails.setCreateTime(new Date());
+                rollOutShippDetails.setUpdateTime(new Date());
                 addRollOutShippDetailsList.add(rollOutShippDetails);
             }
         });
@@ -668,13 +671,14 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             stackingDownLogList.add(stackingDownLog);
             if ("roll_club_two".equals(loadingParams.getDestinationTable())){
                 RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
+                BeanUtils.copyProperties(x, rollClubTwoDetails);
                 rollClubTwoDetails.setBilletNo(x.getBilletNos());
                 rollClubTwoDetails.setStorageBillId(storageBill.getId());
                 rollClubTwoDetails.setStackStorey(x.getLayer());
                 rollClubTwoDetails.setStackNum(x.getAddress());
                 rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
                 rollClubTwoDetails.setCreateTime(new Date());
-                BeanUtils.copyProperties(x, rollClubTwoDetails);
+                rollClubTwoDetails.setUpdateTime(new Date());
                 addRollClubTwoDetailsList.add(rollClubTwoDetails);
             }else if ("roll_club_three".equals(loadingParams.getDestinationTable())){
                 RollClubThreeDetails rollClubThreeDetails = new RollClubThreeDetails();
@@ -685,6 +689,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollClubThreeDetails.setStackNum(x.getAddress());
                 rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
                 rollClubThreeDetails.setCreateTime(new Date());
+                rollClubThreeDetails.setUpdateTime(new Date());
                 addRollClubThreeDetailsList.add(rollClubThreeDetails);
             }else if ("roll_out_shipp".equals(loadingParams.getDestinationTable())){
                 RollOutShippDetails rollOutShippDetails = new RollOutShippDetails();
@@ -695,6 +700,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollOutShippDetails.setStackNum(x.getAddress());
                 rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
                 rollOutShippDetails.setCreateTime(new Date());
+                rollOutShippDetails.setUpdateTime(new Date());
                 addRollOutShippDetailsList.add(rollOutShippDetails);
             }
         });
@@ -842,7 +848,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             queryWrapperSA.eq(StackingAndLoadingVehicles::getCcmNo, x.getCcmNo())
                     .eq(StackingAndLoadingVehicles::getLayer, x.getLayer())
                     .eq(StackingAndLoadingVehicles::getAddress, x.getAddress())
-                    .eq(StackingAndLoadingVehicles::getTypeConfigId, loadingParams.getBilletHotsendTypeConfigId());;
+                    .eq(StackingAndLoadingVehicles::getTypeConfigId, loadingParams.getBilletHotsendTypeConfigId());
             StackingAndLoadingVehicles stackingAndLoadingVehicles = createInitializedVehicle();
             BeanUtils.copyProperties(x, stackingAndLoadingVehicles);
             stackingAndLoadingVehicles.setShift(finalCacheShint1);

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java

@@ -331,7 +331,7 @@ public class ThirdLoginController {
 			// 企业的CorpID
 			builder.append("?appid=").append(config.getClientId());
 			// 授权后重定向的回调链接地址，请使用urlencode对链接进行处理
-			String redirectUri = CommonUtils.getBaseUrl(request)  + "/sys/thirdLogin/oauth2/wechat_enterprise/callback?tenantId="+tenantId;;
+			String redirectUri = CommonUtils.getBaseUrl(request)  + "/sys/thirdLogin/oauth2/wechat_enterprise/callback?tenantId="+tenantId;
 			builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8"));
 			// 返回类型，此时固定为：code
 			builder.append("&response_type=code");