国内加生成工厂

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

@@ -645,5 +645,22 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "发货数量")
 	@TableField(exist = false)
 	private BigDecimal actualQuantity;
+	/**
+	 * 生成工厂
+	 */
+	@ApiModelProperty(value = "生成工厂")
+	private Long productionPlant;
+	/**
+	 * 生成工厂中文名
+	 */
+	@ApiModelProperty(value = "生成工厂中文名")
+	@TableField(exist = false)
+	private String productionPlantName;
+	/**
+	 * 生成工厂中文名
+	 */
+	@ApiModelProperty(value = "生成工厂中文名")
+	@TableField(exist = false)
+	private List<Map<String,Object>> productionPlantList;
 
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -174,7 +174,8 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getCname()),PriceBank::getCname,priceBank.getCname());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getCorpId()),PriceBank::getCorpId,priceBank.getCorpId());
 		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getSpecs()),PriceBank::getSpecs,priceBank.getSpecs());
-		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getStatusTime()),PriceBank::getStartTime,priceBank.getStatusTime());
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getGoodsTypeName()),PriceBank::getGoodsTypeName,priceBank.getGoodsTypeName());
+		//lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getStatusTime()),PriceBank::getStartTime,priceBank.getStatusTime());
 		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getStatusTime()),PriceBank::getEndTime,priceBank.getStatusTime());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
 		List<PriceBank> list = priceBankService.list(lambdaQueryWrapper);

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

@@ -148,6 +148,12 @@ public class OrderController extends BladeController {
 						item.setBelongToCorpName(corpMessage.getData().getCname());
 					}
 				}
+				if (item.getProductionPlant() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getProductionPlant());//销售公司
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setProductionPlantName(corpMessage.getData().getCname());
+					}
+				}
 				R<User> user = userClient.userInfoById(item.getCreateUser());//制单人
 				if (user.isSuccess() && user.getData() != null){
 					item.setCreateUserName(user.getData().getName());

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -97,6 +97,7 @@
         <result column="if_shipping" property="ifShipping"/>
         <result column="purchase_pricing_remarks" property="purchasePricingRemarks"/>
         <result column="sell_pricing_remarks" property="sellPricingRemarks"/>
+        <result column="production_plant" property="productionPlant"/>
     </resultMap>
 
 

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

@@ -200,6 +200,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderMessage.setBelongToCorpList(corpMessage.getData());
 			}
 		}
+		if (orderMessage.getProductionPlant() != null){
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(orderMessage.getProductionPlant().toString());
+			if (corpMessage.isSuccess() && corpMessage.getData() != null){
+				orderMessage.setProductionPlantList(corpMessage.getData());
+			}
+		}
 		//获取订单明细信息
 		List<OrderItems> orderItemsList = orderItemsService.getOrderItems(orderMessage);
 		orderMessage.setOrderItemsList(orderItemsList);