1.费用保存时超期箱使费不需要重新取箱量

2.进出场记录增加类型
3.财务获取数据接口增加业务类型判断
4.OW拿保存计算未提箱数计算bug修改

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/ListAccBillVO.java

@@ -220,4 +220,10 @@ public class ListAccBillVO extends FinAccBills {
 	 */
 	private String isStl;
 
+
+	/**
+	 * 付费申请  发票申请
+	 */
+	private String operationType;
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/box/dynamics/service/impl/BoxDynamicsRecordServiceImpl.java

@@ -248,15 +248,23 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 			recordItems.setBoxCode(item.getBoxCode());
 			if ("客户还箱".equals(item.getObjective()) || "C".equals(item.getObjective())) {
 				recordItems.setObjective("C");
+			} else if ("场内退租进场".equals(item.getObjective()) || "CT".equals(item.getObjective())) {
+				recordItems.setObjective("CT");
 			} else if ("驳空箱".equals(item.getObjective()) || "K".equals(item.getObjective())) {
 				recordItems.setObjective("K");
 			} else if ("退关箱".equals(item.getObjective()) || "TJ".equals(item.getObjective())) {
 				recordItems.setObjective("TJ");
 			} else if ("新箱".equals(item.getObjective()) || "XX".equals(item.getObjective())) {
 				recordItems.setObjective("XX");
-			} else if ("直接调运进场".equals(item.getObjective()) || "ZJ".equals(item.getObjective())) {
+			} else if ("直接退租进场".equals(item.getObjective()) || "ZI".equals(item.getObjective())) {
+				recordItems.setObjective("ZI");
+			}else if ("直接调运进场".equals(item.getObjective()) || "ZJ".equals(item.getObjective())) {
 				recordItems.setObjective("ZJ");
-			} else if ("退租箱进场".equals(item.getObjective()) || "T".equals(item.getObjective())) {
+			} else if ("起租箱进场".equals(item.getObjective()) || "QX".equals(item.getObjective())) {
+				recordItems.setObjective("QX");
+			}else if ("场内起租进场".equals(item.getObjective()) || "QZ".equals(item.getObjective())) {
+				recordItems.setObjective("QZ");
+			}else if ("退租箱进场".equals(item.getObjective()) || "T".equals(item.getObjective())) {
 				recordItems.setObjective("T");
 			} else if ("内点摆箱".equals(item.getObjective()) || "BX".equals(item.getObjective())) {
 				recordItems.setObjective("BX");
@@ -299,6 +307,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 			recordItems.setHblno(item.getMblno());
 			recordItems.setApproachExitDate(item.getBoxStatusDate());
 			recordItems.setBoxStatus(item.getStatus());
+			recordItems.setTenantId(AuthUtil.getTenantId());
 			itemsList.add(recordItems);
 		}
 		if (!itemsList.isEmpty()) {
@@ -310,6 +319,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 			boxDynamicsRecord.setStationEname(itemsList.get(0).getStationEname());
 			boxDynamicsRecord.setStationCode(itemsList.get(0).getStationCode());
 			boxDynamicsRecord.setStationId(itemsList.get(0).getStationId());
+			boxDynamicsRecord.setTenantId(AuthUtil.getTenantId());
 			baseMapper.insert(boxDynamicsRecord);
 			for (BoxDynamicsRecordItems item : itemsList) {
 				item.setPid(boxDynamicsRecord.getId());
@@ -3551,7 +3561,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 		}
 		if ("JC".equals(boxDynamicsRecord.getApproachExit())) {
 			//新箱进场
-			List<BoxDynamicsRecordItems> itemsListJC = itemsList.stream().filter(e -> !"C,ZJ,T".contains(e.getObjective())).collect(Collectors.toList());
+			List<BoxDynamicsRecordItems> itemsListJC = itemsList.stream().filter(e -> (!"C".equals(e.getObjective()) &&
+				!"ZJ".equals(e.getObjective()) && !"T".equals(e.getObjective()) &&
+				!"CT".equals(e.getObjective()) && !"ZI".equals(e.getObjective()))).collect(Collectors.toList());
 			if (!itemsListJC.isEmpty()) {
 				Boolean status = this.synchronization(itemsListJC, boxDynamicsRecord, type);
 				if (!status) {
@@ -3728,7 +3740,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							PutBox putBox1 = putBoxList.stream().filter(e -> e.getContainerNumber().equals(archives.getContainerNumberOw()))
 								.findFirst().orElse(null);
 							if (putBox1 != null) {
-								if ("OW(放),自有箱,代理箱,租箱".contains(putBox1.getBoxClass())) {
+								if ("OW(放),自有箱".contains(putBox1.getBoxClass())) {
 									//放箱号明细数据处理
 									PutBoxItems putBoxItem;
 									if (!putBoxItemsList.isEmpty()) {
@@ -3927,7 +3939,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 //									putBox.setStorageNum(putBox.getStorageNum() + 1 - putBox.getOccupyNum());
 										putBoxNewList.add(putBox);
 									}
-								} else if ("OW(拿)".contains(putBox1.getBoxClass())) {
+								} else if ("OW(拿),代理箱,租箱".contains(putBox1.getBoxClass())) {
 									//放箱号明细数据处理
 									PutBoxItems putBoxItem;
 									if (!putBoxItemsList.isEmpty()) {
@@ -4050,7 +4062,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							PutBox putBox1 = putBoxList.stream().filter(e -> e.getContainerNumber().equals(archives.getContainerNumberOw()))
 								.findFirst().orElse(null);
 							if (putBox1 != null) {
-								if ("OW(放),自有箱,代理箱,租箱".contains(putBox1.getBoxClass())) {
+								if ("OW(放),自有箱".contains(putBox1.getBoxClass())) {
 									//POD放箱号数据明细处理
 									PutBox putBox = putBoxNewList.stream().filter(e -> e.getContainerNumber().equals(archives.getContainerNumber())
 											&& e.getPolId().equals(archives.getAddressId()) && e.getPolStationId().equals(archives.getStationId()))
@@ -4362,7 +4374,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							TradingBox tradingBox = tradingBoxList.stream().filter(e -> e.getId().equals(putBox.getSrcId()))
 								.findFirst().orElse(null);
 							if (tradingBox != null) {
-								if (tradingBox.getPolId().equals(tradingBox.getPodId())) {
+								if ((tradingBox.getPolId()+"").equals(tradingBox.getPodId())) {
 									samePort = false;
 								}
 								if (!tradingBoxes.isEmpty()) {
@@ -4709,7 +4721,8 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 				}
 			}
 			//退租箱进场
-			List<BoxDynamicsRecordItems> itemsListTZX = itemsList.stream().filter(e -> "T".equals(e.getObjective())).collect(Collectors.toList());
+			List<BoxDynamicsRecordItems> itemsListTZX = itemsList.stream().filter(e -> ("T".equals(e.getObjective()) ||
+				"CT".equals(e.getObjective()) || "ZI".equals(e.getObjective())) ).collect(Collectors.toList());
 			if (!itemsListTZX.isEmpty()) {
 				Boolean status = this.terminateTheLease(itemsListTZX, boxDynamicsRecord, type);
 				if (!status) {

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/TradingBoxServiceImpl.java

@@ -288,7 +288,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		String text;
 		if ("OW-N,OW-F".contains(tradingBox.getType())) {
 			text = "放箱号已存在，请勿重复添加";
-			tradingBox.setNotSuitcaseNum(tradingBox.getBoxNumber());
+			tradingBox.setNotSuitcaseNum(tradingBox.getBoxNumber()-tradingBox.getSuitcaseNum());
 		} else {
 			text = "合同号已存在，请勿重复添加";
 		}
@@ -1596,12 +1596,16 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBox.setContainerNumber(detail.getContainerNumber());
 			tradingBox.setActivationDate(detail.getActivationDate());
 			baseMapper.updateById(tradingBox);
+			String boxType = "";
+			if (!boxTypeList.isEmpty() && boxTypeList.size() > 0) {
+				boxType = boxTypeList.get(0).getBoxType();
+			}
 			PutBox putBox = putBoxService.getOne(new LambdaQueryWrapper<PutBox>()
 				.eq(PutBox::getTenantId, AuthUtil.getTenantId())
 				.eq(PutBox::getIsDeleted, 0)
 				.eq(PutBox::getContainerNumber, detail.getContainerNumber())
 				.eq(PutBox::getPolId, detail.getPolId())
-				.eq(!boxTypeList.isEmpty(), PutBox::getBoxType, boxTypeList.get(0).getBoxType())
+				.eq(ObjectUtils.isNotNull(boxType), PutBox::getBoxType, boxType)
 				.eq(PutBox::getPolStationId, detail.getPolStationId())
 			);
 			if (putBox != null) {

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

@@ -470,7 +470,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			String exrateType = currencyUtils.standardCurrency(branchId);
 			statusC += 1;
 			for (FeeCenter item : bills.getFeeCenterListC()) {
-				if (ObjectUtils.isNotNull(bills.getPreContainersList())) {
+				if (ObjectUtils.isNotNull(bills.getPreContainersList()) && !"CQXSF".equals(item.getFeeCode())) {
 					PreContainers preContainers = bills.getPreContainersList().stream().filter(e -> e.getCntrTypeCode().equals(item.getUnitNo()))
 						.findFirst().orElse(null);
 					if (preContainers != null && item.getQuantity().compareTo(new BigDecimal(preContainers.getQuantity() + "")) != 0 &&
@@ -542,7 +542,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			String exrateType = currencyUtils.standardCurrency(branchId);
 			statusD += 1;
 			for (FeeCenter item : bills.getFeeCenterListD()) {
-				if (ObjectUtils.isNotNull(bills.getPreContainersList())) {
+				if (ObjectUtils.isNotNull(bills.getPreContainersList())&& !"CQXSF".equals(item.getFeeCode())) {
 					PreContainers preContainers = bills.getPreContainersList().stream().filter(e -> e.getCntrTypeCode().equals(item.getUnitNo()))
 						.findFirst().orElse(null);
 					if (preContainers != null && item.getQuantity().compareTo(new BigDecimal(preContainers.getQuantity() + "")) != 0 &&

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FinAccBillsController.java

@@ -409,6 +409,7 @@ public class FinAccBillsController extends BladeController {
 	@GetMapping("/listAccBillV2")
 	public R<List<FinAccBillsVO>> listAccBillV2(ListAccBillVO listAccBillVO, Query query) {
 		String type = listAccBillVO.getType();
+		String operationType = listAccBillVO.getOperationType();
 		if ("2".equals(listAccBillVO.getType())) {
 			//收
 			if ("D".equals(listAccBillVO.getDc())) {
@@ -483,13 +484,21 @@ public class FinAccBillsController extends BladeController {
 								finAccBillsVOList.add(accBillsVO);
 							}
 						} else {
-							if (new BigDecimal("0.00").compareTo(accBillsVO.getAppliedInvoiceCurrentStlAmount()) != 0) {
-								finAccBillsVOList.add(accBillsVO);
-								continue;
-							}
-							if (new BigDecimal("0.00").compareTo(accBillsVO.getAppliedCurrentStlAmount()) != 0) {
-								finAccBillsVOList.add(accBillsVO);
-								continue;
+							if ("付费申请".equals(operationType)){
+								if (new BigDecimal("0.00").compareTo(accBillsVO.getAppliedCurrentStlAmount()) != 0) {
+									finAccBillsVOList.add(accBillsVO);
+								}
+							}else if ("发票申请".equals(operationType)){
+								if (new BigDecimal("0.00").compareTo(accBillsVO.getAppliedInvoiceCurrentStlAmount()) != 0) {
+									finAccBillsVOList.add(accBillsVO);
+								}
+							}else{
+								if (new BigDecimal("0.00").compareTo(accBillsVO.getAppliedInvoiceCurrentStlAmount()) != 0) {
+									finAccBillsVOList.add(accBillsVO);
+								}
+								if (new BigDecimal("0.00").compareTo(accBillsVO.getAppliedCurrentStlAmount()) != 0) {
+									finAccBillsVOList.add(accBillsVO);
+								}
 							}
 						}
 					} else if ("3".equals(type)) {
@@ -522,13 +531,21 @@ public class FinAccBillsController extends BladeController {
 							finAccBillsVOPage.add(item);
 						}
 					} else {
-						if (ObjectUtils.isNotNull(item.getAppliedInvoiceCurrentStlAmount()) && new BigDecimal("0.00").compareTo(item.getAppliedInvoiceCurrentStlAmount()) != 0) {
-							finAccBillsVOPage.add(item);
-							continue;
-						}
-						if (ObjectUtils.isNotNull(item.getAppliedCurrentStlAmount()) && new BigDecimal("0.00").compareTo(item.getAppliedCurrentStlAmount()) != 0) {
-							finAccBillsVOPage.add(item);
-							continue;
+						if ("付费申请".equals(operationType)){
+							if (ObjectUtils.isNotNull(item.getAppliedCurrentStlAmount()) && new BigDecimal("0.00").compareTo(item.getAppliedCurrentStlAmount()) != 0) {
+								finAccBillsVOPage.add(item);
+							}
+						}else if ("发票申请".equals(operationType)){
+							if (ObjectUtils.isNotNull(item.getAppliedInvoiceCurrentStlAmount()) && new BigDecimal("0.00").compareTo(item.getAppliedInvoiceCurrentStlAmount()) != 0) {
+								finAccBillsVOPage.add(item);
+							}
+						}else{
+							if (ObjectUtils.isNotNull(item.getAppliedCurrentStlAmount()) && new BigDecimal("0.00").compareTo(item.getAppliedCurrentStlAmount()) != 0) {
+								finAccBillsVOPage.add(item);
+							}
+							if (ObjectUtils.isNotNull(item.getAppliedInvoiceCurrentStlAmount()) && new BigDecimal("0.00").compareTo(item.getAppliedInvoiceCurrentStlAmount()) != 0) {
+								finAccBillsVOPage.add(item);
+							}
 						}
 					}
 				} else if ("3".equals(type)) {