订单加字段

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

@@ -662,5 +662,10 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "生成工厂中文名")
 	@TableField(exist = false)
 	private List<Map<String,Object>> productionPlantList;
+	/**
+	 * FOB系数
+	 */
+	@ApiModelProperty(value = "FOB系数")
+	private BigDecimal coefficient;
 
 }

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

@@ -87,9 +87,11 @@ 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.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());
+		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getDateValidityStart()),PriceBank::getStartTime,priceBank.getDateValidityStart());
+		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getDateValidityEnd()),PriceBank::getEndTime,priceBank.getDateValidityEnd());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
 	/*	if (CollectionUtils.isNotEmpty(pages.getRecords())){

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

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