1.出场放箱号明细增加判断pod场站是否有值

blade-service/blade-los/src/main/java/org/springblade/los/Util/EntryExitDataHandleUtils.java

@@ -79,14 +79,16 @@ public class EntryExitDataHandleUtils {
 			putBoxItem.setUpdateTime(new Date());
 			//放箱号目的港是否单一港口  是 明细目的港场站自动赋值主表
 			if (ObjectUtils.isNotNull(putBoxData.getPodId()) && !putBoxData.getPodId().contains(",")) {
-				putBoxItem.setPodStationId(putBoxData.getPodStationId());
-				putBoxItem.setPodStationCode(putBoxData.getPodStationCode());
-				putBoxItem.setPodStationCname(putBoxData.getPodStationCname());
-				putBoxItem.setPodStationEname(putBoxData.getPodStationEname());
-				putBoxItem.setPodCyAddress(putBoxData.getPodCyAddress());
-				putBoxItem.setPodCyContact(putBoxData.getPodCyContact());
-				putBoxItem.setPodCyEmail(putBoxData.getPodCyEmail());
-				putBoxItem.setPodCyTel(putBoxData.getPodCyTel());
+				if(ObjectUtils.isNull(putBoxItem.getPodStationId())){
+					putBoxItem.setPodStationId(putBoxData.getPodStationId());
+					putBoxItem.setPodStationCode(putBoxData.getPodStationCode());
+					putBoxItem.setPodStationCname(putBoxData.getPodStationCname());
+					putBoxItem.setPodStationEname(putBoxData.getPodStationEname());
+					putBoxItem.setPodCyAddress(putBoxData.getPodCyAddress());
+					putBoxItem.setPodCyContact(putBoxData.getPodCyContact());
+					putBoxItem.setPodCyEmail(putBoxData.getPodCyEmail());
+					putBoxItem.setPodCyTel(putBoxData.getPodCyTel());
+				}
 			}
 			putBoxItem.setPolCyId(item.getStationId());
 			putBoxItem.setPolCyCode(item.getStationCode());
@@ -121,10 +123,12 @@ public class EntryExitDataHandleUtils {
 					putBoxItem.setUnoccupied("1");
 				}
 				if (ObjectUtils.isNotNull(putBoxData.getPodId()) && !putBoxData.getPodId().contains(",")) {
-					putBoxItem.setPodId(Long.parseLong(putBoxData.getPodId()));
-					putBoxItem.setPodCname(putBoxData.getPodCname());
-					putBoxItem.setPodEname(putBoxData.getPodEname());
-					putBoxItem.setPodCode(putBoxData.getPodCode());
+					if(ObjectUtils.isNull(putBoxItem.getPodId())){
+						putBoxItem.setPodId(Long.parseLong(putBoxData.getPodId()));
+						putBoxItem.setPodCname(putBoxData.getPodCname());
+						putBoxItem.setPodEname(putBoxData.getPodEname());
+						putBoxItem.setPodCode(putBoxData.getPodCode());
+					}
 				}
 			}
 			putBoxItem.setHblno(item.getHblno());
@@ -399,14 +403,16 @@ public class EntryExitDataHandleUtils {
 			tradingBoxItem.setUpdateTime(new Date());
 			//OW(拿)单据目的港是否单一港口  是 明细目的港场站自动赋值主表
 			if (ObjectUtils.isNotNull(tradingBox.getPodId()) && !tradingBox.getPodId().contains(",")) {
-				tradingBoxItem.setPodStationId(tradingBox.getPodStationId());
-				tradingBoxItem.setPodStationCode(tradingBox.getPodStationCode());
-				tradingBoxItem.setPodStationCname(tradingBox.getPodStationCname());
-				tradingBoxItem.setPodStationEname(tradingBox.getPodStationEname());
-				tradingBoxItem.setPodCyAddress(tradingBox.getPodCyAddress());
-				tradingBoxItem.setPodCyContact(tradingBox.getPodCyContact());
-				tradingBoxItem.setPodCyEmail(tradingBox.getPodCyEmail());
-				tradingBoxItem.setPodCyTel(tradingBox.getPodCyTel());
+				if(ObjectUtils.isNull(tradingBoxItem.getPodStationId())){
+					tradingBoxItem.setPodStationId(tradingBox.getPodStationId());
+					tradingBoxItem.setPodStationCode(tradingBox.getPodStationCode());
+					tradingBoxItem.setPodStationCname(tradingBox.getPodStationCname());
+					tradingBoxItem.setPodStationEname(tradingBox.getPodStationEname());
+					tradingBoxItem.setPodCyAddress(tradingBox.getPodCyAddress());
+					tradingBoxItem.setPodCyContact(tradingBox.getPodCyContact());
+					tradingBoxItem.setPodCyEmail(tradingBox.getPodCyEmail());
+					tradingBoxItem.setPodCyTel(tradingBox.getPodCyTel());
+				}
 			}
 			tradingBoxItem.setPid(tradingBox.getId());
 			if (ObjectUtils.isNull(tradingBoxItem.getPolPickUpDate())) {