2023年10月23日17:02:33

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -622,22 +622,22 @@ public class OrderItems implements Serializable {
 	 * 特殊处理 配件名
 	 */
 	@ApiModelProperty(value = "特殊处理 配件名")
-	private String parts_handleName;
+	private String partsHandleName;
 	/**
 	 * 特殊处理 配件成本价格
 	 */
 	@ApiModelProperty(value = "特殊处理 配件成本价格")
-	private BigDecimal parts_handleCostPrice;
+	private BigDecimal partsHandleCostPrice;
 	/**
 	 * 特殊处理 配件值
 	 */
 	@ApiModelProperty(value = "特殊处理 配件值")
-	private String parts_handleValue;
+	private String partsHandleValue;
 	/**
 	 * 特殊处理 配件销售价格
 	 */
 	@ApiModelProperty(value = "特殊处理 配件销售价格")
-	private BigDecimal parts_handleSalePrice;
+	private BigDecimal partsHandleSalePrice;
 
 	/**
 	 * 特殊颜色 配件名

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -888,6 +888,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			List<DeliveryItems> reducelList = deliveryItemsList.stream().filter(distinctByKey(DeliveryItems::getItemId)).collect(Collectors.toList());
 			Date date = new Date();
 			reducelList.forEach(e -> {
+				BigDecimal oldOrderQuantity = e.getActualQuantity();
 				// 原单据的订货数量
 				BigDecimal orderQuantity = deliveryItemsList.stream().filter(i -> i.getItemId().equals(e.getItemId()))
 					.collect(Collectors.toList()).stream().map(DeliveryItems::getActualQuantity)
@@ -1061,6 +1062,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 						}
 					}
 				}
+				e.setActualQuantity(oldOrderQuantity);
 			});
 			R res = stockGoodsClient.saveOrUpdateBatchList(stockGoodsList1);
 			if (!res.isSuccess()) {
@@ -1074,7 +1076,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				.eq(DeliveryItems::getIsDeleted, 0);
 			List<DeliveryItems> itemsList = deliveryItemsMapper.selectList(itemsLambdaQueryWrapper);
 
-			if(ObjectUtils.isNull(delivery.getDeliveryItemsList())){
+			if (ObjectUtils.isNull(delivery.getDeliveryItemsList())) {
 				delivery.setDeliveryItemsList(itemsList);
 			}
 			delivery.getDeliveryItemsList().forEach(e -> {
@@ -1323,7 +1325,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	}
 
 
-		public void voucher(String brand, Delivery select, String accountName, String copsName, String corpNumber, String warehouse, String acoount, String orderNo) {
+	public void voucher(String brand, Delivery select, String accountName, String copsName, String corpNumber, String warehouse, String acoount, String orderNo) {
 		try {
 			//测试账套-工厂发货生成凭证
 			Delivery delivery = this.testTakeGoodsSaveVoucher(brand, select, accountName, copsName, corpNumber, warehouse, acoount, orderNo);

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/ContainersController.java

@@ -119,8 +119,8 @@ public class ContainersController extends BladeController {
 	@PostMapping("/cleanBoxNo")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
-	public R cleanBoxNo( @RequestParam List<Containers> containersList) {
-		return containersService.cleanBoxNo(containersList);
+	public R cleanBoxNo( @RequestParam String ids) {
+		return containersService.cleanBoxNo(Func.toLongList(ids));
 	}
 
 

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

@@ -66,5 +66,5 @@ public interface IContainersService extends IService<Containers> {
 	 * @param containersList
 	 * @return
 	 */
-	R cleanBoxNo(List<Containers> containersList);
+	R cleanBoxNo(List<Long> containersList);
 }

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

@@ -296,7 +296,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				.eq(Bills::getTenantId, AuthUtil.getTenantId())
 				.eq(Bills::getIsDeleted, 0)
 				.eq(Bills::getMasterId, detail.getId())
-				.eq(Bills::getMasterBillNo, detail.getMasterBillNo()));
+				.eq(Bills::getMasterBillNo, detail.getBillNo()));
 			waitingBoxList = BeanUtil.copy(billsList, WaitingBox.class);
 		}
 		detail.setWaitingBoxList(waitingBoxList);

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

@@ -123,15 +123,15 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 			containers.setNetWeight(containers.getContainersBillsList().stream().map(ContainersBills::getNetWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			containers.setMeasurement(containers.getContainersBillsList().stream().map(ContainersBills::getMeasurement).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			for (ContainersBills item : containers.getContainersBillsList()) {
-				Bills bills = billsMapper.selectById(item.getPpId());
-				bills.setCfsQuantity((ObjectUtils.isNotNull(bills.getCfsQuantity()) ? bills.getCfsQuantity() : new BigDecimal("0.00")).add(item.getQuantity()));
-				bills.setCfsQuantity((ObjectUtils.isNotNull(bills.getCfsMeasurement()) ? bills.getCfsMeasurement() : new BigDecimal("0.00")).add(item.getMeasurement()));
-				bills.setCfsQuantity((ObjectUtils.isNotNull(bills.getCfsGrossWeight()) ? bills.getCfsGrossWeight() : new BigDecimal("0.00")).add(item.getGrossWeight()));
-				bills.setUpdateUserName(AuthUtil.getUserName());
-				bills.setUpdateUser(AuthUtil.getUserId());
-				bills.setUpdateTime(new Date());
-				billsMapper.updateById(bills);
 				if (item.getId() == null) {
+					Bills bills = billsMapper.selectById(item.getPpId());
+					bills.setCfsQuantity((ObjectUtils.isNotNull(bills.getCfsQuantity()) ? bills.getCfsQuantity() : new BigDecimal("0.00")).add(item.getQuantity()));
+					bills.setCfsQuantity((ObjectUtils.isNotNull(bills.getCfsMeasurement()) ? bills.getCfsMeasurement() : new BigDecimal("0.00")).add(item.getMeasurement()));
+					bills.setCfsQuantity((ObjectUtils.isNotNull(bills.getCfsGrossWeight()) ? bills.getCfsGrossWeight() : new BigDecimal("0.00")).add(item.getGrossWeight()));
+					bills.setUpdateUserName(AuthUtil.getUserName());
+					bills.setUpdateUser(AuthUtil.getUserId());
+					bills.setUpdateTime(new Date());
+					billsMapper.updateById(bills);
 					item.setPid(containers.getId());
 					item.setCreateTime(new Date());
 					item.setCreateUser(AuthUtil.getUserId());
@@ -188,7 +188,11 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
-	public R cleanBoxNo(List<Containers> containersList) {
+	public R cleanBoxNo(List<Long> ids) {
+		List<Containers> containersList = this.list(new LambdaQueryWrapper<Containers>()
+			.eq(Containers::getTenantId, AuthUtil.getTenantId())
+			.eq(Containers::getIsDeleted, 0)
+			.in(Containers::getId, ids));
 		for (Containers item : containersList) {
 			if (item.getId() == null) {
 				throw new RuntimeException("请先保存");