1、修改销售出库保存外协供应商

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

@@ -12,7 +12,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         inv_id, cost_price, cost_amt, flg_valid, cp_id, op_create_time, op_create_user_id,
         op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,
         s_out_id,s_out_item_id,s_order_id,s_order_item_id,outing_box,outing_piece,out_box,out_piece,
-        unit_id,sub_unit_id, pack_box,sku_name,sku_model
+        unit_id,sub_unit_id, pack_box,sku_name,sku_model,sup_id
     </sql>
 
     <sql id="Base_Column_List_Response">
@@ -22,7 +22,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         tpoi.cost_price, tpoi.cost_amt, tpoi.flg_valid, tpoi.cp_id,
         tpoi.s_out_id,tpoi.s_out_item_id,tpoi.s_order_id,tpoi.s_order_item_id,
         tpoi.outing_box,tpoi.outing_piece,tpoi.out_box,tpoi.out_piece,
-        tpoi.unit_id,tpoi.sub_unit_id,tpoi.pack_box,sku_name,sku_model
+        tpoi.unit_id,tpoi.sub_unit_id,tpoi.pack_box,sku_name,sku_model,sup_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -70,6 +70,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         <result column="sku_name" property="skuName"/>
         <result column="sku_model" property="skuModel"/>
         <result column="decimalPlaces" property="decimalPlaces"/>
+        <result column="sup_id" property="supId"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -133,6 +134,8 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         <result column="unitName" property="unitName"/>
         <result column="use_place" property="usePlace"/>
         <result column="decimalPlaces" property="decimalPlaces"/>
+        <result column="sup_id" property="supId"/>
+        <result column="sup_name" property="supName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -252,9 +255,12 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         tmgb.brand_name  as "brandName",
         tmgb.short_name  as "shortName",
         tmgs.sku_spec  as "skuSpec",
-        sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) as "outStatusName"
-        ,ul.decimal_places    as "decimalPlaces"
+        sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) as "outStatusName",
+        ul.decimal_places    as "decimalPlaces",
+        tpoi.sup_id,
+        tms.sup_name
         FROM dkic_b.t_psi_outbound_item as tpoi
+        LEFT JOIN dkic_b.t_mst_supplier as tms ON tpoi.sup_id = tms.sup_id
         LEFT JOIN dkic_b.t_mst_unit AS ul ON tpoi.unit_id = ul.unit_id
         LEFT JOIN dkic_b.t_mst_unit AS u2 ON tpoi.sub_unit_id = u2.unit_id
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpoi.sku_id
@@ -417,9 +423,12 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                sys.f_remove_zero(tpi.inv_qty)                                                               as "invQty",
                sys.f_remove_zero(tpi.usable_qty)                                                            as "usableQty",
                tmw.wh_name                                                               as "whName",
-               t.use_place
-                ,tmgu.decimal_places    as "decimalPlaces"
+               t.use_place,
+              tmgu.decimal_places    as "decimalPlaces",
+               t.sup_id,
+               tms.sup_name
         FROM dkic_b.t_psi_outbound_item as t
+                 left join dkic_b.t_mst_supplier as tms on t.sup_id = tms.sup_id
                  left join dkic_b.t_psi_order_item as tpoi on tpoi.item_id = t.from_item_id
                  left join dkic_b.t_psi_order as tpo on tpo.order_id = t.from_id
                  left join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -360,6 +360,11 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(exist = false)
     private Integer decimalPlaces;
 
+    @Excel(name = "外协供应商")
+    @ApiModelProperty(value = "外协供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/query/ivt/OutboundItemQuery.java

@@ -232,6 +232,11 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
     @ApiModelProperty(value = "包装")
     private Integer packBox;
 
+    @Excel(name = "外协供应商")
+    @ApiModelProperty(value = "外协供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -385,6 +385,15 @@ public class OutboundItemResponse {
     @TableField(exist = false)
     private Integer decimalPlaces;
 
+    @Excel(name = "外协供应商")
+    @ApiModelProperty(value = "外协供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
+    @Excel(name = "外协供应商")
+    @ApiModelProperty(value = "外协供应商")
+    private String supName;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -321,9 +321,11 @@ public class InventoryService extends BaseService<Inventory> {
         //出库
         if (map.get("outDetail") != null) {
             outDetail = (JSONArray) JSON.toJSON(map.get("outDetail"));
-            JSONObject obj = (JSONObject) outDetail.get(0);
-            inventoryDocCode = obj.get("inventoryDocCode").toString();
-            addOrEditFlag = obj.getBoolean("addOrEditFlag");
+            if(outDetail.size() > 0){
+                JSONObject obj = (JSONObject) outDetail.get(0);
+                inventoryDocCode = obj.get("inventoryDocCode").toString();
+                addOrEditFlag = obj.getBoolean("addOrEditFlag");
+            }
         }
         //出库删除
         if (map.get("delOutDetail") != null) {

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -1304,7 +1304,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //删除外协品生产外协入库单
                 this.deleteOutsideGoodsInto(outboundVO, invsideDelList);
                 // 获取删除商品数据
-                List<OutboundItemVO> invDelList = outboundVO.getDeleteItemList().stream().filter(it -> it.getSkuId() == null).collect(Collectors.toList());
+                List<OutboundItemVO> invDelList = outboundVO.getDeleteItemList().stream().filter(it -> it.getSkuId() != null).collect(Collectors.toList());
                 // 赋值删除明细
                 map.put("delOutDetail", invDelList);
             }