1.费用信息模板导入增加订舱代理判断

2.费用信息同步收付费对象增加订舱代理
3.海运出口选择放箱号增加盘存字段

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/SeaContainerNumberItem.java

@@ -16,12 +16,14 @@
  */
 package org.springblade.los.business.sea.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -201,5 +203,8 @@ public class SeaContainerNumberItem implements Serializable {
 	@ApiModelProperty(value = "租户")
 	private String tenantId;
 
+	@TableField(exist = false)
+	private Integer storageNum;
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/PutBoxController.java

@@ -244,6 +244,7 @@ public class PutBoxController extends BladeController {
 			seaContainerNumberItem.setSrcId(item.getId());
 			seaContainerNumberItem.setPriorityLevel(item.getPriorityLevel());
 			seaContainerNumberItem.setBoxRemarks(item.getRemarks());
+			seaContainerNumberItem.setStorageNum(item.getStorageNum());
 			containerNumberItemList.add(seaContainerNumberItem);
 		}
 		return R.data(containerNumberItemList);

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -844,9 +844,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					int version = StringUtil.isBlank(feeCenter.getVersion()) ? 1 : Integer.parseInt(feeCenter.getVersion());
 					feeCenter.setVersion(String.valueOf(version + 1));
 					feeCenterIdList.add(feeCenter.getId());
-					feeCenter.setUpdateUser(AuthUtil.getUserId());
-					feeCenter.setUpdateTime(new Date());
-					feeCenter.setUpdateUserName(AuthUtil.getUserName());
+					if (!"4".equals(feeCenter.getAuditStatus())){
+						feeCenter.setUpdateUser(AuthUtil.getUserId());
+						feeCenter.setUpdateTime(new Date());
+						feeCenter.setUpdateUserName(AuthUtil.getUserName());
+					}
 				}
 				//计算字段null值处理
 				feeCenter.setQuantity(ObjectUtils.isNotNull(feeCenter.getQuantity()) ? feeCenter.getQuantity() : new BigDecimal("0.00"));
@@ -983,9 +985,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					}
 					int version = StringUtil.isBlank(feeCenter.getVersion()) ? 1 : Integer.parseInt(feeCenter.getVersion());
 					feeCenter.setVersion(String.valueOf(version + 1));
-					feeCenter.setUpdateUser(AuthUtil.getUserId());
-					feeCenter.setUpdateTime(new Date());
-					feeCenter.setUpdateUserName(AuthUtil.getUserName());
+					if (!"4".equals(feeCenter.getAuditStatus())){
+						feeCenter.setUpdateUser(AuthUtil.getUserId());
+						feeCenter.setUpdateTime(new Date());
+						feeCenter.setUpdateUserName(AuthUtil.getUserName());
+					}
 				}
 				//计算字段null值处理
 				feeCenter.setQuantity(ObjectUtils.isNotNull(feeCenter.getQuantity()) ? feeCenter.getQuantity() : new BigDecimal("0.00"));
@@ -1273,9 +1277,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenter.setCreateDeptName(deptName);
 					}
 				} else {
-					feeCenter.setUpdateUser(AuthUtil.getUserId());
-					feeCenter.setUpdateTime(new Date());
-					feeCenter.setUpdateUserName(AuthUtil.getUserName());
+					if (!"4".equals(feeCenter.getAuditStatus())){
+						feeCenter.setUpdateUser(AuthUtil.getUserId());
+						feeCenter.setUpdateTime(new Date());
+						feeCenter.setUpdateUserName(AuthUtil.getUserName());
+					}
 				}
 				feeCenter.setBillBranchId(branchId);
 				feeCenter.setBillBranchName(deptName);
@@ -1590,6 +1596,20 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							feeCenter.setGenerationCorpCnName(bCorps.getBookingAgentCnName());
 							feeCenter.setGenerationCorpEnName(bCorps.getBookingAgentEnName());
 						}
+					} else if ("订舱代理".contains(templateItems.getCorpType())) {
+						BCorps bCorps = null;
+						if (!corpsList.isEmpty()) {
+							bCorps = corpsList.stream().filter(e -> e.getId().equals(bills.getBookingAgentId())).findFirst().orElse(null);
+						}
+						feeCenter.setCorpId(bCorps == null ? bills.getBookingAgentId() : bCorps.getId());
+						feeCenter.setCorpCnName(bCorps == null ? bills.getBookingAgentCnName() : bCorps.getCnName());
+						feeCenter.setCorpEnName(bCorps == null ? bills.getBookingAgentEnName() : bCorps.getEnName());
+						feeCenter.setShortName(bCorps == null ? bills.getBookingAgentCnName() : bCorps.getShortName());
+						if (bCorps != null) {
+							feeCenter.setGenerationCorpId(bCorps.getBookingAgentId());
+							feeCenter.setGenerationCorpCnName(bCorps.getBookingAgentCnName());
+							feeCenter.setGenerationCorpEnName(bCorps.getBookingAgentEnName());
+						}
 					} else {
 						BCorps bCorps = null;
 						if (!corpsList.isEmpty()) {
@@ -2640,6 +2660,24 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					map.put("corpCnNameNew", feeCenter.getCorpCnName());
 					mapList.add(map);
 				}
+			}else if ("订舱代理".contains(feeCenter.getCorpType())) {
+				if (!feeCenter.getCorpId().equals(bills.getBookingAgentId())) {
+					BCorps bCorps = null;
+					if (!corpsList.isEmpty()) {
+						bCorps = corpsList.stream().filter(e -> e.getId().equals(bills.getBookingAgentId())).findFirst().orElse(null);
+					}
+					feeCenter.setCorpId(bills.getBookingAgentId());
+					feeCenter.setCorpCnName(bills.getBookingAgentCnName());
+					feeCenter.setCorpEnName(bills.getBookingAgentEnName());
+					feeCenter.setShortName(bills.getBookingAgentCnName());
+					if (bCorps != null) {
+						feeCenter.setGenerationCorpId(bCorps.getBookingAgentId());
+						feeCenter.setGenerationCorpCnName(bCorps.getBookingAgentCnName());
+						feeCenter.setGenerationCorpEnName(bCorps.getBookingAgentEnName());
+					}
+					map.put("corpCnNameNew", feeCenter.getCorpCnName());
+					mapList.add(map);
+				}
 			}
 		}
 		return R.data(mapList);
@@ -2760,6 +2798,23 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					}
 					feeCenters.add(feeCenter);
 				}
+			}else if ("订舱代理".contains(feeCenter.getCorpType())) {
+				if (!feeCenter.getCorpId().equals(bills.getBookingAgentId())) {
+					BCorps bCorps = null;
+					if (!corpsList.isEmpty()) {
+						bCorps = corpsList.stream().filter(e -> e.getId().equals(bills.getBookingAgentId())).findFirst().orElse(null);
+					}
+					feeCenter.setCorpId(bills.getBookingAgentId());
+					feeCenter.setCorpCnName(bills.getBookingAgentCnName());
+					feeCenter.setCorpEnName(bills.getBookingAgentEnName());
+					feeCenter.setShortName(bills.getBookingAgentCnName());
+					if (bCorps != null) {
+						feeCenter.setGenerationCorpId(bCorps.getBookingAgentId());
+						feeCenter.setGenerationCorpCnName(bCorps.getBookingAgentCnName());
+						feeCenter.setGenerationCorpEnName(bCorps.getBookingAgentEnName());
+					}
+					feeCenters.add(feeCenter);
+				}
 			}
 		}
 		if (!feeCenters.isEmpty()) {