20230404 21:43

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/enums/OrderStatusEnum.java

@@ -27,7 +27,10 @@ public enum OrderStatusEnum {
 	 */
 	PASS("审批通过"),
 
-
+	/**
+	 * 审批驳回
+	 */
+	PASSCANACEL("驳回订单"),
 
 
 	;

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/excel/ProcurementTasksExcel.java

@@ -0,0 +1,50 @@
+package org.springblade.purchase.sales.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 采购任务导出
+ *
+ * @author s
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ProcurementTasksExcel {
+
+	@ExcelProperty(value = "销售单号")
+	private String billNo;
+
+	@ExcelProperty(value = "销售日期")
+	private Date businesDate;
+
+	@ExcelProperty(value = "交货日期")
+	private Date plannedDeliveryDate;
+
+	@ExcelProperty(value = "采购员")
+	private String carry;
+
+	@ExcelProperty(value = "产品名称")
+	private String cname;
+
+	@ExcelProperty(value = "产品编号")
+	private String code;
+
+	@ExcelProperty(value = "产品类别")
+	private String priceCategory;
+
+	@ExcelProperty(value = "产品型号")
+	private String itemType;
+
+	@ExcelProperty(value = "数量")
+	private BigDecimal orderQuantity;
+
+}

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

@@ -1158,18 +1158,18 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			detail.setCustomsDate(null);
 			detail.setDocumentaryDate(null);
 		} else if (3 == delivery.getDocumentaryStatusType()) {
-			detail.setDocumentaryStatus("订单完成");
+			detail.setDocumentaryStatus("寄单");
 			detail.setDocumentaryDate(delivery.getDocumentaryDate());
 			detail.setShippingDate(null);
 			detail.setCustomsDate(null);
-			detail.setDeliveryStatus("订单完成");
-		} else if (4 == delivery.getDocumentaryStatusType()) {
+			detail.setDeliveryStatus("寄单");
+		} /*else if (4 == delivery.getDocumentaryStatusType()) {
 			detail.setBookingSpaceStatus("已订舱");
 			detail.setBookingSpaceDate(delivery.getBookingSpaceDate());
 			detail.setShippingDate(null);
 			detail.setCustomsDate(null);
 			detail.setDeliveryStatus("订单完成");
-		}
+		}*/
 		Order selectOrder = orderDescClient.getById(detail.getSrcId());
 		if (ObjectUtils.isNotNull(selectOrder)) {
 			selectOrder.setUpdateTime(new Date());
@@ -1207,16 +1207,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				selectOrder.setOrderStatus("已出运");
 				selectOrder.setDocumentaryDate(delivery.getShippingDate());
 			} else if (3 == delivery.getDocumentaryStatusType()) {
-				sendMessage.setMessageBody("您的销售订单" + selectOrder.getSysNo() + "已完成,请查看");
-				selectOrder.setDocumentaryStatus("订单完成");
-				selectOrder.setOrderStatus("订单完成");
+				sendMessage.setMessageBody("您的销售订单" + selectOrder.getSysNo() + "已寄单,请查看");
+				selectOrder.setDocumentaryStatus("寄单");
+				selectOrder.setOrderStatus("寄单");
 				selectOrder.setDocumentaryDate(delivery.getDocumentaryDate());
-			}else if (4 == delivery.getDocumentaryStatusType()) {
+			}/*else if (4 == delivery.getDocumentaryStatusType()) {
 				sendMessage.setMessageBody("您的销售订单" + selectOrder.getSysNo() + "已订舱,请查看");
 				selectOrder.setDocumentaryStatus("已订舱");
 				selectOrder.setOrderStatus("已订舱");
 				selectOrder.setDocumentaryDate(delivery.getBookingSpaceDate());
-			}
+			}*/
 			selectOrder.setBillLadingNo(detail.getBillLadingNo());
 			orderDescClient.updateOrder(selectOrder);
 			R save = messageClient.save(sendMessage);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1294,7 +1294,7 @@ public class ExportOrderController extends BladeController {
 			.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getBillType, OrderTypeEnum.SALES.getType())
 			.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType())
-			.eq(Order::getFudaPurchaseStatus, "待采购");
+			.eq(Order::getFudaPurchaseStatus, "审批通过");
 		List<Order> orderList = orderService.list(lambdaQueryWrapper);
 		return R.data(orderList);
 	}
@@ -1310,18 +1310,18 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.eq(OrderItems::getTenantId, SecureUtil.getTenantId());//租户id
 		lambdaQueryWrapper.eq(OrderItems::getIsDeleted, 0);//订单是否有效
 		lambdaQueryWrapper.eq(OrderItems::getBillType, OrderTypeEnum.SALES.getType());//订单类型
-		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getPid()), OrderItems::getPid, orderItems.getPid());//订单类型
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getPid()), OrderItems::getPid, orderItems.getPid());//主表id
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getBillNo()), OrderItems::getBillNo, orderItems.getBillNo());//销售单号
 		if (ObjectUtils.isNotNull(orderItems.getBusinesDateList()) && orderItems.getBusinesDateList().size() > 0) {
 			lambdaQueryWrapper.ge(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(1));
 		}
 		if (ObjectUtils.isNotNull(orderItems.getPlannedDeliveryDateList()) && orderItems.getPlannedDeliveryDateList().size() > 0) {
-			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(0));//销售单号
-			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(1));//销售单号
+			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(0));//计划交货日期起
+			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(1));//计划交货日期止
 		}
-		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getCorpId()), OrderItems::getCorpId, orderItems.getCorpId());//销售单号
-		lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");//销售单号
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getCorpId()), OrderItems::getCorpId, orderItems.getCorpId());//供应商
+		//lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");//采购状态
 		lambdaQueryWrapper.apply("order_quantity > purchase_quantity");//销售数量大于采购数量
 		lambdaQueryWrapper.orderByDesc(OrderItems::getId);
 		List<OrderItems> pages = orderItemsService.list(lambdaQueryWrapper);
@@ -1381,6 +1381,89 @@ public class ExportOrderController extends BladeController {
 	}
 
 	/**
+	 * 销售列表导出
+	 */
+	@GetMapping("/listXSExport")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "销售列表导出", notes = "传入order")
+	public void listXSExport(OrderItems orderItems, HttpServletResponse response) {
+		LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(OrderItems::getTenantId, SecureUtil.getTenantId());//租户id
+		lambdaQueryWrapper.eq(OrderItems::getIsDeleted, 0);//订单是否有效
+		lambdaQueryWrapper.eq(OrderItems::getBillType, OrderTypeEnum.SALES.getType());//订单类型
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getPid()), OrderItems::getPid, orderItems.getPid());//主表id
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getBillNo()), OrderItems::getBillNo, orderItems.getBillNo());//销售单号
+		if (ObjectUtils.isNotNull(orderItems.getBusinesDateList()) && orderItems.getBusinesDateList().size() > 0) {
+			lambdaQueryWrapper.ge(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(0));
+			lambdaQueryWrapper.le(OrderItems::getBusinesDate, orderItems.getBusinesDateList().get(1));
+		}
+		if (ObjectUtils.isNotNull(orderItems.getPlannedDeliveryDateList()) && orderItems.getPlannedDeliveryDateList().size() > 0) {
+			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(0));//计划交货日期起
+			lambdaQueryWrapper.eq(OrderItems::getPlannedDeliveryDate, orderItems.getPlannedDeliveryDateList().get(1));//计划交货日期止
+		}
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getCorpId()), OrderItems::getCorpId, orderItems.getCorpId());//供应商
+		//lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");//采购状态
+		lambdaQueryWrapper.apply("order_quantity > purchase_quantity");//销售数量大于采购数量
+		lambdaQueryWrapper.orderByDesc(OrderItems::getId);
+		List<OrderItems> pages = orderItemsService.list(lambdaQueryWrapper);
+		List<OrderItems> orderItemsList = new ArrayList<>();
+		for (OrderItems orderItems_ : pages) {
+			if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
+				CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
+				if (ObjectUtils.isNotNull(corpsDesc)) {
+					orderItems_.setCorpName(corpsDesc.getCname());
+				}
+			}
+			if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
+				GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
+				if (ObjectUtils.isNotNull(goodsDesc)) {
+					orderItems_.setCname(goodsDesc.getCname());
+					orderItems_.setCode(goodsDesc.getCode());
+				}
+			}
+			if (ObjectUtils.isNotNull(orderItems_.getPurchaseQuantity())) {
+				orderItems_.setActualQuantity(orderItems_.getOrderQuantity().subtract(orderItems_.getPurchaseQuantity()));
+			} else {
+				orderItems_.setActualQuantity(orderItems_.getOrderQuantity());
+			}
+			if (ObjectUtils.isNotNull(orderItems_.getPurchasePrice())) {
+				orderItems_.setPrice(orderItems_.getPurchasePrice());
+				orderItems_.setAmount(orderItems_.getPurchasePrice().multiply(orderItems_.getActualQuantity()));
+			} else {
+				orderItems_.setPrice(orderItems_.getPrice());
+				orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
+			}
+			orderItemsList.add(orderItems_);
+			LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
+				.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
+				.eq(OrderParts::getType, "4")
+				.eq(OrderParts::getPid, orderItems_.getId());
+			List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
+			for (OrderParts orderParts : orderPartsList) {
+				OrderItems orderItems1 = new OrderItems();
+				orderItems1.setBillNo(orderItems_.getBillNo());
+				orderItems1.setBusinesDate(orderItems_.getBusinesDate());
+				orderItems1.setPlannedDeliveryDate(orderItems_.getPlannedDeliveryDate());
+				orderItems1.setCarry(orderItems_.getCarry());
+				orderItems1.setItemId(orderParts.getGoodId());
+				orderItems1.setCname(orderParts.getGoodName());
+				orderItems1.setPrice(orderParts.getPrice());
+				orderItems1.setActualQuantity(orderParts.getGoodNumber());
+				orderItems1.setOrderQuantity(orderParts.getGoodNumber());
+				orderItems1.setAmount(orderParts.getAmout());
+				orderItems1.setPriceCategory(orderParts.getGoodTypeName());
+				orderItems1.setEname(orderParts.getEname());
+				orderItems1.setPartsCost(orderParts.getPartsCost());
+				orderItemsList.add(orderItems1);
+			}
+		}
+		List<ProcurementTasksExcel> excelList = BeanUtil.copy(orderItemsList, ProcurementTasksExcel.class);
+		ExcelUtil.export(response, "采购任务", "采购任务", excelList, ProcurementTasksExcel.class);
+
+	}
+
+	/**
 	 * 生成发货单(新)
 	 *
 	 * @param order

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -53,6 +53,7 @@ import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
 import org.springblade.land.entity.LandOrder;
+import org.springblade.land.entity.OrderItem;
 import org.springblade.land.feign.ILandClient;
 import org.springblade.pay.tonglianPayment.dto.PaymentDTO;
 import org.springblade.pay.tonglianPayment.entity.Parameters;
@@ -268,7 +269,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							Order selectOrder = baseMapper.selectById(Long.parseLong(arr));
 							if (ObjectUtils.isNotNull(selectOrder)) {
 								selectOrder.setFudaPurchaseDate(new Date());
-								selectOrder.setFudaPurchaseStatus("采购中");
 								selectOrder.setUpdateTime(new Date());
 								selectOrder.setUpdateUser(AuthUtil.getUserId());
 								selectOrder.setUpdateUserName(AuthUtil.getUserName());
@@ -306,8 +306,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 								}
 							}
 						}
-						order.setFudaPurchaseDate(new Date());
-						order.setFudaPurchaseStatus("采购中");
 					}
 				} else {
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
@@ -1171,6 +1169,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				salesOrder.setStatus(1);
 				salesOrder.setOrderStatus(OrderStatusEnum.SUBMIT.getType());
 				salesOrder.setCheckDate(new Date());
+				salesOrder.setFudaPurchaseStatus(OrderStatusEnum.SUBMIT.getType());
 			}
 			baseMapper.updateById(salesOrder);
 
@@ -1378,6 +1377,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		order.setStatus(3);
 		order.setOrderStatus(OrderStatusEnum.PASS.getType());
+		//福达审核通过更改状态为审核通过
+		order.setFudaPurchaseStatus(OrderStatusEnum.PASS.getType());
+		order.setFudaPurchaseDate(new Date());
 		baseMapper.updateById(order);
 		// ===========================end 审核通过修改销售订单信息==========================
 
@@ -1589,6 +1591,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		order.setStatus(0);
 		order.setOrderStatus(OrderStatusEnum.ENTERING.getType());
+		order.setFudaPurchaseStatus(OrderStatusEnum.PASSCANACEL.getType());
 		baseMapper.updateById(order);
 	}
 
@@ -5074,9 +5077,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					saveOrderParts(categoryConstantInfos, orderItems.getId(), "4", order.getId());
 				}
 			}
-			selectOrder.setFudaPurchaseStatus("待采购");
+			//selectOrder.setFudaPurchaseStatus("待采购");
 			selectOrder.setOrderStatus("待采购");
-			selectOrder.setFudaPurchaseDate(order.getFudaPurchaseDate());
+			//selectOrder.setFudaPurchaseDate(order.getFudaPurchaseDate());
 			baseMapper.updateById(selectOrder);
 			//循环发送消息
 			Message sendMessage = new Message();
@@ -5119,7 +5122,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<OrderItems> orderItemsList = orderItemsService.getOrderItems(order);
 		orderMessage.setOrderItemsList(orderItemsList);
 		orderMessage.setDeliverQuantity(orderItemsList.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
-		orderMessage.setDocumentaryStatus("跟单中");
 		orderMessage.setDocumentaryDate(order.getDocumentaryDate());
 		baseMapper.updateById(orderMessage);
 
@@ -5266,13 +5268,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			detail.setOrderStatus("预计货好");
 			detail.setEstimateGoodGoodsDate(order.getEstimateGoodGoodsDate());
 		} else if (3 == order.getPurchaseStatusType()) {
-			detail.setFudaPurchaseStatus("采购完成");
-			detail.setOrderStatus("采购完成");
+			detail.setFudaPurchaseStatus("货备齐");
+			detail.setOrderStatus("货备齐");
 			detail.setFudaPurchaseDate(order.getFudaPurchaseDate());
 		}
+		//获得所有明细数据
 		LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getTenantId, AuthUtil.getTenantId()).eq(OrderItems::getPid, detail.getId());
+		lambdaQueryWrapper.eq(OrderItems::getIsDeleted, 0)
+			.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderItems::getPid, detail.getId());
 		List<OrderItems> orderItemsList = orderItemsMapper.selectList(lambdaQueryWrapper);
+
 		if (ObjectUtils.isNotNull(orderItemsList) && orderItemsList.size() > 0) {
 			List<Long> pidList = new ArrayList<>();
 			for (OrderItems orderItems : orderItemsList) {
@@ -5280,6 +5286,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setFudaPurchaseStatus("采购完成");
 				}
 				orderItemsMapper.updateById(orderItems);
+				if (1 == order.getPurchaseStatusType()) {//排产中
+					//更新对应销售单明细采购数量
+					OrderItems srcItems = new OrderItems();
+					srcItems.setId(orderItems.getSrcItemId());
+					srcItems.setPurchaseQuantity(orderItems.getActualQuantity());
+					orderItemsMapper.updateById(srcItems);
+				}
+
 				pidList.add(orderItems.getSrcId());
 			}
 			List<Long> pids = pidList.stream().distinct().collect(Collectors.toList());
@@ -5287,20 +5301,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				Order order1 = baseMapper.selectById(pid);
 				BigDecimal purchaseQuantity = orderItemsList.stream().filter(e -> e.getSrcId().equals(pid)).map(OrderItems::getPurchaseQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
 				if (ObjectUtils.isNotNull(order1)) {
+					if (1 == order.getPurchaseStatusType()) {
+						order1.setProductionScheduling("排产中");
+						order1.setOrderStatus("采购完成");
+						order1.setProductionSchedulingDate(order.getProductionSchedulingDate());
+					} else if (2 == order.getPurchaseStatusType()) {
+						order1.setProductionScheduling("预计货好");
+						order1.setOrderStatus("预计货好");
+						order1.setEstimateGoodGoodsDate(order.getEstimateGoodGoodsDate());
+					} else if (3 == order.getPurchaseStatusType()) {
+						order1.setProductionScheduling("货备齐");
+						order1.setOrderStatus("货备齐");
+						order1.setFudaPurchaseDate(order.getFudaPurchaseDate());
+					}
 					if (order1.getStorageQuantity().equals(order1.getPurchaseQuantity().add(purchaseQuantity))) {
-						if (1 == order.getPurchaseStatusType()) {
-							order1.setProductionScheduling("排产中");
-							order1.setOrderStatus("采购完成");
-							order1.setProductionSchedulingDate(order.getProductionSchedulingDate());
-						} else if (2 == order.getPurchaseStatusType()) {
-							order1.setEstimateGoodGoods("预计货好");
-							order1.setOrderStatus("预计货好");
-							order1.setEstimateGoodGoodsDate(order.getEstimateGoodGoodsDate());
-						} else if (3 == order.getPurchaseStatusType()) {
-							order1.setFudaPurchaseStatus("采购完成");
-							order1.setOrderStatus("采购完成");
-							order1.setFudaPurchaseDate(order.getFudaPurchaseDate());
-						}
 						order1.setPurchaseQuantity(order1.getPurchaseQuantity().add(purchaseQuantity));
 					}
 					baseMapper.updateById(order1);
@@ -5338,12 +5352,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						selectOrder.setProductionSchedulingDate(order.getProductionSchedulingDate());
 					} else if (2 == order.getPurchaseStatusType()) {
 						sendMessage.setMessageBody("您的销售订单" + selectOrder.getSysNo() + "已预计货好,请查看");
-						selectOrder.setEstimateGoodGoods("预计货好");
+						selectOrder.setProductionScheduling("预计货好");
 						selectOrder.setOrderStatus("预计货好");
 						selectOrder.setEstimateGoodGoodsDate(order.getEstimateGoodGoodsDate());
 					} else if (3 == order.getPurchaseStatusType()) {
 						sendMessage.setMessageBody("您的销售订单" + selectOrder.getSysNo() + "已采购完成,请查看");
-						selectOrder.setFudaPurchaseStatus("采购完成");
+						selectOrder.setProductionScheduling("货备齐");
 						selectOrder.setOrderStatus("采购完成");
 						selectOrder.setFudaPurchaseDate(order.getFudaPurchaseDate());
 						deliveryClient.updateBySrcId(selectOrder.getId(), "FH", selectOrder.getTradeType());

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -923,7 +923,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			accMapper.updateById(acc);
 			//原业务表,计算应收未收款,应收未收款 = 销售金额 - 本次溢付款 - 已收款
 			client.setBalanceAmount((client.getDebitAmount().subtract(client.getSettlmentAmount())).subtract(client.getCaseOverPayment()));
-			if (!items.getAmount().equals(items.getThisAmount())) {
+			if (!items.getAmount().equals(items.getThisAmount().add(items.getSettlementAmount()))) {
 				client.setDepositReceived("定金到账");
 			} else {
 				client.setDepositReceived("定金到账");

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

@@ -200,7 +200,6 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 						Order selectOrder = orderService.selectById(Long.parseLong(arr));
 						if (ObjectUtils.isNotNull(selectOrder)) {
 							selectOrder.setFudaPurchaseDate(new Date());
-							selectOrder.setFudaPurchaseStatus("采购中");
 							selectOrder.setUpdateTime(new Date());
 							selectOrder.setUpdateUser(AuthUtil.getUserId());
 							selectOrder.setUpdateUserName(AuthUtil.getUserName());
@@ -238,8 +237,6 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 							}
 						}
 					}
-					order.setFudaPurchaseDate(new Date());
-					order.setFudaPurchaseStatus("采购中");
 				}
 				order.setBuyerName(order.get$buyerId());
 				order.setDocumenterName(order.get$documenterId());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -51,6 +51,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -915,6 +916,13 @@ public class PurchaseOrderController extends BladeController {
 		if (items.getId() == null) {
 			return R.fail(ERROR_MSG);
 		}
+		//删除明细 原销售单采购数据还原
+		OrderItems orderItems = orderItemsService.getById(items.getId());
+		OrderItems srcItems = new OrderItems();
+		srcItems.setPurchaseQuantity(BigDecimal.ZERO);
+		srcItems.setId(orderItems.getSrcItemId());
+		orderItemsService.updateById(srcItems);
+
 		return R.status(orderItemsService.removeById(items.getId()));
 	}