发货获取供应商修改

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

@@ -286,6 +286,11 @@ public class CorpsDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "分管员")
 	private String adminProfiles;
+	/**
+	 * 包装要求
+	 */
+	@ApiModelProperty(value = "包装要求")
+	private String packageRemarks;
 
 
 }

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

@@ -292,6 +292,16 @@ public class DeliveryItems implements Serializable {
 	 */
 		@ApiModelProperty(value = "单据状态字典表")
 		private String deliveryStatus;
+	/**
+	 * 供应商
+	 */
+		@ApiModelProperty(value = "供应商")
+		private Long corpId;
+	/**
+	 * 供应商名称
+	 */
+		@ApiModelProperty(value = "供应商名称")
+		private String corpName;
 
 
 }

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

@@ -173,6 +173,15 @@ public class SalesPolicyItem implements Serializable {
 	 */
 	@ApiModelProperty(value = "花纹")
 	private String brandItem;
-
+	/**
+	 * 供应商
+	 */
+	@ApiModelProperty(value = "供应商")
+	private Long corpId;
+	/**
+	 * 供应商名称
+	 */
+	@ApiModelProperty(value = "供应商名称")
+	private String corpName;
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/OrderItemsVO.java

@@ -16,12 +16,15 @@
  */
 package org.springblade.purchase.sales.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.springblade.purchase.sales.entity.OrderItems;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
+import java.util.Date;
+
 /**
  * 订单明细表视图实体类
  *
@@ -40,11 +43,6 @@ public class OrderItemsVO extends OrderItems {
 	@ApiModelProperty(value = "订单号或合同号")
 	private String orderNo;
 	/**
-	 * 客户或供应商id(全称)
-	 */
-	@ApiModelProperty(value = "客户或供应商id(全称)")
-	private Long corpId;
-	/**
 	 * 订单日期开始
 	 */
 	private String orderStartDate;
@@ -62,5 +60,16 @@ public class OrderItemsVO extends OrderItems {
 	 */
 	@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
 	private String billType;
+	/**
+	 * 客户名
+	 */
+	@ApiModelProperty(value = "客户名")
+	private String corp;
+	/**
+	 * 订单日期
+	 */
+	@ApiModelProperty(value = "订单日期")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date businesDate;
 
 }

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

@@ -47,6 +47,7 @@
         <result column="payment_type" property="paymentType"/>
         <result column="corp_type" property="corpType"/>
         <result column="admin_profiles" property="adminProfiles"/>
+        <result column="package_remarks" property="packageRemarks"/>
     </resultMap>
 
 

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

@@ -44,6 +44,8 @@
         <result column="unit" property="unit"/>
         <result column="item_prop" property="itemProp"/>
         <result column="delivery_status" property="deliveryStatus"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="corp_name" property="corpName"/>
     </resultMap>
 
 

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

@@ -149,7 +149,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				baseMapper.updateById(deliveryItems);
 			}
 			StockGoods stockGoods=null;
-			StockGoodsVO stock = this.getStock(delivery.getTradeType(), delivery.getCorpId(), delivery.getStorageId(), deliveryItems);
+			StockGoodsVO stock = this.getStock(delivery.getTradeType(), deliveryItems.getCorpId(), delivery.getStorageId(), deliveryItems);
 			if (stock != null && delivery.getDeliveryType() == DeliveryEnum.DELIVER.getType()){//发货
 				//更新库存账
 				stockGoods = this.deliverGoods(delivery.getTradeType(), stock.getId(), deliveryItems);

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/SalesPolicyItemMapper.xml

@@ -24,6 +24,8 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="corp_name" property="corpName"/>
     </resultMap>
 
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/SalesPolicyMapper.xml

@@ -89,6 +89,9 @@
         <if test="salesPolicy.newTime!=null and salesPolicy.newTime!=''">
             and dept.end_time &gt;= #{salesPolicy.newTime}
         </if>
+        <if test="salesPolicy.corps!=null and salesPolicy.corps!=''">
+            and dept.corps like CONCAT(CONCAT('%', #{salesPolicy.corps}), '%')
+        </if>
     </select>
 
 </mapper>

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

@@ -71,18 +71,19 @@
     <select id="selectOrderItemsPage" resultMap="orderItemsResultMap">
         select * from business_order_items where is_deleted = 0
     </select>
-    <select id="orderItemsList" resultMap="orderItemsResultMap">
-        SELECT
-        DISTINCT
-	    item.*,
-        bg.code AS code,
+    <select id="orderItemsList" resultType="org.springblade.purchase.sales.vo.OrderItemsVO">
+        SELECT DISTINCT
+        item.*,
+        bg.CODE AS CODE,
         bg.cname AS cname,
-        bg.Typeno AS typeno
+        bg.Typeno AS typeno,
+        bc.cname AS corp,
+        od.busines_date AS businesDate
         FROM
-	        business_order_items item
-	    LEFT JOIN business_order od
-	    ON item.pid = od.id
+        business_order_items item
+        LEFT JOIN business_order od ON item.pid = od.id
         LEFT JOIN basic_goods_desc bg ON item.item_id = bg.id
+        LEFT JOIN basic_corps_desc bc ON od.corp_id = bc.id
         WHERE
 	        item.is_deleted = 0
 	        and od.is_deleted = 0