Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -272,6 +272,11 @@ public class DeliveryItems implements Serializable {
 
 		@ApiModelProperty(value = "箱号")
 		private String cntrNo;
+	/**
+	 * 产品属性
+	 */
+		@ApiModelProperty(value = "产品属性")
+		private String itemProp;
 
 
 }

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

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

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -42,6 +42,7 @@
         <result column="purchase_amount" property="purchaseAmount"/>
         <result column="purchase_quantity" property="purchaseQuantity"/>
         <result column="unit" property="unit"/>
+        <result column="item_prop" property="itemProp"/>
     </resultMap>
 
 

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

@@ -71,6 +71,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	 */
 	public List<DeliveryItems> saveDeliveryItemsList(Long pId,List<DeliveryItems> deliveryItemsList){
 			for (DeliveryItems deliveryItems : deliveryItemsList) {
+				if (deliveryItems.getItemId() == null){
+					throw new RuntimeException("发货明细中商品id不能为空");
+				}
 				deliveryItems.setPid(pId);//父级ID
 				deliveryItems.setTenantId(SecureUtil.getTenantId());//租户id
 				if (deliveryItems.getId() == null){
@@ -119,6 +122,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	 */
 	public List<DeliveryItems> affirmDeliveryItemsList(Long pId,Delivery delivery,List<DeliveryItems> deliveryItemsList){
 		for (DeliveryItems deliveryItems : deliveryItemsList) {
+			if (deliveryItems.getItemId() == null){
+				throw new RuntimeException("发货明细中商品id不能为空");
+			}
 			deliveryItems.setPid(pId);//父级ID
 			deliveryItems.setTenantId(SecureUtil.getTenantId());//租户id
 			if (deliveryItems.getId() == null){

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>
 
 

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

@@ -119,6 +119,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					order.setOrgOrderNo((String) clientBillNo.getData());
 				}
 			}
+			//主订单号为空已订单号一致国内贸易
+			if (StringUtils.isBlank(order.getMorderNo()) && order.getTradeType().equals(OrderTypeEnum.DOMESTIC.getType())){
+				order.setMorderNo(order.getOrderNo());
+			}
 			order.setTenantId(SecureUtil.getTenantId());
 			order.setCreateTime(date);
 			order.setCreateUser(SecureUtil.getUserId());