供应商

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -1313,7 +1313,7 @@
         else dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpii.intoing_box,tpii.intoing_piece) end as "list_pack_box_text"
 
         FROM dkic_b.t_psi_inbound  tpi
-        left  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id and  ( tpii.into_qty - tpii.return_qty) > 0
+        left  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
         left  join  dkic_b.t_mst_warehouse tmw on  tmw.wh_id =   tpii.wh_id
         inner join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
         left join  dkic_b.t_mst_goods_brand  tmgb on tmgb.brand_id = tmgs.brand_id

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -105,6 +105,47 @@
     </resultMap>
 
     <!-- 通用查询映射结果 -->
+    <resultMap id="purchaseItemListMap" type="java.util.Map">
+        <id column="item_id" property="itemId"/>
+        <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
+        <result column="pur_no" property="purNo"/>
+        <result column="item_index" property="itemIndex"/>
+        <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+        <result column="item_qty" property="itemQty"/>
+        <result column="price_std" property="priceStd"/>
+        <result column="amt_std" property="amtStd"/>
+        <result column="price_pur" property="pricePur"/>
+        <result column="item_amt" property="itemAmt"/>
+        <result column="price_discount" property="priceDiscount"/>
+        <result column="non_std_code" property="nonStdCode"/>
+        <result column="into_status" property="intoStatus"/>
+        <result column="intoing_qty" property="intoingQty"/>
+        <result column="intoing_amt" property="intoingAmt"/>
+        <result column="into_qty" property="intoQty"/>
+        <result column="into_amt" property="intoAmt"/>
+        <result column="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="remarks" property="remarks"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="sku_code" property="skuCode"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="price_standard" property="priceStandard"/>
+        <result column="sku_model" property="skuModel"/>
+        <result column="short_name" property="shortName"/>
+        <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
+        <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
+        <result column="op_app_code" property="opAppCode"/>
+        <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
+        <result column="op_db_user" property="opDbUser"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="sku_images" property="skuImages"/>
+
+
+    </resultMap>
+    <!--    关联映射-->
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.pur.PurchaseResponse">
         <id column="pur_id" property="purId"/>
         <result column="pur_no" property="purNo"/>
@@ -159,48 +200,13 @@
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="inbound_processing_flag" property="inboundProcessingFlag"/>
         <result column="category_count" property="categoryCount"/>
-        <collection property="purchaseItemResponseList" resultMap="purchaseItemListMap" columnPrefix="list_"/>
-    </resultMap>
-    <!--    关联映射-->
-    <resultMap id="purchaseItemListMap" type="java.util.Map">
-        <id column="item_id" property="itemId"/>
-        <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
-        <result column="pur_no" property="purNo"/>
-        <result column="item_index" property="itemIndex"/>
-        <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
-        <result column="item_qty" property="itemQty"/>
-        <result column="price_std" property="priceStd"/>
-        <result column="amt_std" property="amtStd"/>
-        <result column="price_pur" property="pricePur"/>
-        <result column="item_amt" property="itemAmt"/>
-        <result column="price_discount" property="priceDiscount"/>
-        <result column="non_std_code" property="nonStdCode"/>
-        <result column="into_status" property="intoStatus"/>
-        <result column="intoing_qty" property="intoingQty"/>
-        <result column="intoing_amt" property="intoingAmt"/>
-        <result column="into_qty" property="intoQty"/>
-        <result column="into_amt" property="intoAmt"/>
-        <result column="return_qty" property="returnQty"/>
-        <result column="return_amt" property="returnAmt"/>
-        <result column="remarks" property="remarks"/>
-        <result column="flg_valid" property="flgValid"/>
-        <result column="cp_id" property="cpId"/>
-        <result column="sku_code" property="skuCode"/>
-        <result column="sku_name" property="skuName"/>
-        <result column="price_standard" property="priceStandard"/>
-        <result column="sku_model" property="skuModel"/>
-        <result column="short_name" property="shortName"/>
-        <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
-        <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
-        <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-        <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-        <result column="op_app_code" property="opAppCode"/>
-        <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-        <result column="op_db_user" property="opDbUser"/>
-        <result column="brand_name" property="brandName"/>
-        <result column="sku_images" property="skuImages"/>
-
+        <result column="sup_code" property="supCode"/>
+        <result column="sup_type" property="supType"/>
+        <result column="contact_phone" property="contactPhone" />
+        <result column="contact_name" property="contactName" />
+        <result column="service_categories" property="serviceCategories" typeHandler="StringListTypeHandler"/>
 
+        <collection property="purchaseItemResponseList" resultMap="purchaseItemListMap" columnPrefix="list_"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -492,6 +498,11 @@
         ,tms.staff_name as "staffName"
         ,tms1.staff_name as "makeStaffName"
         ,tmp.sup_name as "supplierName"
+        ,tmp.sup_code
+        ,tmp.sup_type
+        ,tmp.contact_name as "contactName"
+        ,tmp.contact_phone as "contactPhone"
+        ,tmp.service_categories as "serviceCategories"
         ,tmp.return_address as "returnAddress"
         ,tmw.wh_name as "whName"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"

src/main/java/com/dk/mdm/model/response/pur/PurchaseResponse.java

@@ -450,6 +450,29 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     private Boolean inboundProcessingFlag;
 
     private BigDecimal categoryCount;
+
+    /**
+     * 供应商编号
+     */
+    @Excel(name = "供应商编号")
+    @ApiModelProperty(value = "供应商编号")
+    private String supCode;
+
+    /**
+     * 供应商类别 (【系统字典】)
+     */
+    @Excel(name = "供应商类别 (【系统字典】)")
+    @ApiModelProperty(value = "供应商类别 (【系统字典】)")
+    private String supType;
+
+    /**
+     * 服务类别 (【系统字典】)
+     */
+    @Excel(name = "服务类别 (【系统字典】)")
+    @ApiModelProperty(value = "服务类别 (【系统字典】)")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> serviceCategories;
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/service/ivt/inbound/InboundCheckService.java

@@ -181,8 +181,15 @@ public class InboundCheckService extends BaseService<Inbound> {
                     .setIntoQty(inboundItemVO.getIntoingQty())
                     .setIntoAmt(inboundItemVO.getIntoingAmt())
                     .setIntoingQty(BigDecimal.ZERO)
-                    .setIntoingAmt(BigDecimal.ZERO)
-            ;
+                    .setIntoingAmt(BigDecimal.ZERO);
+
+            if(inboundVO.getIntoStatus() == Constant.IntoStatus.YIRUKU.getName()){//已入库状态
+                inboundItemVO
+                        .setIntoBox(inboundItemVO.getIntoingBox())
+                        .setIntoPiece(inboundItemVO.getIntoingPiece())
+                        .setIntoingBox(0)
+                        .setIntoingPiece(BigDecimal.ZERO);
+            }
 
             //入库状态
             inboundItemVO.setIntoStatus(inboundVO.getIntoStatus());