1.pil edi编码取值修改

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -2178,8 +2178,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				.ne(FeeCenter::getAuditStatus, "4"));
 			if (!feeCenterList.isEmpty()) {
 				for (FeeCenter item : feeCenterList) {
-					if(ObjectUtils.isNull(item.getCorpId())){
-						throw new RuntimeException("单号："+item.getBillNo()+"费用明细结算单位不能为空");
+					if (ObjectUtils.isNull(item.getCorpId())) {
+						throw new RuntimeException("单号：" + item.getBillNo() + "费用明细结算单位不能为空");
 					}
 					if ("MH".equals(item.getBillType())) {
 						if (ObjectUtils.isNull(item.getHblno())) {
@@ -2258,8 +2258,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				.eq(FeeCenter::getAuditStatus, "1"));
 			if (!feeCenterList.isEmpty()) {
 				for (FeeCenter item : feeCenterList) {
-					if(ObjectUtils.isNull(item.getCorpId())){
-						throw new RuntimeException("单号："+item.getBillNo()+"费用明细结算单位不能为空");
+					if (ObjectUtils.isNull(item.getCorpId())) {
+						throw new RuntimeException("单号：" + item.getBillNo() + "费用明细结算单位不能为空");
 					}
 					int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
 					item.setVersion(String.valueOf(version + 1));
@@ -2589,6 +2589,13 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		copyBills.setOperatorDeptName(detail.getOperatorDeptName());
 		copyBills.setBillNo("");
 		copyBills.setMblno("");
+		copyBills.setIqNo("");
+		copyBills.setChangeOrderStatus("");
+		copyBills.setDeliveryNoteStatus("");
+		copyBills.setEquipmentSingleStatus("");
+		copyBills.setBoxPackingAmount(null);
+		copyBills.setHarvestBoxPackingDate(null);
+		copyBills.setRetreatBoxPackingDate(null);
 //		copyBills.setHblno("");
 		copyBills.setRefno("");
 		copyBills.setBookingNo("");
@@ -3742,7 +3749,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setDeductionTime(null);
 				item.setContainerNumber(null);
 				item.setAutomaticGenerated(null);
-				item.setExrate(currencyUtils.obtainExrate(item.getDc(), curExrateList,item.getCurCode(), "1"));
+				item.setExrate(currencyUtils.obtainExrate(item.getDc(), curExrateList, item.getCurCode(), "1"));
 				// 金额
 				BigDecimal amount = item.getAmount();
 				//判断是否是本位币

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EdiTypesServiceImpl.java

@@ -232,7 +232,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				.eq(BPorts::getIsDeleted, 0)
 				.eq(BPorts::getEnName, details.getHpayplace()));
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setHPayPlaceCode(bPorts.getUnCode());
 				inttraSoDto.setHPayPlaceName(bPorts.getEnName());
 			}
@@ -244,7 +243,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				.eq(BPorts::getIsDeleted, 0)
 				.eq(BPorts::getEnName, details.getMpayplace()));
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setMPayPlaceCode(bPorts.getUnCode());
 				inttraSoDto.setMPayPlaceName(bPorts.getEnName());
 			}
@@ -253,7 +251,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		if (ObjectUtils.isNotNull(details.getIssueAtId())) {
 			BPorts bPorts = bPortsService.getById(details.getIssueAtId());
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setIssuanceLandCode(bPorts.getUnCode());
 				inttraSoDto.setIssuanceLand(bPorts.getEnName());
 			}
@@ -296,8 +293,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				.eq(BLines::getIsDeleted, 0)
 				.eq(BLines::getId, details.getLineId()));
 			if (bLines != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bLines.getExtendedData());
-				inttraSoDto.setLineCode(ediCode.isEmpty() ? bLines.getCode() : ediCode);
+				inttraSoDto.setLineCode(bLines.getCode());
 				inttraSoDto.setHPayPlaceName(bLines.getEnName());
 			}
 		}
@@ -314,9 +310,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			BVessels bVessels = bVesselsService.getById(details.getVesselId());
 			if (bVessels != null) {
 				// 要获取船名代码
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bVessels.getExtendedData());
-				inttraSoDto.setVesselCode(ediCode);
-
+				inttraSoDto.setVesselCode(bVessels.getCode());
 				BCorps bCorps = bCorpsService.getById(bVessels.getCarrierId());
 				if (bCorps != null) {
 					inttraSoDto.setVesselCarrierCode(bCorps.getScacCode());
@@ -336,7 +330,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		if (ObjectUtils.isNotNull(details.getPolId())) {
 			BPorts bPorts = bPortsService.getById(details.getPolId());
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setPolCode(bPorts.getUnCode());
 				if (ObjectUtils.isNull(inttraSoDto.getPolName())) {
 					inttraSoDto.setPolName(RegularUtils.forceEmpty(bPorts.getEnName()));
@@ -349,7 +342,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		if (ObjectUtils.isNotNull(details.getPlaceReceiptId())) {
 			BPorts bPorts = bPortsService.getById(details.getPlaceReceiptId());
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setPlaceReceiptCode(bPorts.getUnCode());
 				if (ObjectUtils.isNull(inttraSoDto.getPlaceReceiptName())) {
 					inttraSoDto.setPlaceReceiptName(RegularUtils.forceEmpty(bPorts.getEnName()));
@@ -361,7 +353,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		if (ObjectUtils.isNotNull(details.getPodId())) {
 			BPorts bPorts = bPortsService.getById(details.getPodId());
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setPodCode(bPorts.getUnCode());
 				if (ObjectUtils.isNull(inttraSoDto.getPodName())) {
 					inttraSoDto.setPodName(RegularUtils.forceEmpty(bPorts.getEnName()));
@@ -373,7 +364,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		if (ObjectUtils.isNotNull(details.getPotId())) {
 			BPorts bPorts = bPortsService.getById(details.getPotId());
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setPotCode(bPorts.getUnCode());
 				if (ObjectUtils.isNull(inttraSoDto.getPotName())) {
 					inttraSoDto.setPotName(RegularUtils.forceEmpty(bPorts.getEnName()));
@@ -386,7 +376,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		if (ObjectUtils.isNotNull(details.getPlaceDeliveryId())) {
 			BPorts bPorts = bPortsService.getById(details.getPlaceDeliveryId());
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setPlaceDeliveryCode(bPorts.getUnCode());
 				if (ObjectUtils.isNull(inttraSoDto.getPlaceDeliveryName())) {
 					inttraSoDto.setPlaceDeliveryName(RegularUtils.forceEmpty(bPorts.getEnName()));
@@ -399,7 +388,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 		if (ObjectUtils.isNotNull(details.getDestinationId())) {
 			BPorts bPorts = bPortsService.getById(details.getDestinationId());
 			if (bPorts != null) {
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bPorts.getExtendedData());
 				inttraSoDto.setPlaceDestinationCode(bPorts.getUnCode());
 				if (ObjectUtils.isNull(inttraSoDto.getPlaceDestinationName())) {
 					inttraSoDto.setPlaceDestinationName(RegularUtils.forceEmpty(bPorts.getEnName()));
@@ -481,8 +469,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			BPackages bPackages = bPackagesService.getOne(new LambdaQueryWrapper<BPackages>()
 				.eq(BPackages::getId, details.getPackingUnitId()));
 			if (bPackages != null) {
-				String ediCode = RegularUtils.getEdiCode(ObjectUtils.isNotNull(ediPackageCodeName) ? ediPackageCodeName : ediCodeName, bPackages.getExtendedData());
-				inttraSoDto.setPackagesCode(ediCode);
+				inttraSoDto.setPackagesCode(bPackages.getStandardCode());
 			}
 		}
 		inttraSoDto.setPackagesDescribe(details.getPackingUnit());//包装描述
@@ -524,10 +511,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			totalPreCntrQty += item.getQuantity();
 			BCntrTypes bCntrTypes = bPreCntrTypesList.stream().filter(e -> e.getId().toString().equals(item.getCntrTypeCodeId())).findFirst().orElse(null);
 			if (bCntrTypes != null) {
-				String ediCode = RegularUtils.forceEmpty(RegularUtils.getEdiCode(ediCodeName, bCntrTypes.getExtendedData()));
 				Map<String, Object> map = new HashMap<>();
 				map.put("cntrTypeCode", RegularUtils.forceEmpty(item.getCntrTypeCode()));
-				map.put("sizeType", ediCode);
+				map.put("sizeType", bCntrTypes.getCode95());
 				map.put("cntrQty", item.getQuantity());
 				map.put("isSoc", item.getIsSoc());
 				map.put("rawTemperature", RegularUtils.forceEmpty(item.getTemperature()));
@@ -598,7 +584,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 					mixedCargoCount += ObjectUtils.isNotNull(item.getContainersCommodityList()) ? item.getContainersCommodityList().size() : 0;
 				}
 
-				String ediCode = RegularUtils.getEdiCode(ediCodeName, bCntrTypes.getExtendedData());
 				Map<String, Object> map = new HashMap<>();
 				map.put("quantity", ObjectUtils.isNull(item.getQuantity()) ? new BigDecimal("0.00") : item.getQuantity());
 				// wfg 皮重取值
@@ -606,7 +591,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				map.put("netWeight", new BigDecimal("0"));
 				map.put("grossWeight", ObjectUtils.isNull(item.getGrossWeight()) ? new BigDecimal("0.00") : item.getGrossWeight());
 				map.put("volume", ObjectUtils.isNull(item.getMeasurement()) ? new BigDecimal("0.00") : item.getMeasurement());
-				map.put("sizeType", ediCode);
+				map.put("sizeType", bCntrTypes.getCode95());
 				map.put("cntrTypeName", RegularUtils.forceEmpty(bCntrTypes.getEnName()));
 				map.put("cntrNo", RegularUtils.forceEmpty(item.getCntrNo()));
 				map.put("sealNo", RegularUtils.forceEmpty(item.getSealNo()));
@@ -639,8 +624,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 							BPackages bPackages = bPackagesService.getOne(new LambdaQueryWrapper<BPackages>()
 								.eq(BPackages::getId, cc.getPackingUnitId()));
 							if (bPackages != null) {
-								String code = RegularUtils.getEdiCode(ediCodeName, bPackages.getExtendedData());
-								cc.setPackingUnitCode(code);
+								cc.setPackingUnitCode(bPackages.getStandardCode());
 							}
 						}
 					}
@@ -867,106 +851,6 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			FilesCenter filesCenter = null;
 			Map<String, Object> status = null;
 
-			/*if (inttraSoDto.ediTypeIsHYCK_INTTRA_SO()) {
-				status = Regular_INTTRA.notNullInttraSoDto(inttraSoDto, "SO");
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingInttraSo(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_INTTRA_SI()) {
-				status = Regular_INTTRA.notNullInttraSiDto(inttraSoDto);
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingInttraSI(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_APL_SO()) {
-				status = Regular_APL.notNullAPLSoDto(inttraSoDto, "SO");
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingAplSo(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_APL_SI()) {
-				status = Regular_APL.notNullAPLSiDto(inttraSoDto);
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingAplSi(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_ONE_Booking()) {
-				status = Regular_ONE.notNullOneBookingDto(inttraSoDto, "SO");
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingOneBooking(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_ONE_SI()) {
-				status = Regular_ONE.notNullOneSIDto(inttraSoDto);
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingOneSI(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_PIL_Booking()) {
-				status = Regular_PIL.notNullPilBookingDto(inttraSoDto, "SO");
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingPilBooking(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_PIL_BL()) {
-				status = Regular_PIL.notNullPilBookingDto(inttraSoDto, "BL");
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingPilBooking(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_PIL_SI()) {
-				status = Regular_PIL.notNullPilSIDto(inttraSoDto);
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingPilSI(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_Mell_Booking()) {
-				status = Regular_PIL.notNullPilBookingDto(inttraSoDto, "SO");
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingMellBooking(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_Mell_SI()) {
-				status = Regular_PIL.notNullPilSIDto(inttraSoDto);
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingMellSI(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else*/
 			if (inttraSoDto.ediTypeIsHYCK_ZIM_Booking()) {
 				status = Regular_ONE.notNullOneBookingDto(inttraSoDto, "SO");
 				if ("200".equals(status.get("code").toString())) {
@@ -985,16 +869,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 						return R.fail(e.getMessage());
 					}
 				}
-			} else if (inttraSoDto.ediTypeIsHYCK_PIL_BL()) {
-				status = Regular_PIL.notNullPilBookingDto(inttraSoDto, "BL");
-				if ("200".equals(status.get("code").toString())) {
-					try {
-						filesCenter = iediSenderService.sendingPilBooking(inttraSoDto, ediParamCarrier);
-					} catch (Exception e) {
-						return R.fail(e.getMessage());
-					}
-				}
-			} else if (inttraSoDto.ediTypeIsHYCK_PIL_SI()) {
+			}else if (inttraSoDto.ediTypeIsHYCK_PIL_SI()) {
 				status = Regular_PIL.notNullPilSIDto(inttraSoDto);
 				if ("200".equals(status.get("code").toString())) {
 					try {