商品档案

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

@@ -429,6 +429,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
               tmgu.decimal_places    as "decimalPlaces",
                t.sup_id,
                tms.sup_name
+               ,t.out_status
         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

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -85,6 +85,8 @@
         <result column="priceInto" property="priceInto"/>
         <result column="intoQty" property="intoQty"/>
         <result column="decimalPlaces" property="decimalPlaces"/>
+        <result column="intoing_box" property="box" />
+        <result column="intoing_piece" property="piece" />
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -219,11 +221,15 @@
         tpiid.wh_name,
         tpiid.non_std_code,
         tpiid.inv_qty as "intoQty",
-        tpiid.cost_price  as "priceInto"
+        tpiid.cost_price  as "priceInto",
+        tpiid.intoing_box,
+        tpiid.intoing_piece
         FROM dkic_b.t_mst_goods_sku  tmgs
         LEFT JOIN (
         SELECT
         tpii.sku_id,
+        tpii.intoing_box,
+        tpii.intoing_piece,
         tmwitem.wh_id,
         tmwitem.wh_name,
         tpivt.non_std_code,

src/main/java/com/dk/mdm/model/response/mst/GoodsSkuResponse.java

@@ -375,7 +375,13 @@ public class GoodsSkuResponse implements Serializable {
     @ApiModelProperty(value = "小数位数 ([0-6]能改大，不能改小)")
     @TableField(exist = false)
     private Integer decimalPlaces;
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
 
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  BigDecimal piece;
     /*
      * 关联属性 + 查询条件
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/vo/mst/GoodsSkuVO.java

@@ -38,6 +38,13 @@ public class GoodsSkuVO implements Serializable {
     /*
      * 数据库字段
      */
+    @Excel(name = "箱")
+    @ApiModelProperty(value = "箱")
+    private  Integer box;
+
+    @Excel(name = "片")
+    @ApiModelProperty(value = "片")
+    private  BigDecimal piece;
     /**
      * 组织ID
      */

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

@@ -146,6 +146,7 @@ public class InboundCheckService extends BaseService<Inbound> {
                     .setCostAmt(inboundItemVO.getIntoQty()
                             .multiply(inboundItemVO.getPriceInto()).setScale(2, BigDecimal.ROUND_HALF_UP))
             ;
+
             //入库状态
             inboundItemVO.setIntoStatus(inboundVO.getIntoStatus());
             //实体转换

src/main/java/com/dk/mdm/service/mst/GoodsSkuService.java

@@ -127,6 +127,8 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 			inboundItemVO.setSkuId(goodsSku.getSkuId());
 			inboundItemVO.setWhId(goodsSkuVO.getWhId());
 			inboundItemVO.setNonStdCode(goodsSkuVO.getNonStdCode());
+			inboundItemVO.setIntoingBox(goodsSkuVO.getBox());
+			inboundItemVO.setIntoingPiece(goodsSkuVO.getPiece());
 			inboundItemVOList.add(inboundItemVO);
 
 			Map<String, Object> map = new HashMap<>();