Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -899,7 +899,7 @@
         SELECT
         series_id AS "seriesId",
         series_code AS "seriesCode",
-        series_name AS "serieName",
+        series_name AS "seriesName",
         flg_valid AS "flgValid"
         FROM dkic_b.t_mst_goods_series
         <where>

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

@@ -227,8 +227,8 @@
         ,tpii.wh_id as "whId"
         ,tmw.wh_name as "whName"
         ,tmgs.sku_code  as "skuCode"
-        ,tmgs.sku_model as "skuModel"
-        ,tmgs.sku_name  as "skuName"
+        ,tpii.sku_model as "skuModel"
+        ,tpii.sku_name  as "skuName"
         ,tmgs.sku_spec  as "skuSpec"
         ,tmgs.price_purchase
         ,tmgs.sku_images

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

@@ -815,6 +815,7 @@
         <include refid="Select_Inbound_Join_Table_Into"/>
         <where>
             AND tpi.cp_id = #{cpId}
+            AND tpi.into_type != '入库类型-外协入库'
             <if test="intoTypes != null and intoTypes.size()>0">
                 AND tpi.into_type =any(#{intoTypes,typeHandler=StringListTypeHandler})
             </if>

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

@@ -188,6 +188,8 @@
 
         <result column="sku_code" property="skuCode"/>
         <result column="sku_model" property="skuModel"/>
+        <result column="sku_spec" property="skuSpec"/>
+        <result column="pack_box_text" property="packBoxText"/>
         <result column="sku_name" property="skuName"/>
         <result column="brand_name" property="brandName"/>
         <result column="price_purchase" property="pricePurchase"/>
@@ -1074,8 +1076,8 @@
                  left join dkic_b.t_mst_dictionary_data tmdd on tmdd.data_id = tmc.cus_from
                  left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.out_status
                  left join dkic_b.t_mst_dictionary_data tmd on tmd.data_id = t.out_reason
-                 Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
                 left join  dkic_b.t_psi_outbound_item  tpoi  on tpoi.out_id = t.out_id
+                Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = tpoi.sup_id
                 left join dkic_b.t_psi_inventory tpi on tpi.inv_id = tpoi.inv_id
                 left join dkic_b.t_mst_unit as tmgu on tpoi.unit_id = tmgu.unit_id
                 left join dkic_b.t_mst_unit as tmgus on tpoi.sub_unit_id = tmgus.unit_id
@@ -1120,9 +1122,10 @@
                     tpoi.s_order_id  AS "list_s_order_id",
                     tpoi.s_order_item_id  AS "list_s_order_item_id",
                         tmgs.sku_code AS list_sku_code,
-        tmgs.sku_model AS list_sku_model,
-        tmgs.sku_name AS list_sku_name,
-        tmgb.brand_name AS list_brand_name,
+        tpoi.sku_model AS list_sku_model,
+        tpoi.sku_name AS list_sku_name,
+        tmgs.sku_spec AS list_sku_spec,
+        case when tpoi.sku_id is null then tmp.sup_name || '(外协)' else  tmgb.brand_name end AS list_brand_name,
         tmgb.short_name AS list_short_name,
         tmgs.price_purchase AS list_price_purchase,
         tmgs.price_standard AS list_price_standard,
@@ -1139,7 +1142,9 @@
                 ,tpoi.outing_piece  as "list_outing_piece"
                 ,tpoi.out_box  as "list_out_box"
                 ,tpoi.out_piece  as "list_out_piece"
-,tmgu.decimal_places as "list_decimal_places"
+                ,case when t.out_status = '出库状态-已出库' then dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.out_box,tpoi.out_piece)
+                    else dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.outing_box,tpoi.outing_piece) end as "list_pack_box_text"
+                ,tmgu.decimal_places as "list_decimal_places"
     </sql>
 
     <select id="countByCondDetail" resultType="Long">

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

@@ -100,6 +100,21 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    /**
+     * 商品名称--skuid空的时候要取当前的名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
+
+    /**
+     * 商品型号--skuid空的时候要取当前的商品型号
+     */
+    @Excel(name = "商品型号")
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
+
 
     /**
      * 入库价

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

@@ -78,6 +78,21 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery>  {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    /**
+     * 商品名称--skuid空的时候要取当前的名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
+
+    /**
+     * 商品型号--skuid空的时候要取当前的商品型号
+     */
+    @Excel(name = "商品型号")
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
+
 
     /**
      * 入库价
@@ -280,10 +295,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery>  {
     @TableField(typeHandler = TimestampTypeHandler.class,exist = false)
     private LocalDate  intoDateEnd;
 
-    @Excel(name = "商品名称")
-    @ApiModelProperty(value = "商品名称")
-    private String skuName;
-
     @ApiModelProperty(value = "入库单号")
     private String intoNo;
 

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

@@ -114,6 +114,21 @@ public class InboundItemResponse  {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
+    /**
+     * 商品名称--skuid空的时候要取当前的名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
+
+    /**
+     * 商品型号--skuid空的时候要取当前的商品型号
+     */
+    @Excel(name = "商品型号")
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
+
 
     /**
      * 入库价
@@ -326,20 +341,6 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "商品编号")
     private String skuCode;
 
-    /**
-     * 商品名称
-     */
-    @Excel(name = "商品名称")
-    @ApiModelProperty(value = "商品名称")
-    private String skuName;
-
-    /**
-     * 商品型号
-     */
-    @Excel(name = "商品型号")
-    @ApiModelProperty(value = "商品型号")
-    private String skuModel;
-
 
     /**
      * 商品型号

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

@@ -241,6 +241,9 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     inboundItemVO.setWhId(outboundItemVO.getWhId());
                     //企业ID
                     inboundItemVO.setCpId(outboundItemVO.getCpId());
+                    // 商品
+                    inboundItemVO.setSkuModel(outboundItemVO.getSkuModel());
+                    inboundItemVO.setSkuName(outboundItemVO.getSkuName());
                     //实体转换
                     InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
                     inboundItemMapper.insert(inboundItem);
@@ -387,7 +390,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         .setOutQty(BigDecimal.ZERO)
                         .setOutAmt(BigDecimal.ZERO);
             }
-            //入库状态
+            //出库状态
             outboundItemVO.setOutStatus(outboundVO.getOutStatus());
             //实体转换
             OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
@@ -417,7 +420,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     orderItem.setOutQty(BigDecimal.ZERO);
                     orderItem.setOutAmt(BigDecimal.ZERO);
                 }
-                //入库状态
+                //出库状态
                 String outStatus = this.setOutStatus(orderItemResponse.getOutingQty().add(orderItem.getOutingQty()),
                         orderItemResponse.getOutQty().add(orderItem.getOutQty()), orderItemResponse.getItemQty());
                 orderItem.setOutStatus(outStatus);