处理时间和编辑装运单、看板确认目的地异常失败问题

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

@@ -823,6 +823,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);
@@ -874,6 +875,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);
@@ -925,6 +927,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);
@@ -1003,6 +1006,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);
@@ -1059,6 +1063,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);

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

@@ -487,12 +487,20 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		StorageBill old = storageBillService.getById(storageBill.getId());
 		int originalAmountTotal = old.getAmountTotal();
 		if("1024".equals(old.getTypeConfigId()) && oConvertUtils.isNotEmpty(storageBill.getDestination())){
-			// 合并更新字段
-			BeanUtils.copyProperties(storageBill, old);
-			old.setAmountTotal(originalAmountTotal);
-			JSONObject jsonObject = storageBillService.billetAutoTmpDataSyn(old);
-
-			log.info("钢坯装运单编辑，未知目的地数据同步结果：{}", jsonObject);
+			try {
+				// 合并更新字段
+				BeanUtils.copyProperties(storageBill, old);
+				old.setAmountTotal(originalAmountTotal);
+				JSONObject jsonObject = storageBillService.billetAutoTmpDataSyn(old);
+				log.info("钢坯装运单编辑，未知目的地数据同步结果：{}", jsonObject);
+			} catch (Exception e) {
+				// 更新 typeConfigId 和 destination
+				old.setTypeConfigId(storageBill.getTypeConfigId());
+				old.setDestination(storageBill.getDestination());
+				storageBillService.updateById(old);
+				log.error("装运单同步发生异常，已更新目的地:", e);
+				return Result.OK("装运单同步异常，编辑目的地成功！");
+			}
 		} else {
 			log.info("{}{}", "B端编辑钢坯装运单", old.getLicensePlate() + "===" + storageBill.getLicensePlate());
 			if (!old.getLicensePlate().equals(storageBill.getLicensePlate())){
@@ -1732,14 +1740,23 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		StorageBill bill = storageBillService.getById(storageBill.getId());
 		// 原始装运单目的地ID是1024，才走数据同步
 		if("1024".equals(bill.getTypeConfigId()) && !"1024".equals(storageBill.getTypeConfigId())){
-			bill.setDestination(storageBill.getDestination());
-			bill.setTypeConfigId(storageBill.getTypeConfigId());
-			JSONObject jsonObject = storageBillService.billetAutoTmpDataSynConfirm(bill);
-			log.info("{}{}", "看板确认目的地数据同步结果：", jsonObject);
-			return Result.OK("确认目的地成功!");
+			try {
+				bill.setDestination(storageBill.getDestination());
+				bill.setTypeConfigId(storageBill.getTypeConfigId());
+				JSONObject jsonObject = storageBillService.billetAutoTmpDataSynConfirm(bill);
+				log.info("{}{}", "看板确认目的地数据同步结果：", jsonObject);
+				return Result.OK("看板确认目的地成功!");
+			} catch (Exception e) {
+				// 更新typeConfigId和destination
+				bill.setTypeConfigId(storageBill.getTypeConfigId());
+				bill.setDestination(storageBill.getDestination());
+				storageBillService.getBaseMapper().updateById(bill);
+				log.error("B端监控看板确认目的地,同步发生异常", e.getMessage());
+				return Result.OK("看板确认目的地失败，系统已更新目的地信息！");
+			}
 		}else {
 			log.info("{}{}", "看板确认目的地参数有误：", JSON.toJSON(storageBill));
-			return Result.OK("确认目的地失败!");
+			return Result.OK("看板确认目的地失败!");
 		}
 	}