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

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

@@ -333,6 +333,10 @@
         ,tmgus.unit_name        as "subUnitName"
         ,tmgu.unit_name         as "unitName"
         ,tmgs.flg_sub_unit
+        ,tppi.intoing_qty/tppi.pack_box as "intoingBox"
+        ,tppi.intoing_qty%tppi.pack_box as "intoingPiece"
+        ,tppi.into_qty/tppi.pack_box as "intoBox"
+        ,tppi.into_qty%tppi.pack_box as "intoPiece"
         FROM dkic_b.t_psi_purchase_item tppi
         left join(SELECT T.*
         FROM (select tpi.inv_id,

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

@@ -421,6 +421,22 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     //箱片规格
     private String specsName;
 
+    @Excel(name = "箱（入库中）")
+    @ApiModelProperty(value = "箱（入库中）")
+    private  Integer intoingBox;
+
+    @Excel(name = "片（入库中）")
+    @ApiModelProperty(value = "片（入库中）")
+    private  Integer intoingPiece;
+
+    @Excel(name = "箱（已入库")
+    @ApiModelProperty(value = "箱（已入库）")
+    private  Integer intoBox;
+
+    @Excel(name = "片（已入库")
+    @ApiModelProperty(value = "片（已入库）")
+    private  Integer intoPiece;
+
 
 
     private static final long serialVersionUID = 1L;