2022年10月10日08:34:04

blade-service/trade-purchase/src/main/java/com/trade/purchase/excel/CMYWarehousingExcel.java

@@ -67,7 +67,7 @@ public class CMYWarehousingExcel {
 	/**
 	 * 入库总金额
 	 */
-	@ExcelProperty(value = "入库总金额")
+	@ExcelProperty(value = "入库金额")
 	private BigDecimal storageAmount;
 
 	/**

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -1086,7 +1086,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					items.setId(orderItems.getSrcItemId());
 					items.setIsIssue("4");
 					orderItemsMapper.updateById(items);
-				}else if (OrderTypeEnum.INVENTORY.getType().equals(submitDto.getBillType())) {
+				} else if (OrderTypeEnum.INVENTORY.getType().equals(submitDto.getBillType())) {
 					orderItems.setBillType(OrderTypeEnum.INVENTORY.getType());
 				}
 				orderItems.setPurchaserId(submitDto.getPurchaserId());
@@ -1172,7 +1172,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						items.setIsIssue("4");
 						orderItemsMapper.updateById(items);
 					}
-				}else if (OrderTypeEnum.INVENTORY.getType().equals(submitDto.getBillType())) {
+				} else if (OrderTypeEnum.INVENTORY.getType().equals(submitDto.getBillType())) {
 					orderItems.setBillType(OrderTypeEnum.INVENTORY.getType());
 				}
 				orderItems.setPurchaserId(submitDto.getPurchaserId());
@@ -1259,8 +1259,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			for (OrderItems orderItems : orderItemsList) {
 				orderItems.setPid(submitDto.getId());
 				orderItems.setTenantId(AuthUtil.getTenantId());
-//				orderItems.setBalanceNumber(orderItems.getStorageInQuantity());//结余量
-//				orderItems.setBalanceMoney(orderItems.getStorageAmount());//结余金额
 				orderItems.setPurchaserId(submitDto.getPurchaserId());
 				orderItems.setWarehouseId(submitDto.getStorageId());
 				List<OrderItems> orderItemsBillNo = new ArrayList<>();
@@ -1286,6 +1284,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 					orderItems.setBillType(OrderTypeEnum.WAREHOUSING.getType());
 					orderItems.setStockTime(submitDto.getStockTime());
+					orderItems.setBalanceNumber(orderItems.getStorageInQuantity());//结余量
+					orderItems.setBalanceMoney(orderItems.getStorageAmount());//结余金额
 				} else if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(submitDto.getBillType())) {//出库  同时更新入库明细货物状态
 					orderItems.setIsIssue("4");
 					orderItems.setBillType(OrderTypeEnum.OUT_WAREHOUSING.getType());
@@ -1308,8 +1308,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setCreateUserName(AuthUtil.getUserName());
 					orderItemsMapper.insert(orderItems);
 				}
-				balanceNumber = balanceNumber.add(orderItems.getBalanceNumber());
-				balanceMoney = balanceMoney.add(orderItems.getBalanceMoney());
+				if (ObjectUtils.isNotNull(orderItems.getBalanceNumber())){
+					balanceNumber = balanceNumber.add(orderItems.getBalanceNumber());
+				}else{
+					balanceNumber = balanceNumber.add(new BigDecimal(0));
+				}
+				if(ObjectUtils.isNotNull(orderItems.getBalanceMoney())){
+					balanceMoney = balanceMoney.add(orderItems.getBalanceMoney());
+				}else{
+					balanceNumber = balanceNumber.add(new BigDecimal(0));
+				}
+
 				goodsName.add(orderItems.getCname());
 			}
 		}
@@ -1582,11 +1591,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 				List<Long> srcItemIds = CkOrderItemsList.stream().map(OrderItems::getSrcItemId).distinct().collect(Collectors.toList());
 				List<OrderItems> orderItemsList = new ArrayList<>();
-				for (Long srcItemId :srcItemIds) {
+				for (Long srcItemId : srcItemIds) {
 					orderItemsList.add(orderItemsMapper.selectById(srcItemId));
 				}
 				List<Long> pIds = orderItemsList.stream().map(OrderItems::getPid).distinct().collect(Collectors.toList());
-				for (Long pId :pIds) {
+				for (Long pId : pIds) {
 					LambdaQueryWrapper<OrderItems> RKOrderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 					RKOrderItemsLambdaQueryWrapper
 						.eq(OrderItems::getIsDeleted, 0)
@@ -2549,7 +2558,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 								if (agreementitems.getPrice().compareTo(new BigDecimal(0)) > 0) {
 									//业务天数乘以单价 = 剩余所需收费金额
 									amount = amount.add((new BigDecimal(date + 2)).multiply(agreementitems.getPrice(), MathContext.UNLIMITED).multiply(orderItems.getStorageInQuantity()));
-									text.append(order.getStorageQuantity()).append("*").append(agreementitems.getPrice()).append("*").append(date + 2);
+									text.append(order.getStorageQuantity()).append("*").append(agreementitems.getPrice()).append("*").append(date + 2).append("^");
 									date = date - (agreementitems.getEnDays() - agreementitems.getFromDays() + 1);
 								}
 							}