需求

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsDesc.java

@@ -186,6 +186,11 @@ public class CorpsDesc implements Serializable {
 	@ApiModelProperty(value = "职位")
 	private String positoin;
 	/**
+	 * FOB系数
+	 */
+	@ApiModelProperty(value = "FOB系数")
+	private BigDecimal coefficient;
+	/**
 	 * 备注
 	 */
 	@ApiModelProperty(value = "备注")

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -33,6 +33,7 @@
         <result column="credit_day" property="creditDay"/>
         <result column="credit_rate" property="creditRate"/>
         <result column="positoin" property="positoin"/>
+        <result column="coefficient" property="coefficient"/>
         <result column="remarks" property="remarks"/>
         <result column="version" property="version"/>
         <result column="tenant_id" property="tenantId"/>

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

@@ -103,7 +103,6 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 						deliveryItems.setCode(goodsMessage.getData().getCode());
 						deliveryItems.setCname(goodsMessage.getData().getCname());
 						deliveryItems.setTypeno(goodsMessage.getData().getTypeno());
-						deliveryItems.setSpecificationAndModel(goodsMessage.getData().getSpecificationAndModel());
 					}
 				}
 			}

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

@@ -78,7 +78,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 	 */
 	public List<OrderItems> saveOrderItemsMessage(List<OrderItems> list, Date date,Long Pid){
 			list.stream().forEach(item ->{
-				if (item.getAmount() == null || item.getAmount() == BigDecimal.ZERO){
+				if (item.getAmount() == null || item.getAmount().compareTo(BigDecimal.ZERO)==0){
 					throw new RuntimeException("金额不能为空或0");
 				}
 				if (item.getId() == null){

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -80,6 +80,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 		LambdaQueryWrapper<StockGoods> lambdaQueryWrapper = new LambdaQueryWrapper();
 		lambdaQueryWrapper.eq(Func.isNotEmpty(corpId),StockGoods::getCorpId,corpId);//客户id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(storageId),StockGoods::getStorageId,storageId);//仓库id
+		lambdaQueryWrapper.isNull(Func.isNull(storageId),null);//仓库id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(goodId),StockGoods::getGoodsId,goodId);//商品id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(itemType),StockGoods::getItemType,itemType);//产品型号
 		lambdaQueryWrapper.isNull(Func.isEmpty(itemType),StockGoods::getItemType);//产品型号