Quellcode durchsuchen

修改bug箱片

songyang vor 1 Jahr
Ursprung
Commit
fc6dcb9aca

+ 3 - 1
src/main/java/com/dk/mdm/mapper/ivt/CheckItemMapper.xml

@@ -19,7 +19,7 @@
         ,item.sku_id,inv.wh_id,inv.non_std_code,item.item_id AS "fromItemId"
         ,item.check_id AS "fromId",item.item_index,item.balance_qty AS "intoingQty"
         ,abs(item.balance_qty) AS "outingQty",item.price_into,item.intoing_amt
-        ,0 AS "priceOut"
+        ,0 AS "priceOut",dkic_b.f_box_piece(u2.unit name,ul.unit name,item.box,item.piece) AS "boxPiece"
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -182,6 +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_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

+ 4 - 1
src/main/java/com/dk/mdm/mapper/ivt/FreezeItemMapper.xml

@@ -10,7 +10,8 @@
     <!-- 通用Respons查询列 -->
     <sql id="Base_Column_List_Respons">
         item.item_id, item.freeze_id, item.item_index, item.sku_id,item.box,item.piece,item.freeze_qty, item.unfreeze_qty, item.surplus_qty, item.remarks, item.inv_id, item.flg_valid
-        ,item.cp_id, sku.sku_code, sku.sku_name, sku.sku_model,brand.short_name,wh.wh_name,item.sub_unit_id,item.unit_id,item.pack_box
+        ,item.cp_id, sku.sku_code, sku.sku_name, sku.sku_model,brand.short_name,wh.wh_name
+        ,item.sub_unit_id,item.unit_id,item.pack_box,dkic_b.f_box_piece(u2.unit name,ul.unit name,item.box,item.piece) AS "boxPiece"
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -117,6 +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_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

+ 3 - 0
src/main/java/com/dk/mdm/mapper/ivt/TransferItemMapper.xml

@@ -14,6 +14,7 @@
         , item.o_wh_id, item.transfer_qty, item.wh_id, item.o_non_std_code, item.non_std_code, item.price_into, item.intoing_amt
         ,inv.non_std_code,oinv.non_std_code AS "oNonStdCode",wh.wh_Name AS "whName",owh.wh_Name AS "oWhName",item.flg_valid
         ,sku.sku_code,sku.sku_name,sku.sku_model,brand.short_name,item.sub_unit_id,item.unit_id,item.pack_box
+        ,dkic_b.f_box_piece(u2.unit name,ul.unit name,item.box,item.piece) AS "boxPiece"
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -163,6 +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_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