时间不一致处理

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

@@ -691,6 +691,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubOneDetails.setLicensePlate("辊道");
 				rollClubOneDetails.setSize(String.valueOf(x.getLength()));
 				rollClubOneDetails.setSteel(x.getGrade());
+				rollClubOneDetails.setUpdateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollClubOneDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollClubOneDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollClubOneDetailsList.add(rollClubOneDetails);
@@ -739,6 +740,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
 				rollClubTwoDetails.setSize(String.valueOf(x.getLength()));
 				rollClubTwoDetails.setSteel(x.getGrade());
+				rollClubTwoDetails.setUpdateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollClubTwoDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollClubTwoDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollClubTwoDetailsList.add(rollClubTwoDetails);
@@ -787,6 +789,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
 				rollClubThreeDetails.setSize(String.valueOf(x.getLength()));
 				rollClubThreeDetails.setSteel(x.getGrade());
+				rollClubThreeDetails.setUpdateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollClubThreeDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollClubThreeDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollClubThreeDetailsList.add(rollClubThreeDetails);
@@ -863,6 +866,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollHeightDetails.setLicensePlate("辊道");
 				rollHeightDetails.setSize(String.valueOf(x.getLength()));
 				rollHeightDetails.setSteel(x.getGrade());
+				rollHeightDetails.setUpdateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollHeightDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollHeightDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollHeightDetailsList.add(rollHeightDetails);
@@ -914,6 +918,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
 				rollOutShippDetails.setSize(String.valueOf(x.getLength()));
 				rollOutShippDetails.setSteel(x.getGrade());
+				rollOutShippDetails.setUpdateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollOutShippDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				rollOutShippDetails.setBlankOutput(x.getBilletWeight());//出坯量
 				rollOutShippDetailsList.add(rollOutShippDetails);
@@ -936,6 +941,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				billetAutoTmp.setLicensePlate(storageBill.getLicensePlate());
 				billetAutoTmp.setSize(String.valueOf(x.getLength()));
 				billetAutoTmp.setSteel(x.getGrade());
+				billetAutoTmp.setUpdateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				billetAutoTmp.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
 				billetAutoTmp.setBlankOutput(x.getBilletWeight());//出坯量
 				billetAutoTmpList.add(billetAutoTmp);

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

@@ -865,7 +865,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollClubTwoDetails.setShift(billetBasicInfo.getShift());
 
                 rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
-                rollClubTwoDetails.setCreateTime(new Date());
                 rollClubTwoDetails.setId(String.valueOf(IdWorker.getId()));
                 rollClubTwoDetails.setBlankOutput(billetWeightTotal);//出坯量
                 rollClubTwoDetails.setSpec(billetBasicInfoList.get(0).getSpec());
@@ -877,6 +876,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                         .distinct()
                         .collect(Collectors.joining(","));
                 rollClubTwoDetails.setAssemblyNumber(distinctAssemblyNumber);
+                rollClubTwoDetails.setCreateTime(new Date());
+                rollClubTwoDetails.setUpdateTime(new Date());
                 addRollClubTwoDetailsList.add(rollClubTwoDetails);
             }else if ("roll_club_three".equals(loadingParams.getDestinationTable())){
                 billetBasicInfoList.forEach(y ->{
@@ -926,6 +927,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollClubThreeDetails.setStackNum(x.getAddress());
                 rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
                 rollClubThreeDetails.setCreateTime(new Date());
+                rollClubThreeDetails.setUpdateTime(new Date());
                 rollClubThreeDetails.setId(String.valueOf(IdWorker.getId()));
                 rollClubThreeDetails.setBlankOutput(billetWeightTotal);//出坯量
                 rollClubThreeDetails.setSpec(billetBasicInfoList.get(0).getSpec());
@@ -987,6 +989,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
                 rollOutShippDetails.setId(String.valueOf(IdWorker.getId()));
                 rollOutShippDetails.setCreateTime(new Date());
+                rollOutShippDetails.setUpdateTime(new Date());
                 rollOutShippDetails.setBlankOutput(billetWeightTotal);//出坯量
                 rollOutShippDetails.setSpec(billetBasicInfoList.get(0).getSpec());
                 rollOutShippDetails.setSize(billetBasicInfoList.get(0).getLength().toString());
@@ -1021,6 +1024,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 billetAutoTmp.setStorageBillId(storageBill.getId());
                 billetAutoTmp.setLicensePlate(storageBill.getLicensePlate());
                 billetAutoTmp.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
+                billetAutoTmp.setUpdateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
                 billetAutoTmp.setAssemblyNumber(distinctTmpAssemblyNumber);
                 // 通过坯号查询钢坯临时表
                 List<BilletAutoTmp> billetAutoTmpLists = billetAutoTmpService.list(new LambdaQueryWrapper<BilletAutoTmp>()