20230409 23:05

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceItem.java

@@ -208,4 +208,10 @@ public class PriceItem implements Serializable {
 	@TableField(exist = false)
 	private String createTimeEnd;
 
+	/**
+	 * 采购返利价
+	 */
+	@ApiModelProperty(value = "采购返利价")
+	private BigDecimal purchaseRebatePrice;
+
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/SalesPolicyItem.java

@@ -87,6 +87,11 @@ public class SalesPolicyItem implements Serializable {
 		@ApiModelProperty(value = "特价")
 		private BigDecimal specialOffer;
 	/**
+	 * 真实特价
+	 */
+		@ApiModelProperty(value = "真实特价")
+		private BigDecimal realSpecialOffer;
+	/**
 	* 采购数量
 	*/
 		@ApiModelProperty(value = "采购数量")

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

@@ -1392,6 +1392,12 @@ public class Order implements Serializable {
 	@TableField(exist = false)
 	private String source;
 
+	/**
+	 * 是否显示全部 0否1是（福达）
+	 */
+	@TableField(exist = false)
+	private Integer showAll;
+
 	public String get$buyerId() {
 		return $buyerId;
 	}

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

@@ -177,24 +177,24 @@ public class OrderItems implements Serializable {
 	@ApiModelProperty(value = "码单重量")
 	private BigDecimal billWeight;
 	/**
-	 * 自定义1
+	 * 螺纹
 	 */
-	@ApiModelProperty(value = "自定义1")
+	@ApiModelProperty(value = "螺纹")
 	private String remarksOne;
 	/**
-	 * 自定义2
+	 * 介质
 	 */
-	@ApiModelProperty(value = "自定义2")
+	@ApiModelProperty(value = "介质")
 	private String customTwo;
 	/**
-	 * 自定义3
+	 * 颜色
 	 */
-	@ApiModelProperty(value = "自定义3")
+	@ApiModelProperty(value = "颜色")
 	private String customThree;
 	/**
-	 * 自定义4
+	 * 电压
 	 */
-	@ApiModelProperty(value = "自定义4")
+	@ApiModelProperty(value = "电压")
 	private String customFour;
 	/**
 	 * 自定义5
@@ -782,5 +782,10 @@ public class OrderItems implements Serializable {
 	@ApiModelProperty(value = "采购状态")
 	private String fudaPurchaseStatus;
 
+	/**
+	 * 是否显示全部 0否1是（福达）
+	 */
+	@TableField(exist = false)
+	private Integer showAll;
 
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/excel/PriceItemExcel.java

@@ -4,6 +4,7 @@ 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -57,9 +58,16 @@ public class PriceItemExcel implements Serializable {
 	@ExcelProperty("采购价格")
 	private BigDecimal purchasePrice;
 
+	/**
+	 * 采购返利价
+	 */
+	@ExcelProperty(value = "采购返利价")
+	private BigDecimal purchaseRebatePrice;
+
 	@ExcelProperty("运费")
 	private BigDecimal freightFees;
 
 	@ExcelProperty("标签")
 	private BigDecimal labelFees;
+
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/excel/SalesItemExcel.java

@@ -31,6 +31,13 @@ public class SalesItemExcel implements Serializable {
 
 	@ExcelProperty("特价")
 	private String specialOffer;
+
+	/**
+	 * 真实特价
+	 */
+	@ExcelProperty(value = "真实特价")
+	private BigDecimal realSpecialOffer;
+
 	/**
 	 * 箱体积
 	 */

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceItemServiceImpl.java

@@ -86,6 +86,7 @@ public class PriceItemServiceImpl extends ServiceImpl<PriceItemMapper, PriceItem
 			priceItem.setBrandItem(priceItemExcel.getBrandItem());
 			priceItem.setTypeno(priceItemExcel.getTypeno());
 			priceItem.setProductCategory(priceItemExcel.getProductCategory());
+			priceItem.setPurchaseRebatePrice(priceItemExcel.getPurchaseRebatePrice());
 			//获取商品信息
 			if (StringUtils.isNotBlank(priceItemExcel.getCode())){
 				priceItem.setCode(priceItemExcel.getCode());

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -271,6 +271,7 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 			salesPolicyItem.setSalesType("1");
 			salesPolicyItem.setCntrVolumn(goodsDesc.getCntrVolumn());
 			salesPolicyItem.setCartonWeight(goodsDesc.getCartonWeight());
+			salesPolicyItem.setRealSpecialOffer(goodsExcel.getRealSpecialOffer());//真实特价
 			//产品分类
 			GoodsType goodsType = goodsDescClient.goodTypeId(goodsDesc.getId());
 			if (goodsType == null) {

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

@@ -46,6 +46,7 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.sql.rowset.serial.SerialException;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -1271,6 +1272,7 @@ public class ExportOrderController extends BladeController {
 
 	/**
 	 * 生成采购(发送消息)
+	 * 福达通知采购
 	 */
 	@PostMapping("/generatePurchaseNews")
 	@ApiOperationSupport(order = 6)
@@ -1283,6 +1285,26 @@ public class ExportOrderController extends BladeController {
 	}
 
 	/**
+	 * 出口销售获得采购订单信息
+	 */
+	@GetMapping("/listPurchaseStatus")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "出口销售获得采购状态", notes = "传入id")
+	public R<List<Order>> listPurchaseStatus(@RequestParam(value = "id") String id) {
+		if (ObjectUtils.isEmpty(id)){
+			throw new SecurityException("缺少必要参数");
+		}
+		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Order::getIsDeleted, 0)
+			.eq(Order::getTenantId, AuthUtil.getTenantId())
+			.eq(Order::getBillType, OrderTypeEnum.PURCHASE.getType())
+			.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType())
+			.like(Order::getSrcIds, id);
+		List<Order> orderList = orderService.list(lambdaQueryWrapper);
+		return R.data(orderList);
+	}
+
+	/**
 	 * 出口销售或采购订单表
 	 */
 	@GetMapping("/listBYStatus")
@@ -1294,7 +1316,8 @@ 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, "审批通过");
+			.isNotNull(Order::getProductionScheduling)
+			.ne(Order::getProductionScheduling,"货备齐");
 		List<Order> orderList = orderService.list(lambdaQueryWrapper);
 		return R.data(orderList);
 	}
@@ -1321,8 +1344,11 @@ public class ExportOrderController extends BladeController {
 			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");//销售数量大于采购数量
+
+		if(orderItems.getShowAll() == 0) {//0代表不显示全部
+			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<>();
@@ -1334,7 +1360,7 @@ public class ExportOrderController extends BladeController {
 				}
 			}
 			if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
-				GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
+				GoodsDesc goodsDesc = goodsDescClient.getGoodsDesc(orderItems_.getItemId(), AuthUtil.getTenantId());
 				if (ObjectUtils.isNotNull(goodsDesc)) {
 					orderItems_.setCname(goodsDesc.getCname());
 					orderItems_.setCode(goodsDesc.getCode());
@@ -1356,11 +1382,11 @@ public class ExportOrderController extends BladeController {
 			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.setId(orderParts.getId());
 				orderItems1.setBillNo(orderItems_.getBillNo());
 				orderItems1.setBusinesDate(orderItems_.getBusinesDate());
 				orderItems1.setPlannedDeliveryDate(orderItems_.getPlannedDeliveryDate());
@@ -1402,8 +1428,11 @@ public class ExportOrderController extends BladeController {
 			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");//销售数量大于采购数量
+
+		if(orderItems.getShowAll() == 0) {//0代表不显示全部
+			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<>();
@@ -1437,11 +1466,11 @@ public class ExportOrderController extends BladeController {
 			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.setId(orderParts.getId());
 				orderItems1.setBillNo(orderItems_.getBillNo());
 				orderItems1.setBusinesDate(orderItems_.getBusinesDate());
 				orderItems1.setPlannedDeliveryDate(orderItems_.getPlannedDeliveryDate());
@@ -1485,12 +1514,12 @@ public class ExportOrderController extends BladeController {
 	/**
 	 * 生成采购(单据信息)
 	 */
-	@GetMapping("/generatePurchaseBill")
+	@PostMapping("/generatePurchaseBill")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入order")
 	@RepeatSubmit
-	public R generatePurchaseBill(@RequestParam(value = "ids") String ids) {
-		return orderService.generatePurchaseBill(ids);
+	public R generatePurchaseBill(@RequestBody List<OrderItems> itemsList) {
+		return orderService.generatePurchaseBill(itemsList);
 	}
 
 	/**

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

@@ -24,6 +24,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.purchase.sales.entity.Order;
+import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.excel.*;
 import org.springblade.purchase.sales.vo.*;
 import org.springblade.stock.entity.StockGoods;
@@ -501,7 +502,7 @@ public interface IOrderService extends IService<Order> {
 
 	R generateShipment(Order order);
 
-	R generatePurchaseBill(String ids);
+	R generatePurchaseBill(List<OrderItems> itemsList);
 
     R purchaseStatusUpdate(Order order);
 

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

@@ -64,6 +64,7 @@ import org.springblade.purchase.sales.enums.OrderStatusEnum;
 import org.springblade.purchase.sales.excel.*;
 import org.springblade.purchase.sales.mapper.*;
 import org.springblade.purchase.sales.service.IOrderFilesService;
+import org.springblade.purchase.sales.service.IOrderPartsService;
 import org.springblade.purchase.sales.service.IOrderService;
 import org.springblade.purchase.sales.vo.*;
 import org.springblade.stock.entity.StockGoods;
@@ -172,6 +173,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	//收发货
 	private final IDeliveryClient deliveryClient;
 
+	private final IOrderPartsService orderPartsService;
+
 
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
@@ -268,7 +271,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						for (String arr : arrs) {
 							Order selectOrder = baseMapper.selectById(Long.parseLong(arr));
 							if (ObjectUtils.isNotNull(selectOrder)) {
-								selectOrder.setFudaPurchaseDate(new Date());
 								selectOrder.setUpdateTime(new Date());
 								selectOrder.setUpdateUser(AuthUtil.getUserId());
 								selectOrder.setUpdateUserName(AuthUtil.getUserName());
@@ -543,10 +545,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return R.data(order);
 	}
 
-	public void saveOrderParts(List<OrderParts> orderPartsList, Long itemId, String type, Long orderId) {
+	public void saveOrderParts(List<OrderParts> orderPartsList, Long itemId, String type, Long orderId, BigDecimal orderQuantity) {
 		//保存配件明细信息
 		if (CollectionUtils.isNotEmpty(orderPartsList)) {
 			orderPartsList.forEach(parts -> {
+				parts.setGoodNumber(orderQuantity.multiply(parts.getGoodNumber()));
 				if (parts.getId() == null) {
 					parts.setType(type);
 					parts.setTenantId(SecureUtil.getTenantId());
@@ -1171,6 +1174,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				salesOrder.setOrderStatus(OrderStatusEnum.SUBMIT.getType());
 				salesOrder.setCheckDate(new Date());
 				salesOrder.setFudaPurchaseStatus(OrderStatusEnum.SUBMIT.getType());
+				salesOrder.setFudaPurchaseDate(new Date());
 			}
 			baseMapper.updateById(salesOrder);
 
@@ -1593,6 +1597,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		order.setStatus(0);
 		order.setOrderStatus(OrderStatusEnum.ENTERING.getType());
 		order.setFudaPurchaseStatus(OrderStatusEnum.PASSCANACEL.getType());
+		order.setFudaPurchaseDate(new Date());
 		baseMapper.updateById(order);
 	}
 
@@ -5066,21 +5071,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderItems.setFudaPurchaseStatus("待采购");
 				orderItemsMapper.updateById(orderItems);
 				//瓶帽配件
+				orderPartsMapper.delete(new LambdaQueryWrapper<OrderParts>().eq(OrderParts::getTenantId, AuthUtil.getTenantId()).eq(OrderParts::getPid, orderItems.getId()));
 				if (ObjectUtils.isNotNull(orderItems.getPartsCapValue())) {
 					JSONArray objects = JSONArray.parseArray(orderItems.getPartsCapValue());
 					List<OrderParts> categoryConstantInfos = objects.toJavaList(OrderParts.class);
-					saveOrderParts(categoryConstantInfos, orderItems.getId(), "3", order.getId());
+					saveOrderParts(categoryConstantInfos, orderItems.getId(), "3", order.getId(), orderItems.getOrderQuantity());
 				}
 				//阀门配件
 				if (ObjectUtils.isNotNull(orderItems.getPartsValveValue())) {
 					JSONArray objects = JSONArray.parseArray(orderItems.getPartsValveValue());
 					List<OrderParts> categoryConstantInfos = objects.toJavaList(OrderParts.class);
-					saveOrderParts(categoryConstantInfos, orderItems.getId(), "4", order.getId());
+					saveOrderParts(categoryConstantInfos, orderItems.getId(), "4", order.getId(), orderItems.getOrderQuantity());
 				}
 			}
-			//selectOrder.setFudaPurchaseStatus("待采购");
+			selectOrder.setProductionScheduling("待采购");
 			selectOrder.setOrderStatus("待采购");
-			//selectOrder.setFudaPurchaseDate(order.getFudaPurchaseDate());
+			selectOrder.setProductionSchedulingDate(new Date());
 			baseMapper.updateById(selectOrder);
 			//循环发送消息
 			Message sendMessage = new Message();
@@ -5156,16 +5162,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
-	public R generatePurchaseBill(String ids) {
-		if (ObjectUtils.isNull(ids)) {
+	public R generatePurchaseBill(List<OrderItems> itemsList) {
+		if (ObjectUtils.isNull(itemsList)) {
 			throw new RuntimeException("缺少必要参数");
 		}
 		Order order_ = new Order();
 		List<OrderItems> orderItemsListAll = new ArrayList<>();
 		List<Order> orderListAll = new ArrayList<>();
-		String[] arrs = ids.split(",");
-		for (String arr : arrs) {
-			OrderItems orderItems = orderItemsMapper.selectById(Long.parseLong(arr));
+		for (OrderItems items : itemsList) {
+			OrderItems orderItems = orderItemsMapper.selectById(items.getId());
 			if (ObjectUtils.isNotNull(orderItems)) {
 				Order order = baseMapper.selectById(orderItems.getPid());
 				if (ObjectUtils.isNotNull(order)) {
@@ -5178,6 +5183,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems_.setPid(null);
 					orderItems_.setId(null);
 					orderItems_.setBillType("CG");
+					orderItems_.setOrderQuantity(items.getOrderQuantity());
 
 					if (ObjectUtils.isNotNull(orderItems_.getCorpId())) {
 						CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderItems_.getCorpId());
@@ -5206,6 +5212,33 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						orderItems_.setAmount(orderItems_.getPrice().multiply(orderItems_.getActualQuantity()));
 					}
 
+					LambdaQueryWrapper<OrderParts> orderPartsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+					orderPartsLambdaQueryWrapper.eq(OrderParts::getIsDeleted, 0)
+						.eq(OrderParts::getTenantId, AuthUtil.getTenantId())
+						.eq(OrderParts::getPid, orderItems.getId());
+					List<OrderParts> orderPartsList = orderPartsService.list(orderPartsLambdaQueryWrapper);
+					for (OrderParts orderParts : orderPartsList) {
+						OrderItems orderItems1 = new OrderItems();
+						orderItems1.setSrcOrderNo(order.getOrderNo());
+						orderItems1.setSrcId(order.getId());
+						orderItems1.setOrgOrderNo(order.getSysNo());
+						orderItems1.setSrcItemId(orderParts.getId());
+						orderItems1.setBillType("CG");
+						orderItems1.setOrderQuantity(orderParts.getGoodNumber());
+						orderItems1.setActualQuantity(orderParts.getGoodNumber());
+						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.setAmount(orderParts.getAmout());
+						orderItems1.setPriceCategory(orderParts.getGoodTypeName());
+						orderItems1.setEname(orderParts.getEname());
+						orderItems1.setPartsCost(orderParts.getPartsCost());
+						orderItemsListAll.add(orderItems1);
+					}
 					orderItemsListAll.add(orderItems_);
 					orderListAll.add(order);
 				}
@@ -5241,6 +5274,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				order_.setSrcIds(srcIds.substring(0, srcIds.length() - 1));
 			}
 			order_.setSrcOrderNo(orderListAll.stream().map(Order::getSysNo).distinct().collect(Collectors.joining(",")));
+			//采购备注
+			order_.setOrderRemark(orderListAll.stream().map(Order::getPurchaseRemark).distinct().collect(Collectors.joining("|")));
 		} else {
 			throw new RuntimeException("生成失败，未查到单据信息");
 		}
@@ -5262,10 +5297,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		if (1 == order.getPurchaseStatusType()) {
 			detail.setProductionScheduling("排产中");
+			detail.setFudaPurchaseStatus("排产中");
 			detail.setOrderStatus("排产中");
 			detail.setProductionSchedulingDate(order.getProductionSchedulingDate());
 		} else if (2 == order.getPurchaseStatusType()) {
 			detail.setEstimateGoodGoods("预计货好");
+			detail.setFudaPurchaseStatus("预计货好");
 			detail.setOrderStatus("预计货好");
 			detail.setEstimateGoodGoodsDate(order.getEstimateGoodGoodsDate());
 		} else if (3 == order.getPurchaseStatusType()) {
@@ -5304,16 +5341,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (ObjectUtils.isNotNull(order1)) {
 					if (1 == order.getPurchaseStatusType()) {
 						order1.setProductionScheduling("排产中");
-						order1.setOrderStatus("采购完成");
+						order1.setOrderStatus("排产中");
 						order1.setProductionSchedulingDate(order.getProductionSchedulingDate());
 					} else if (2 == order.getPurchaseStatusType()) {
 						order1.setProductionScheduling("预计货好");
 						order1.setOrderStatus("预计货好");
-						order1.setEstimateGoodGoodsDate(order.getEstimateGoodGoodsDate());
+						order1.setProductionSchedulingDate(order.getEstimateGoodGoodsDate());
 					} else if (3 == order.getPurchaseStatusType()) {
 						order1.setProductionScheduling("货备齐");
 						order1.setOrderStatus("货备齐");
-						order1.setFudaPurchaseDate(order.getFudaPurchaseDate());
+						order1.setProductionSchedulingDate(new Date());
 					}
 					if (order1.getStorageQuantity().equals(order1.getPurchaseQuantity().add(purchaseQuantity))) {
 						order1.setPurchaseQuantity(order1.getPurchaseQuantity().add(purchaseQuantity));
@@ -5355,12 +5392,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						sendMessage.setMessageBody("您的销售订单" + selectOrder.getSysNo() + "已预计货好,请查看");
 						selectOrder.setProductionScheduling("预计货好");
 						selectOrder.setOrderStatus("预计货好");
-						selectOrder.setEstimateGoodGoodsDate(order.getEstimateGoodGoodsDate());
+						selectOrder.setProductionSchedulingDate(order.getEstimateGoodGoodsDate());
 					} else if (3 == order.getPurchaseStatusType()) {
 						sendMessage.setMessageBody("您的销售订单" + selectOrder.getSysNo() + "已采购完成,请查看");
 						selectOrder.setProductionScheduling("货备齐");
-						selectOrder.setOrderStatus("采购完成");
-						selectOrder.setFudaPurchaseDate(order.getFudaPurchaseDate());
+						selectOrder.setOrderStatus("货备齐");
+						selectOrder.setProductionSchedulingDate(new Date());
 						deliveryClient.updateBySrcId(selectOrder.getId(), "FH", selectOrder.getTradeType());
 					}
 					R save = messageClient.save(sendMessage);

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

@@ -199,7 +199,6 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 					for (String arr : arrs) {
 						Order selectOrder = orderService.selectById(Long.parseLong(arr));
 						if (ObjectUtils.isNotNull(selectOrder)) {
-							selectOrder.setFudaPurchaseDate(new Date());
 							selectOrder.setUpdateTime(new Date());
 							selectOrder.setUpdateUser(AuthUtil.getUserId());
 							selectOrder.setUpdateUserName(AuthUtil.getUserName());