修改bug

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

@@ -182,8 +182,8 @@
         ,sku.sku_images
         FROM dkic_b.t_psi_check_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
-        LEFT JOIN dkic_b.t_mst_unit AS ul ON sku.unit_id = ul.unit_id
-        LEFT JOIN dkic_b.t_mst_unit AS u2 ON sku.sub_unit_id = u2.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS ul ON item.unit_id = ul.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS u2 ON item.sub_unit_id = u2.unit_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id
         LEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=inv.wh_id
         LEFT JOIN dkic_b.t_mst_goods_brand AS brand ON brand.brand_id=sku.brand_id

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

@@ -118,8 +118,8 @@
         ,sku.pack_box
         FROM dkic_b.t_psi_freeze_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
-        LEFT JOIN dkic_b.t_mst_unit AS ul ON sku.unit_id = ul.unit_id
-        LEFT JOIN dkic_b.t_mst_unit AS u2 ON sku.sub_unit_id = u2.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS ul ON item.unit_id = ul.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS u2 ON item.sub_unit_id = u2.unit_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id
         LEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=inv.wh_id
         LEFT JOIN dkic_b.t_mst_goods_brand AS brand ON brand.brand_id=sku.brand_id

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

@@ -15,7 +15,7 @@
     </sql>
 
     <sql id="Base_Column_List_Response">
-        tpoi.item_idY, tpoi.out_id, tpoi.out_type, tpoi.from_id, tpoi.from_item_id, tpoi.item_index,
+        tpoi.item_id, tpoi.out_id, tpoi.out_type, tpoi.from_id, tpoi.from_item_id, tpoi.item_index,
         tpoi.sku_id, tpoi.price_out, tpoi.non_std_code, tpoi.out_status, tpoi.outing_qty, tpoi.outing_amt,
         tpoi.out_qty, tpoi.out_amt, tpoi.return_qty, tpoi.return_amt, tpoi.remarks, tpoi.inv_id,
         tpoi.cost_price, tpoi.cost_amt, tpoi.flg_valid, tpoi.cp_id,
@@ -217,8 +217,14 @@
         tpoi.non_std_code,
         tpoi.out_status,
         tpoi.outing_qty,
+        tpoi.outing_box,
+        tpoi.outing_piece,
+        dkic_b.f_box_piece(u2.unit_name,ul.unit_name,tpoi.outing_box,tpoi.outing_piece) AS "outingBoxPiece",
         tpoi.outing_amt,
         tpoi.out_qty,
+        tpoi.out_box,
+        tpoi.out_piece,
+        dkic_b.f_box_piece(u2.unit_name,ul.unit_name,tpoi.out_box,tpoi.out_piece) AS "outBoxPiece",
         tpoi.out_amt,
         tpoi.return_qty,
         tpoi.return_amt,
@@ -237,6 +243,8 @@
         tmgs.sku_spec  as "skuSpec",
         sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) as "outStatusName"
         FROM dkic_b.t_psi_outbound_item as tpoi
+        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
         left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
         left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
@@ -406,8 +414,10 @@
                tmgs.sku_code            as "skuCode",
                tmgs.sku_model           as "skuModel",
                tmgs.sku_name            as "skuName",
+               t.pack_box,
                t.price_out,
                t.outing_qty + t.out_qty as outing_qty,
+
                t.outing_amt + t.out_amt as outing_amt,
                t.out_qty,
                t.out_amt,

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

@@ -164,8 +164,8 @@
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_transfer_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
-        LEFT JOIN dkic_b.t_mst_unit AS ul ON sku.unit_id = ul.unit_id
-        LEFT JOIN dkic_b.t_mst_unit AS u2 ON sku.sub_unit_id = u2.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS ul ON item.unit_id = ul.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS u2 ON item.sub_unit_id = u2.unit_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id
         LEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=inv.wh_id
         LEFT JOIN dkic_b.t_psi_inventory AS oinv ON oinv.inv_id=item.o_inv_id

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -55,8 +55,6 @@
                 <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
                 <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
                 <result column="pack_box" property="packBox"/>
-                <result column="box" property="box"/>
-                <result column="piece" property="piece"/>
                 <result column="item_qty" property="itemQty"/>
                 <result column="price_std" property="priceStd"/>
                 <result column="amt_std" property="amtStd"/>
@@ -317,9 +315,14 @@
                tmgs.sku_model                             as "skuModel",
                tmgs.sku_name                              as "skuName",
                tmgs.sku_images AS "skuImages",
+               t.pack_box  ,
                t.item_qty                                 as "orderQty",
+               t.box,
+               t.piece,
                t.item_qty - t.outing_qty - t.out_qty      as "canOutingQty",
                t.item_qty - t.outing_qty - t.out_qty      as outing_qty,
+               (t.item_qty - t.outing_qty - t.out_qty)/t.pack_box as "outingBox",
+                (t.item_qty - t.outing_qty - t.out_qty)%t.pack_box as "outingPiece",
                t.price_sale                               as "priceOut",
                t.price_sale * (t.item_qty - t.outing_qty - t.out_qty) as outing_amt,
                t.non_std_code,

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

@@ -99,7 +99,6 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
-
     /**
      * 出库价
      */

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

@@ -202,6 +202,36 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
     @ApiModelProperty(value = "源销售明细ID")
     private String sOrderItemId;
 
+    @Excel(name = "箱（出库中）")
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @Excel(name = "片（出库中）")
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @Excel(name = "箱（已出库）")
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @Excel(name = "片（已出库）")
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
+
+    @Excel(name = "基本单位")
+    @ApiModelProperty(value = "基本单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String unitId;
+
+    @Excel(name = "包装单位")
+    @ApiModelProperty(value = "包装单位")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String subUnitId;
+
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
+
 
     private static final long serialVersionUID = 1L;
 

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

@@ -362,6 +362,8 @@ public class OutboundItemResponse {
     private String subUnitName;
 
 
+
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -314,6 +314,22 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     private String sOrderItemId;
     private String brandName;
 
+    @Excel(name = "箱（出库中）")
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @Excel(name = "片（出库中）")
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @Excel(name = "箱（已出库）")
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @Excel(name = "片（已出库）")
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
+
     /**
      * 销售订单号
      */