Browse Source

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

纪新园 19 giờ trước cách đây
mục cha
commit
4c60fa493e

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

@@ -79,7 +79,9 @@ public class EntryExitDataHandleUtils {
 			putBoxItem.setUpdateTime(new Date());
 			putBoxItem.setUpdateTime(new Date());
 			//放箱号目的港是否单一港口  是 明细目的港场站自动赋值主表
 			//放箱号目的港是否单一港口  是 明细目的港场站自动赋值主表
 			if (ObjectUtils.isNotNull(putBoxData.getPodId()) && !putBoxData.getPodId().contains(",")) {
 			if (ObjectUtils.isNotNull(putBoxData.getPodId()) && !putBoxData.getPodId().contains(",")) {
-				if(ObjectUtils.isNull(putBoxItem.getPodStationId())){
+				if(ObjectUtils.isNull(putBoxItem.getPodStationId()) && ObjectUtils.isNull(putBoxItem.getPodCyAddress())
+					&& ObjectUtils.isNull(putBoxItem.getPodCyContact())&& ObjectUtils.isNull(putBoxItem.getPodCyEmail())
+					&& ObjectUtils.isNull(putBoxItem.getPodCyTel())){
 					putBoxItem.setPodStationId(putBoxData.getPodStationId());
 					putBoxItem.setPodStationId(putBoxData.getPodStationId());
 					putBoxItem.setPodStationCode(putBoxData.getPodStationCode());
 					putBoxItem.setPodStationCode(putBoxData.getPodStationCode());
 					putBoxItem.setPodStationCname(putBoxData.getPodStationCname());
 					putBoxItem.setPodStationCname(putBoxData.getPodStationCname());
@@ -403,7 +405,9 @@ public class EntryExitDataHandleUtils {
 			tradingBoxItem.setUpdateTime(new Date());
 			tradingBoxItem.setUpdateTime(new Date());
 			//OW(拿)单据目的港是否单一港口  是 明细目的港场站自动赋值主表
 			//OW(拿)单据目的港是否单一港口  是 明细目的港场站自动赋值主表
 			if (ObjectUtils.isNotNull(tradingBox.getPodId()) && !tradingBox.getPodId().contains(",")) {
 			if (ObjectUtils.isNotNull(tradingBox.getPodId()) && !tradingBox.getPodId().contains(",")) {
-				if(ObjectUtils.isNull(tradingBoxItem.getPodStationId())){
+				if(ObjectUtils.isNull(tradingBoxItem.getPodStationId()) && ObjectUtils.isNull(tradingBoxItem.getPodCyAddress())
+					&& ObjectUtils.isNull(tradingBoxItem.getPodCyContact())&& ObjectUtils.isNull(tradingBoxItem.getPodCyEmail())
+					&& ObjectUtils.isNull(tradingBoxItem.getPodCyTel())){
 					tradingBoxItem.setPodStationId(tradingBox.getPodStationId());
 					tradingBoxItem.setPodStationId(tradingBox.getPodStationId());
 					tradingBoxItem.setPodStationCode(tradingBox.getPodStationCode());
 					tradingBoxItem.setPodStationCode(tradingBox.getPodStationCode());
 					tradingBoxItem.setPodStationCname(tradingBox.getPodStationCname());
 					tradingBoxItem.setPodStationCname(tradingBox.getPodStationCname());