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

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -410,9 +410,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"goods_brand_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsBrandListBy(@RequestBody Map<String, Object> param) {
-        return commonService.goodsBrandListBy(param);
+    @PostMapping({"get_goods_brand_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsBrandListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsBrandListBy(param);
     }
 
     /**
@@ -421,9 +421,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"goods_category_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsCategoryListBy(@RequestBody Map<String, Object> param) {
-        return commonService.goodsCategoryListBy(param);
+    @PostMapping({"get_goods_category_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsCategoryListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsCategoryListBy(param);
     }
 
     /**
@@ -432,9 +432,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"goods_Series_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsSeriesListBy(@RequestBody Map<String, Object> param) {
-        return commonService.goodsSeriesListBy(param);
+    @PostMapping({"get_goods_Series_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsSeriesListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsSeriesListBy(param);
     }
 
     /**
@@ -455,8 +455,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
     @PostMapping({"get_goods_brand_no_page"})
-    public ResponseResultVO<List<Map<String, Object>>> goodsBrandListNoPage(@RequestBody Map<String, Object> param) {
-        return commonService.goodsBrandListNoPage(param);
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(@RequestBody Map<String, Object> param) {
+        return commonService.getGoodsBrandListNoPage(param);
     }
     /**
      * @desc :  商品种类查询
@@ -475,9 +475,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
      * @date : 2024/2/26 10:36
      */
     @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
-    @PostMapping({"unit_list_by"})
-    public ResponseResultVO<PageList<Map<String, Object>>> unitListBy(@RequestBody Map<String, Object> param) {
-        return commonService.unitListBy(param);
+    @PostMapping({"get_unit_list_by"})
+    public ResponseResultVO<PageList<Map<String, Object>>> getUnitListBy(@RequestBody Map<String, Object> param) {
+        return commonService.getUnitListBy(param);
     }
 
     /**

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

@@ -5,14 +5,17 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, check_id, item_index, sku_id, inv_id, inv_qty, sub_unit_id, unit_id,pack_box,box, piece, check_qty, balance_qty, staff_id, loss_reason, check_date, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user, o_inv_qty
+        item_id, check_id, item_index, sku_id, inv_id, sys.f_remove_zero(inv_qty) as inv_qty, sub_unit_id, unit_id,pack_box,box, piece,
+        sys.f_remove_zero(check_qty) as check_qty, sys.f_remove_zero(balance_qty) as balance_qty, staff_id, loss_reason, check_date, remarks,
+flg_valid, cp_id,
+        op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user, sys.f_remove_zero(o_inv_qty) as o_inv_qty
     </sql>
 
     <!-- 盘点一览通用查询列 -->
     <sql id="Base_Column_List_Response">
         item.item_id,item.check_id,item.inv_id
-        ,item.inv_qty,item.o_inv_qty,item.box,item.piece,item.sub_unit_id,item.unit_id,item.pack_box
-        ,item.check_qty,item.balance_qty,item.staff_id
+        ,sys.f_remove_zero(item.inv_qty) as inv_qty,sys.f_remove_zero(item.o_inv_qty) as o_inv_qty,item.box,item.piece,item.sub_unit_id,item.unit_id,item.pack_box
+        ,sys.f_remove_zero(item.check_qty) as check_qty,sys.f_remove_zero(item.balance_qty) as balance_qty,item.staff_id
         ,item.loss_reason,item.check_date,item.remarks,item.flg_valid,item.cp_id
         ,sku.sku_code,sku.sku_name,sku.sku_model,brand.short_name,wh.wh_name
         ,dd.data_value AS "lossReasonName",staff.staff_name AS "dutyStaff"

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

@@ -5,11 +5,15 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, freeze_id, item_index, sku_id,sub_unit_id, unit_id,pack_box, box, piece, freeze_qty, unfreeze_qty, surplus_qty, remarks, inv_id, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, freeze_id, item_index, sku_id,sub_unit_id, unit_id,pack_box, box, piece,
+          sys.f_remove_zero(freeze_qty) as freeze_qty,  sys.f_remove_zero(unfreeze_qty) as unfreeze_qty,  sys.f_remove_zero(surplus_qty) as surplus_qty, remarks, inv_id, flg_valid, cp_id,
+        op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
     <!-- 通用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.item_id, item.freeze_id, item.item_index, item.sku_id,item.box,item.piece,
+        sys.f_remove_zero(item.freeze_qty) as freeze_qty, sys.f_remove_zero(item.unfreeze_qty) as unfreeze_qty,
+        sys.f_remove_zero(item.surplus_qty) as 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,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,item.box,item.piece) AS "boxPiece"
     </sql>

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

@@ -5,14 +5,15 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        freeze_id, freeze_no, cus_id, org_id, staff_id, freeze_status, freeze_date, auto_unfreeze_date, sum_quantity, remarks, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,annex_paths
+        freeze_id, freeze_no, cus_id, org_id, staff_id, freeze_status, freeze_date, auto_unfreeze_date,
+        sys.f_remove_zero(sum_quantity) as sum_quantity, remarks, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,annex_paths
     </sql>
 
     <!-- 冻结一览查询列 -->
     <sql id="Base_Column_List_Respons">
         fre.freeze_id,fre.freeze_no,fre.cus_id,fre.org_id,fre.staff_id,fre.freeze_status
         ,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n} ) AS "freezeStatusName"
-        ,fre.freeze_date,fre.auto_unfreeze_date ,fre.sum_quantity, fre.remarks, fre.make_staff
+        ,fre.freeze_date,fre.auto_unfreeze_date ,sys.f_remove_zero(fre.sum_quantity) as sum_quantity, fre.remarks, fre.make_staff
         , fre.make_time, fre.flg_valid,fre.cp_id,cus.cus_phone
         ,cus.cus_name,staff.staff_name,org.org_name,mstaff.staff_name AS "makeStaffName"
         ,fre.annex_paths

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

@@ -5,12 +5,13 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        record_id, inv_id, biznis_type, biznis_id, biznis_item_id, sku_id, non_std_code, price_into, into_qty, into_amt, acc_date, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        record_id, inv_id, biznis_type, biznis_id, biznis_item_id, sku_id, non_std_code, price_into,
+        sys.f_remove_zero(into_qty) as into_qty, into_amt, acc_date, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <sql id="Base_Column_List_Response">
         tpior.record_id, tpior.inv_id, tpior.biznis_type, tpior.biznis_id, tpior.biznis_item_id, tpior.sku_id,
-        tpior.non_std_code, tpior.price_into, tpior.into_qty, tpior.into_amt, tpior.acc_date, tpior.remarks,
+        tpior.non_std_code, tpior.price_into, sys.f_remove_zero(tpior.into_qty) as into_qty, tpior.into_amt, tpior.acc_date, tpior.remarks,
         tpior.flg_valid, tpior.cp_id
     </sql>
 

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

@@ -6,8 +6,9 @@
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
         item_id, into_id, into_type, from_id, from_item_id, item_index, sku_id, price_into, non_std_code,
-        into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt,
-        remarks, inv_id, cost_price, cost_amt, out_qty, inv_qty, flg_valid, cp_id, op_create_time,
+        into_status, sys.f_remove_zero(intoing_qty) as intoing_qty, intoing_amt, sys.f_remove_zero(into_qty) as into_qty,
+        into_amt, sys.f_remove_zero(return_qty) as return_qty, return_amt,
+        remarks, inv_id, cost_price, cost_amt, sys.f_remove_zero(out_qty) as out_qty, sys.f_remove_zero(inv_qty) as inv_qty, flg_valid, cp_id, op_create_time,
         op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,
         s_into_id,s_into_item_id,s_pur_id,s_pur_item_id,intoing_box,intoing_piece,into_box,into_piece,
         unit_id,sub_unit_id, pack_box
@@ -16,8 +17,10 @@
     <!-- response通用查询列 -->
     <sql id="Base_Column_List_Response">
         tpii.item_id, tpii.into_id, tpii.into_type, tpii.from_id, tpii.from_item_id, tpii.item_index, tpii.sku_id, tpii.price_into,
-        tpii.non_std_code, tpii.into_status, tpii.intoing_qty, tpii.intoing_amt, tpii.into_qty, tpii.into_amt, tpii.return_qty,
-        tpii.return_amt, tpii.remarks, tpii.inv_id, tpii.cost_price, tpii.cost_amt, tpii.out_qty, tpii.inv_qty, tpii.flg_valid,
+        tpii.non_std_code, tpii.into_status, sys.f_remove_zero(tpii.intoing_qty) as intoing_qty, tpii.intoing_amt,
+        sys.f_remove_zero(tpii.into_qty) as into_qty, tpii.into_amt, sys.f_remove_zero(tpii.return_qty) as return_qty,
+        tpii.return_amt, tpii.remarks, tpii.inv_id, tpii.cost_price, tpii.cost_amt,
+        sys.f_remove_zero(tpii.out_qty) as out_qty, sys.f_remove_zero(tpii.inv_qty) as inv_qty, tpii.flg_valid,
         tpii.cp_id,tpii.s_into_id,tpii.s_into_item_id,tpii.s_pur_id,tpii.s_pur_item_id,
         tpii.intoing_box,tpii.intoing_piece,tpii.into_box,tpii.into_piece,
         tpii.unit_id,tpii.sub_unit_id,tpii.pack_box
@@ -233,10 +236,10 @@
         ,tmgb.short_name  as "shortName"
         ,tpp.pur_id as "purId"
         ,tpp.pur_no as "purNo"
-        ,tppi.item_qty as "purItemQty"
-        ,tppi.intoing_qty as "purItemIntoingQty"
-        ,tppi.into_qty as "purItemIntoQty"
-        ,tpiv.inv_qty
+        ,sys.f_remove_zero(tppi.item_qty)  as "purItemQty"
+        ,sys.f_remove_zero(tppi.intoing_qty) as "purItemIntoingQty"
+        ,sys.f_remove_zero(tppi.into_qty) as "purItemIntoQty"
+        ,sys.f_remove_zero(tpiv.inv_qty) as inv_qty
         ,tmgs.pack_box
         ,tmgus.unit_name         as "subUnitName"
         ,tmgu.unit_name         as "unitName"
@@ -392,18 +395,18 @@
         tpii.price_into,
         tpii.non_std_code,
         tpii.into_status,
-        tpii.intoing_qty,
+        sys.f_remove_zero(tpii.intoing_qty) as intoing_qty,
         tpii.intoing_amt,
-        tpii.into_qty,
+        sys.f_remove_zero(tpii.into_qty) as into_qty,
         tpii.into_amt,
-        tpii.return_qty,
+        sys.f_remove_zero(tpii.return_qty) as return_qty,
         tpii.return_amt,
         tpii.remarks,
         tpii.inv_id,
         tpii.cost_price,
         tpii.cost_amt,
         tpii.wh_id,
-        tpii.inv_qty,
+        sys.f_remove_zero(tpii.inv_qty) as inv_qty,
         tpii.intoing_box,
         tpii.intoing_piece,
         tpii.into_box,
@@ -422,10 +425,10 @@
         tpoi.non_std_code,
         tpoi.out_status as into_status,
         tpoi.outing_qty as intoing_amt ,
-        tpoi.outing_amt as intoing_qty ,
-        tpoi.out_qty as into_qty ,
+        sys.f_remove_zero(tpoi.outing_amt) as intoing_qty ,
+        sys.f_remove_zero(tpoi.out_qty) as into_qty ,
         tpoi.out_amt as into_amt ,
-        tpoi.return_qty,
+        sys.f_remove_zero(tpoi.return_qty) as return_qty,
         tpoi.return_amt,
         tpoi.remarks,
         tpoi.inv_id,
@@ -534,21 +537,21 @@
         ,tmw.wh_id as "whId"
         ,tmw.wh_code as "whCode"
         ,tmw.wh_name as "whName"
-        ,tpsii.intoing_qty as "sIntoItemIntoingQty"
+        ,sys.f_remove_zero(tpsii.intoing_qty) as  "sIntoItemIntoingQty"
         ,tpsii.intoing_amt as "sIntoItemIntoingAmt"
-        ,tpsii.into_qty as "sIntoItemIntoQty"
+        ,sys.f_remove_zero(tpsii.into_qty) as "sIntoItemIntoQty"
         ,tpsii.into_amt as "sIntoItemIntoAmt"
-        ,tpsii.return_qty as "sIntoItemReturnQty"
+        ,sys.f_remove_zero(tpsii.return_qty) as "sIntoItemReturnQty"
         ,tpsii.return_amt as "sIntoItemReturnAmt"
 
-        ,tppi.intoing_qty as "sPurItemIntoingQty"
+        ,sys.f_remove_zero(tppi.intoing_qty) as "sPurItemIntoingQty"
         ,tppi.intoing_amt as "sPurItemIntoingAmt"
-        ,tppi.into_qty as "sPurItemIntoQty"
+        ,sys.f_remove_zero(tppi.into_qty) as "sPurItemIntoQty"
         ,tppi.into_amt as "sPurItemIntoAmt"
-        ,tppi.return_qty as "sPurItemReturnQty"
+        ,sys.f_remove_zero(tppi.return_qty)  as "sPurItemReturnQty"
         ,tppi.return_amt as "sPurItemReturnAmt"
 
-        ,tpi.usable_qty AS "usableQty"
+        ,sys.f_remove_zero(tpi.usable_qty) AS "usableQty"
         ,tpi.non_std_code AS "nonStdCode"
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpii.sku_id
@@ -579,12 +582,12 @@
         ,tmgb.short_name  as "shortName"
         ,tpp.pur_id as "purId"
         ,tpp.pur_no as "purNo"
-        ,tppi.item_qty as "purItemQty"
-        ,tppi.intoing_qty as "purItemIntoingQty"
-        ,tppi.into_qty as "purItemIntoQty"
+        ,sys.f_remove_zero(tppi.item_qty) as "purItemQty"
+        ,sys.f_remove_zero(tppi.intoing_qty) as "purItemIntoingQty"
+        ,sys.f_remove_zero(tppi.into_qty) as "purItemIntoQty"
         ,tmp.sup_code as "supCode"
         ,tmp.sup_name as "supName"
-        ,tpiv.inv_qty
+        ,sys.f_remove_zero(tpiv.inv_qty)  as inv_qty
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_psi_inbound tpid on tpii.into_id = tpid.into_id
         left join dkic_b.t_psi_inventory tpiv on tpiv.inv_id = tpii.inv_id

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

@@ -6,7 +6,8 @@
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
         into_id ,into_no, into_type, from_id, from_no, org_id, staff_id, cus_id, sup_id,
-        into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty,
+        into_status, sys.f_remove_zero(intoing_qty) as intoing_qty, intoing_amt, sys.f_remove_zero(into_qty) as into_qty
+        , into_amt, sys.f_remove_zero(return_qty) as return_qty,
         return_amt, into_date, remarks, annex_paths, make_staff, make_time,
         receivable_id, flg_valid, cp_id, op_create_time, op_create_user_id,
         op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,wh_id,
@@ -17,8 +18,9 @@
     <!-- response通用查询列 -->
     <sql id="Base_Column_List_Response">
         tpi.into_id, tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id,
-        tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt, tpi.into_qty,
-        tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths,
+        tpi.cus_id, tpi.sup_id, tpi.into_status, sys.f_remove_zero(tpi.intoing_qty) as intoing_qty, tpi.intoing_amt,
+        sys.f_remove_zero(tpi.into_qty) as into_qty,
+        tpi.into_amt, sys.f_remove_zero(tpi.return_qty) as return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths,
         tpi.make_staff, tpi.make_time, tpi.receivable_id, tpi.flg_valid, tpi.cp_id,
         tpi.wh_id,tpi.into_reason,tpi.flg_auto_handle,tpi.flg_handle_setting,tpi.flg_neg_into
     </sql>
@@ -119,8 +121,10 @@
     <!-- response明细通用查询列 -->
     <sql id="Base_Column_List_Item_Response">
         tpi.into_id
-        , tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id, tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt,
-        tpi.into_qty, tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths, tpi.make_staff, tpi.make_time,
+        , tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id, tpi.cus_id, tpi.sup_id,
+        tpi.into_status, sys.f_remove_zero(tpi.intoing_qty) as intoing_qty, tpi.intoing_amt,
+        sys.f_remove_zero(tpi.into_qty) as into_qty, tpi.into_amt, sys.f_remove_zero(tpi.return_qty) as return_qty, tpi.return_amt, tpi.into_date,
+        tpi.remarks, tpi.annex_paths, tpi.make_staff, tpi.make_time,
         tpi.receivable_id, tpi.flg_valid, tpi.cp_id
     </sql>
     <!-- response明细关联明细映射-->
@@ -595,18 +599,18 @@
         tpii.price_into AS list_price_into,
         tpii.non_std_code AS list_non_std_code,
         tpii.into_status AS list_into_status,
-        tpii.intoing_qty AS list_intoing_qty,
-        tpii.intoing_amt AS list_intoing_amt,
-        tpii.into_qty AS list_into_qty,
+        sys.f_remove_zero(tpii.intoing_qty) AS list_intoing_qty,
+        tpii.intoing_amt  AS list_intoing_amt,
+        sys.f_remove_zero(tpii.into_qty)  AS list_into_qty,
         tpii.into_amt AS list_into_amt,
-        tpii.return_qty AS list_return_qty,
+        sys.f_remove_zero(tpii.return_qty) AS list_return_qty,
         tpii.return_amt AS list_return_amt,
         tpii.remarks AS list_remarks,
         tpii.inv_id AS list_inv_id,
         tpii.cost_price AS list_cost_price,
         tpii.cost_amt AS list_cost_amt,
-        tpii.out_qty AS list_out_qty,
-        tpii.inv_qty AS list_inv_qty,
+        sys.f_remove_zero(tpii.out_qty) AS list_out_qty,
+        sys.f_remove_zero(tpii.inv_qty) AS list_inv_qty,
         tpii.flg_valid AS list_flg_valids,
         tpii.cp_id AS list_cp_id,
         tmgs.sku_code AS  list_sku_code,
@@ -616,7 +620,7 @@
         tmgs.price_purchase AS  list_price_purchase,
         tmgs.sku_images AS  list_sku_images,
 
-        ( tpii.into_qty - tpii.return_qty)  AS list_reject_qty,
+        sys.f_remove_zero( tpii.into_qty - tpii.return_qty)  AS list_reject_qty,
 --         tpit.usable_qty AS list_usable_qty,
 --         tpit.inv_qty AS list_inv_qty,
 --         tpit.outing_qty AS list_outing_qty
@@ -743,11 +747,11 @@
         tpi.cus_id,
         tpi.sup_id,
         tpi.into_status,
-        tpi.intoing_qty,
+        sys.f_remove_zero(tpi.intoing_qty) as intoing_qty,
         tpi.intoing_amt,
-        tpi.into_qty,
+        sys.f_remove_zero(tpi.into_qty) as into_qty,
         tpi.into_amt,
-        tpi.return_qty,
+        sys.f_remove_zero(tpi.return_qty) as  return_qty,
         tpi.return_amt,
         tpi.into_date,
         tpi.remarks,
@@ -772,11 +776,11 @@
         tpo.cus_id,
         tpo.sup_id,
         tpo.out_status,
-        tpo.outing_qty as intoing_qty,
+        sys.f_remove_zero(tpo.outing_qty) as   intoing_qty,
         tpo.outing_amt as intoing_amt,
-        tpo.out_qty as into_qty,
+        sys.f_remove_zero(tpo.out_qty) as into_qty,
         tpo.out_amt as into_amt,
-        tpo.return_qty,
+        sys.f_remove_zero(tpo.return_qty) as  return_qty,
         tpo.return_amt,
         tpo.out_date as into_date,
         tpo.remarks,
@@ -835,6 +839,9 @@
             <if test="cusName != null and cusName != ''">
                 AND tmc.cus_name LIKE concat('%',my_ex.likequery(#{cusName}),'%')
             </if>
+            <if test="whName != null and whName != ''">
+                AND tmw.wh_name LIKE concat('%',my_ex.likequery(#{whName}),'%')
+            </if>
             <if test="supId != null and supId != ''">
                 AND tpi.sup_id = #{supId}::uuid
             </if>

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

@@ -5,13 +5,15 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        batch_id, inv_id, from_id, from_item_id, wh_id, sku_id, non_std_code, inv_qty, cost_price, cost_amt, acc_date, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        batch_id, inv_id, from_id, from_item_id, wh_id, sku_id, non_std_code,
+        sys.f_remove_zero(inv_qty) as inv_qty, cost_price, cost_amt, acc_date, remarks, flg_valid, cp_id, op_create_time,
+        op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询列Response -->
     <sql id="Base_Column_List_Response">
         tpib.batch_id, tpib.inv_id, tpib.from_id, tpib.from_item_id,
-        tpib.wh_id, tpib.sku_id, tpib.non_std_code, tpib.inv_qty,
+        tpib.wh_id, tpib.sku_id, tpib.non_std_code,  sys.f_remove_zero(tpib.inv_qty) as inv_qty,
         tpib.cost_price, tpib.cost_amt, tpib.acc_date, tpib.remarks,
         tpib.flg_valid, tpib.cp_id
     </sql>

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

@@ -5,12 +5,16 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        inv_id, wh_id, sku_id, non_std_code, inv_qty, outing_qty, usable_qty, cost_price, cost_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user, freeze_qty
+        inv_id, wh_id, sku_id, non_std_code, sys.f_remove_zero(inv_qty) as inv_qty, sys.f_remove_zero(outing_qty) as outing_qty,
+        sys.f_remove_zero(usable_qty) as usable_qty, cost_price, cost_amt, remarks, flg_valid, cp_id, op_create_time,
+        op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user, sys.f_remove_zero(freeze_qty) as freeze_qty
     </sql>
     <!-- 通用查询列Response -->
     <sql id="Base_Column_List_Response">
-        tpi.inv_id, tpi.wh_id, tpi.sku_id, tpi.non_std_code, tpi.inv_qty, tpi.outing_qty,
-        tpi.usable_qty, tpi.cost_price, tpi.cost_amt, tpi.remarks, tpi.flg_valid, tpi.cp_id,tpi.freeze_qty
+        tpi.inv_id, tpi.wh_id, tpi.sku_id, tpi.non_std_code, sys.f_remove_zero(tpi.inv_qty) as inv_qty,
+        sys.f_remove_zero(tpi.outing_qty) as outing_qty,
+        sys.f_remove_zero(tpi.usable_qty) as usable_qty, tpi.cost_price, tpi.cost_amt, tpi.remarks, tpi.flg_valid,
+        tpi.cp_id,sys.f_remove_zero(tpi.freeze_qty) as freeze_qty
     </sql>
 
     <!-- 通用查询映射结果 -->

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

@@ -5,11 +5,12 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        batch_id, out_item_id, inv_id, out_qty, cost_price, cost_amt, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        batch_id, out_item_id, inv_id, sys.f_remove_zero(out_qty) as out_qty, cost_price, cost_amt,
+        flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
     <!-- 通用查询列Response -->
     <sql id="Base_Column_List_Response">
-        tpoic.batch_id,tpoic.out_item_id, tpoic.inv_id, tpoic.out_qty, tpoic.cost_price, tpoic.cost_amt,
+        tpoic.batch_id,tpoic.out_item_id, tpoic.inv_id, sys.f_remove_zero(tpoic.out_qty) as out_qty, tpoic.cost_price, tpoic.cost_amt,
         tpoic.flg_valid, tpoic.cp_id
     </sql>
 

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

@@ -7,21 +7,22 @@
     <sql id="Base_Column_List">
         item_id
         , out_id, out_type, from_id, from_item_id, item_index, sku_id, price_out, non_std_code,
-        out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks,
+        out_status, sys.f_remove_zero(outing_qty) as outing_qty, outing_amt,
+sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as return_qty, return_amt, remarks,
         inv_id, cost_price, cost_amt, flg_valid, cp_id, op_create_time, op_create_user_id,
         op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,
         s_out_id,s_out_item_id,s_order_id,s_order_item_id,outing_box,outing_piece,out_box,out_piece,
-        unit_id,sub_unit_id, pack_box
+        unit_id,sub_unit_id, pack_box,sku_name,sku_model
     </sql>
 
     <sql id="Base_Column_List_Response">
         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.sku_id, tpoi.price_out, tpoi.non_std_code, tpoi.out_status, sys.f_remove_zero(tpoi.outing_qty) as outing_qty, tpoi.outing_amt,
+        sys.f_remove_zero(tpoi.out_qty) as out_qty, tpoi.out_amt, sys.f_remove_zero(tpoi.return_qty) as return_qty, tpoi.return_amt, tpoi.remarks, tpoi.inv_id,
         tpoi.cost_price, tpoi.cost_amt, tpoi.flg_valid, tpoi.cp_id,
         tpoi.s_out_id,tpoi.s_out_item_id,tpoi.s_order_id,tpoi.s_order_item_id,
         tpoi.outing_box,tpoi.outing_piece,tpoi.out_box,tpoi.out_piece,
-        tpoi.unit_id,tpoi.sub_unit_id,tpoi.pack_box
+        tpoi.unit_id,tpoi.sub_unit_id,tpoi.pack_box,sku_name,sku_model
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -66,6 +67,8 @@
         <result column="unit_id" property="unitId"/>
         <result column="sub_unit_id" property="subUnitId"/>
         <result column="pack_box" property="packBox"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="sku_model" property="skuModel"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -127,6 +130,7 @@
         <result column="flgSubUnit" property="flgSubUnit"/>
         <result column="subUnitName" property="subUnitName"/>
         <result column="unitName" property="unitName"/>
+        <result column="use_place" property="usePlace"/>
 
     </resultMap>
 
@@ -217,22 +221,22 @@
         tpoi.item_index,
         tpoi.sku_id,
         tmgs.sku_code as "skuCode",
-        tmgs.sku_model as "skuModel",
-        tmgs.sku_name as "skuName",
+        case when tpoi.sku_id is null then tpoi.sku_model  else  tmgs.sku_model end   as "skuModel",
+        case when tpoi.sku_id is null then tpoi.sku_name  else  tmgs.sku_name end   as "skuName",
         tpoi.price_out,
         tpoi.non_std_code,
         tpoi.out_status,
-        tpoi.outing_qty,
+        sys.f_remove_zero(tpoi.outing_qty) as 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,
+        sys.f_remove_zero(tpoi.out_qty) as 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,
+        sys.f_remove_zero(tpoi.return_qty) as return_qty,
         tpoi.return_amt,
         tpoi.remarks,
         tpoi.inv_id,
@@ -241,8 +245,8 @@
         tpoi.flg_valid,
         tpoi.cp_id,
         tpi.wh_id as "whId",
-        tpi.inv_qty as "invQty",
-        tpi.usable_qty as "usableQty",
+        sys.f_remove_zero(tpi.inv_qty) as    "invQty",
+        sys.f_remove_zero(tpi.usable_qty) as    "usableQty",
         tmw.wh_name as "whName",
         tmgb.brand_name  as "brandName",
         tmgb.short_name  as "shortName",
@@ -320,6 +324,8 @@
             from_item_id,
             item_index,
             sku_id,
+            sku_name,
+            sku_model,
             price_out,
             non_std_code,
             out_status,
@@ -347,6 +353,8 @@
                 #{item.fromItemId}::uuid,
                 #{item.itemIndex},
                 #{item.skuId}::uuid,
+                #{item.skuName},
+                #{item.skuModel},
                 #{item.priceOut},
                 #{item.nonStdCode},
                 #{item.outStatus},
@@ -378,31 +386,32 @@
                t.sku_id,
                tmgs.sku_images,
                tmgs.flg_sub_unit AS "flgSubUnit",
-               t.outing_box AS "outingBox",
-               t.outing_piece AS "outingPiece",
+               t.outing_box ,
+               t.outing_piece ,
                tmgs.price_standard AS "priceStandard",
-                tmgs.pack_box AS "packBox",
+               t.pack_box  ,
                 tmgus.unit_name         as "subUnitName",
                 tmgu.unit_name         as "unitName",
-               tmgs.sku_code                                                             as "skuCode",
-               tmgs.sku_model                                                            as "skuModel",
-               tmgs.sku_name                                                             as "skuName",
-               tpoi.item_qty                                                             as "orderQty",
-               tpoi.item_qty - tpoi.outing_qty - tpoi.out_qty + t.outing_qty + t.out_qty as "canOutingQty",
+               case when t.sku_id is null then t.sku_model  else  tmgs.sku_model end   as "skuModel",
+               case when t.sku_id is null then t.sku_name  else  tmgs.sku_name end   as "skuName",
+               tmgs.sku_code            as "skuCode",
+               sys.f_remove_zero(tpoi.item_qty)    as "orderQty",
+               sys.f_remove_zero(tpoi.item_qty - tpoi.outing_qty - tpoi.out_qty + t.outing_qty + t.out_qty) as "canOutingQty",
                tmgb.brand_name AS "brandName",
                tmgb.short_name AS "shortName",
                t.price_out,
-               t.outing_qty + t.out_qty                                                  as outing_qty,
+               sys.f_remove_zero(t.outing_qty + t.out_qty)                                                  as outing_qty,
                t.outing_amt + t.out_amt                                                  as outing_amt,
-               t.out_qty,
+               sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
                t.non_std_code,
                t.remarks,
                t.inv_id,
                tpi.wh_id                                                                 as "whId",
-               tpi.inv_qty                                                               as "invQty",
-               tpi.usable_qty                                                            as "usableQty",
-               tmw.wh_name                                                               as "whName"
+               sys.f_remove_zero(tpi.inv_qty)                                                               as "invQty",
+               sys.f_remove_zero(tpi.usable_qty)                                                            as "usableQty",
+               tmw.wh_name                                                               as "whName",
+               t.use_place
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_psi_order_item as tpoi on tpoi.item_id = t.from_item_id
                  left join dkic_b.t_psi_order as tpo on tpo.order_id = t.from_id
@@ -426,22 +435,22 @@
                t.item_index,
                t.sku_id,
                tmgs.sku_code            as "skuCode",
-               tmgs.sku_model           as "skuModel",
-               tmgs.sku_name            as "skuName",
+               case when t.sku_id is null then t.sku_model  else  tmgs.sku_model end   as "skuModel",
+               case when t.sku_id is null then t.sku_name  else  tmgs.sku_name end   as "skuName",
                t.pack_box,
                t.price_out,
-               t.outing_qty,
+               sys.f_remove_zero(t.outing_qty) as outing_qty,
                t.outing_box,
                t.outing_piece,
                t.outing_amt,
-               t.out_qty,
+               sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
                t.non_std_code,
                t.remarks,
                t.inv_id,
                tpi.wh_id                as "whId",
-               tpi.inv_qty              as "invQty",
-               tpi.usable_qty           as "usableQty",
+               sys.f_remove_zero(tpi.inv_qty)             as "invQty",
+               sys.f_remove_zero(tpi.usable_qty)           as "usableQty",
                tmw.wh_name              as "whName"
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
@@ -458,11 +467,11 @@
                t.item_id                                  as s_out_item_id,
                t.sku_id,
                tmgs.sku_code                              as "skuCode",
-               tmgs.sku_model                             as "skuModel",
-               tmgs.sku_name                              as "skuName",
-               t.out_qty                                  as "outboundOutQty",
-               t.out_qty - t.return_qty                   as "canReturnQty",
-               - (t.out_qty - t.return_qty)               as outing_qty,
+               case when t.sku_id is null then t.sku_model  else  tmgs.sku_model end   as "skuModel",
+               case when t.sku_id is null then t.sku_name  else  tmgs.sku_name end   as "skuName",
+               sys.f_remove_zero(t.out_qty)                                  as "outboundOutQty",
+               sys.f_remove_zero(t.out_qty - t.return_qty)                   as "canReturnQty",
+               - sys.f_remove_zero(t.out_qty - t.return_qty)               as outing_qty,
                t.price_out,
                - t.price_out * (t.out_qty - t.return_qty) as outing_amt,
                0                                          as out_qty,
@@ -493,17 +502,17 @@
                tmgb.brand_name,
                tmgb.short_name,
                tmgs.sku_code                                                                         as "skuCode",
-               tmgs.sku_model                                                                        as "skuModel",
-               tmgs.sku_name                                                                         as "skuName",
-               COALESCE(tpobi.out_qty, 0)                                                            as "outboundOutQty",
-               COALESCE(tpobi.out_qty, 0) - COALESCE(tpobi.return_qty, 0) + t.outing_qty + t.out_qty as "canReturnQty",
+               case when t.sku_id is null then t.sku_model  else  tmgs.sku_model end                 as "skuModel",
+               case when t.sku_id is null then t.sku_name  else  tmgs.sku_name end                   as "skuName",
+               sys.f_remove_zero(COALESCE(tpobi.out_qty, 0))                                                            as "outboundOutQty",
+               sys.f_remove_zero(COALESCE(tpobi.out_qty, 0) - COALESCE(tpobi.return_qty, 0) + t.outing_qty + t.out_qty) as "canReturnQty",
                t.inv_id,
                tpi.wh_id,
-               tpi.inv_qty                                                                           as "invQty",
-               tpi.usable_qty                                                                        as "usableQty",
+               sys.f_remove_zero(tpi.inv_qty)                                                                           as "invQty",
+               sys.f_remove_zero(tpi.usable_qty)                                                                        as "usableQty",
                tmw.wh_name                                                                           as "whName",
                t.price_out,
-               t.outing_qty + t.out_qty                                                              as outing_qty,
+               sys.f_remove_zero(t.outing_qty + t.out_qty)                                                              as outing_qty,
                t.outing_amt + t.out_amt                                                              as outing_amt,
                t.non_std_code,
                t.remarks
@@ -532,20 +541,20 @@
                tmgb.brand_name,
                tmgb.short_name,
                tmgs.sku_code                                                                         as "skuCode",
-               tmgs.sku_model                                                                        as "skuModel",
-               tmgs.sku_name                                                                         as "skuName",
-               COALESCE(tpobi.out_qty, 0)                                                            as "outboundOutQty",
-               t.out_qty - t.return_qty                   as "canReturnQty",
+               case when t.sku_id is null then t.sku_model  else  tmgs.sku_model end                 as "skuModel",
+               case when t.sku_id is null then t.sku_name  else  tmgs.sku_name end                   as "skuName",
+               sys.f_remove_zero(COALESCE(tpobi.out_qty, 0))                                                            as "outboundOutQty",
+               sys.f_remove_zero(t.out_qty - t.return_qty)                   as "canReturnQty",
                t.inv_id,
                tpi.wh_id,
-               tpi.inv_qty                                                                           as "invQty",
-               tpi.usable_qty                                                                        as "usableQty",
+               sys.f_remove_zero(tpi.inv_qty)                                                                           as "invQty",
+               sys.f_remove_zero(tpi.usable_qty)                                                                        as "usableQty",
                tmw.wh_name                                                                           as "whName",
                t.price_out,
-               t.outing_qty + t.out_qty                                                              as outing_qty,
+               sys.f_remove_zero(t.outing_qty + t.out_qty)                                                              as outing_qty,
                t.outing_amt + t.out_amt                                                              as outing_amt,
 
-               t.out_qty,
+               sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
             t.non_std_code,
                t.remarks
@@ -588,11 +597,11 @@
         tpoi.price_out,
         tpoi.non_std_code,
         tpoi.out_status ,
-        tpoi.outing_qty ,
+        sys.f_remove_zero(tpoi.outing_qty) as  outing_qty,
         tpoi.outing_amt ,
-        tpoi.out_qty ,
+        sys.f_remove_zero(tpoi.out_qty) as out_qty ,
         tpoi.out_amt ,
-        tpoi.return_qty,
+        sys.f_remove_zero(tpoi.return_qty) as return_qty,
         tpoi.return_amt,
         tpoi.remarks,
         tpoi.inv_id,
@@ -615,11 +624,11 @@
         tpii.price_into as price_out,
         tpii.non_std_code,
         tpii.into_status,
-        tpii.intoing_qty as outing_qty ,
+        sys.f_remove_zero(tpii.intoing_qty) as outing_qty ,
         tpii.intoing_amt as outing_amt ,
-        tpii.into_qty as out_qty ,
+        sys.f_remove_zero(tpii.into_qty) as out_qty ,
         tpii.into_amt as out_amt ,
-        tpii.return_qty,
+        sys.f_remove_zero(tpii.return_qty) as return_qty,
         tpii.return_amt,
         tpii.remarks,
         tpii.inv_id,
@@ -636,8 +645,8 @@
         select
         <include refid="Base_Column_List_Response_Out"/>
         ,tmgs.sku_code as "skuCode"
-        ,tmgs.sku_model as "skuModel"
-        ,tmgs.sku_name as "skuName"
+        ,case when tpoi.sku_id is null then tpoi.sku_model  else  tmgs.sku_model end   as "skuModel"
+        ,case when tpoi.sku_id is null then tpoi.sku_name  else  tmgs.sku_name end   as "skuName"
         ,tmgs.sku_spec as "skuSpec"
         ,tmgb.brand_name as "brandName"
         ,tmgb.short_name as "shortName"

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

@@ -6,15 +6,17 @@
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
         out_id, out_no, out_type, from_id, from_no, org_id, staff_id, cus_id, sup_id,
-        out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt,
+        out_status, sys.f_remove_zero(outing_qty) as outing_qty, outing_amt,
+        sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as return_qty, return_amt,
         out_date, remarks, annex_paths, make_staff, make_time, receivable_id,
         flg_valid, cp_id,out_reason,flg_auto_handle,flg_handle_setting
     </sql>
 
     <sql id="Base_Column_List_Response">
         tpo.out_id, tpo.out_no, tpo.out_type, tpo.from_id, tpo.from_no, tpo.org_id, tpo.staff_id,
-        tpo.cus_id, tpo.sup_id, tpo.out_status, tpo.outing_qty, tpo.outing_amt, tpo.out_qty, tpo.out_amt,
-        tpo.return_qty, tpo.return_amt, tpo.out_date, tpo.remarks, tpo.annex_paths, tpo.make_staff,
+        tpo.cus_id, tpo.sup_id, tpo.out_status, sys.f_remove_zero(tpo.outing_qty) as outing_qty, tpo.outing_amt,
+        sys.f_remove_zero(tpo.out_qty) as out_qty, tpo.out_amt,
+        sys.f_remove_zero(tpo.return_qty) as return_qty, tpo.return_amt, tpo.out_date, tpo.remarks, tpo.annex_paths, tpo.make_staff,
         tpo.make_time, tpo.receivable_id, tpo.flg_valid, tpo.cp_id,tpo.out_reason,
         tpo.flg_auto_handle,tpo.flg_handle_setting
     </sql>
@@ -360,13 +362,13 @@
                t.out_status,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName",
                sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) AS  "outTypeName",
-               t.outing_qty,
+                sys.f_remove_zero(t.outing_qty) as outing_qty,
                t.outing_amt,
-               (t.outing_amt + t.out_amt) AS "sumOutAmt",
-               (t.outing_qty + t.out_qty) AS "sumOutQty",
-               t.out_qty,
+               CAST(t.outing_amt AS DECIMAL(10,2)) + CAST(t.out_amt AS DECIMAL(10,2))  AS "sumOutAmt",
+                sys.f_remove_zero(CAST(t.outing_qty AS DECIMAL(10,6)) + CAST(t.out_qty AS DECIMAL(10,6)))  AS "sumOutQty",
+        sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
-               t.return_qty,
+        sys.f_remove_zero(t.return_qty) as return_qty,
                t.return_amt,
                t.out_date,
                t.remarks,
@@ -445,11 +447,11 @@
                t.sup_id,
                t.out_status,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName",
-               t.outing_qty,
+               sys.f_remove_zero(t.outing_qty) as  outing_qty,
                t.outing_amt,
-               t.out_qty,
+               sys.f_remove_zero(t.out_qty) as out_qty,
                t.out_amt,
-               t.return_qty,
+               sys.f_remove_zero(t.return_qty) as  return_qty,
                t.return_amt,
                t.out_date,
                t.remarks,
@@ -511,11 +513,11 @@
                t.sup_id,
                t.out_status,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName",
-               t.outing_qty,
+               sys.f_remove_zero(t.outing_qty) as outing_qty,
                t.outing_amt,
-               t.out_qty,
+               sys.f_remove_zero(t.out_qty) as  out_qty,
                t.out_amt,
-               t.return_qty,
+               sys.f_remove_zero(t.return_qty) as  return_qty,
                t.return_amt,
                t.out_date,
                t.remarks,
@@ -687,11 +689,11 @@
         tpo.cus_id,
         tpo.sup_id,
         tpo.out_status,
-        tpo.outing_qty ,
+        sys.f_remove_zero(tpo.outing_qty) as  outing_qty ,
         tpo.outing_amt,
-        tpo.out_qty ,
+        sys.f_remove_zero(tpo.out_qty) as   out_qty ,
         tpo.out_amt ,
-        tpo.return_qty,
+        sys.f_remove_zero(tpo.return_qty) as  return_qty,
         tpo.return_amt,
         tpo.out_date ,
         tpo.remarks,
@@ -715,11 +717,11 @@
         tpi.cus_id,
         tpi.sup_id,
         tpi.into_status as out_status ,
-        tpi.intoing_qty as outing_qty ,
+        sys.f_remove_zero(tpi.intoing_qty)   as outing_qty ,
         tpi.intoing_amt as outing_amt ,
-        tpi.into_qty as out_qty ,
+        sys.f_remove_zero(tpi.into_qty)   as out_qty ,
         tpi.into_amt as out_amt,
-        tpi.return_qty,
+        sys.f_remove_zero(tpi.return_qty) as  tpi.return_qty,
         tpi.return_amt,
         tpi.into_date as out_date,
         tpi.remarks,
@@ -1023,11 +1025,11 @@
                t.sup_id,
                t.out_status,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName",
-               t.outing_qty,
+        sys.f_remove_zero(t.outing_qty) as  outing_qty,
                t.outing_amt,
-               t.out_qty,
+        sys.f_remove_zero(t.out_qty) as  out_qty,
                t.out_amt,
-               t.return_qty,
+        sys.f_remove_zero(t.return_qty) as  return_qty,
                t.return_amt,
                t.out_date,
                t.remarks,
@@ -1078,11 +1080,11 @@
                     tpoi.price_out  AS "list_price_out",
                     tpoi.non_std_code  AS "list_non_std_code",
                     tpoi.out_status  AS "list_out_status",
-                    tpoi.outing_qty  AS "list_outing_qty",
+                    sys.f_remove_zero(tpoi.outing_qty)  AS "list_outing_qty",
                     tpoi.outing_amt  AS "list_outing_amt",
-        tpoi.out_qty  AS "list_out_qty",
+        sys.f_remove_zero(tpoi.out_qty)   AS "list_out_qty",
                     tpoi.out_amt  AS "list_out_amt",
-                    tpoi.return_qty  AS "list_return_qty",
+                    sys.f_remove_zero(tpoi.return_qty)   AS "list_return_qty",
                     tpoi.return_amt  AS "list_return_amt",
                     tpoi.remarks  AS "list_remarks",
                     tpoi.inv_id  AS "list_inv_id",

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

@@ -5,13 +5,15 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, transfer_id, transfer_date, item_index,sub_unit_id, unit_id,pack_box,box, piece, sku_id, o_inv_id, inv_id, o_wh_id, transfer_qty, wh_id, o_non_std_code, non_std_code, price_into, intoing_amt, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, transfer_id, transfer_date, item_index,sub_unit_id, unit_id,pack_box,box, piece, sku_id, o_inv_id, inv_id, o_wh_id,
+    sys.f_remove_zero(transfer_qty) as transfer_qty, wh_id, o_non_std_code, non_std_code, price_into, intoing_amt, flg_valid, cp_id,
+    op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 一览查询列 -->
     <sql id="Base_Column_List_Response">
         item.item_id, item.transfer_id, item.transfer_date,item.box,item.piece, item.item_index, item.sku_id, item.o_inv_id, item.inv_id
-        , 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
+        , item.o_wh_id, sys.f_remove_zero(item.transfer_qty) as 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"

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

@@ -5,7 +5,11 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, pur_id, item_index, sku_id, item_qty, price_std, amt_std, price_pur, item_amt, price_discount, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, pur_id, item_index, sku_id, sys.f_remove_zero(item_qty) as item_qty, price_std, amt_std, price_pur,
+        item_amt, price_discount, non_std_code, into_status, sys.f_remove_zero(intoing_qty) as intoing_qty, intoing_amt,
+        sys.f_remove_zero(into_qty) as into_qty, into_amt, sys.f_remove_zero(return_qty) as return_qty, return_amt,
+        remarks, flg_valid, cp_id, op_create_time,
+        op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- Response通用查询列 -->
@@ -14,7 +18,7 @@
         tppi.pur_id,
         tppi.item_index,
         tppi.sku_id,
-        tppi.item_qty,
+        sys.f_remove_zero(tppi.item_qty) as item_qty,
         tppi.price_std as "pricePurchase",
         tppi.price_std,
         tppi.amt_std,
@@ -23,11 +27,11 @@
         tppi.price_discount,
         tppi.non_std_code,
         tppi.into_status,
-        tppi.intoing_qty,
+        sys.f_remove_zero(tppi.intoing_qty) as intoing_qty,
         tppi.intoing_amt,
-        tppi.into_qty,
+        sys.f_remove_zero(tppi.into_qty) as into_qty,
         tppi.into_amt,
-        tppi.return_qty,
+        sys.f_remove_zero(tppi.return_qty) as return_qty,
         tppi.return_amt,
         tppi.remarks,
         tppi.flg_valid,

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -26,10 +26,10 @@
         tmgs.price_limited as "priceLimited",
         tmgs.sku_images as "skuImages",
         tpi.non_std_code as "nonStdCode",
-        tpi.inv_qty as "invQty",
-        tpi.outing_qty as "outingQty",
-        tpi.usable_qty as "usableQty",
-        tpi.freeze_qty as "freezeQty",
+        sys.f_remove_zero(tpi.inv_qty) as "invQty",
+        sys.f_remove_zero(tpi.outing_qty) as "outingQty",
+        sys.f_remove_zero(tpi.usable_qty) as "usableQty",
+        sys.f_remove_zero(tpi.freeze_qty) as "freezeQty",
         tpi.wh_id as "whId",
         tmw.wh_code as "whCode",
         tmw.wh_name as "whName",
@@ -555,11 +555,11 @@
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "purTypeName"
         ,tpp.contact_name as "contactName"
         ,tpp.contact_phone as "contactPhone"
-        ,tpp.intoing_qty as "intoingQtySum"
+        ,sys.f_remove_zero(tpp.intoing_qty) as "intoingQtySum"
         ,tpp.intoing_amt as "intoingAmtSum"
-        ,tpp.into_qty as "intoQtySum"
+        ,sys.f_remove_zero(tpp.into_qty) as "intoQtySum"
         ,tpp.into_amt as "intoAmtSum"
-        ,tpp.return_qty as "returnInQtySum"
+        ,sys.f_remove_zero(tpp.return_qty) as "returnInQtySum"
         ,tpp.return_amt as "returnInAmtSum"
         ,tpp.amt_payable as "amtPayable"
         ,tpp.amt_residue as "amtResidue"
@@ -606,11 +606,11 @@
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "purTypeName"
         ,tpp.contact_name as "contactName"
         ,tpp.contact_phone as "contactPhone"
-        ,tpp.intoing_qty as "intoingQtySum"
+        ,sys.f_remove_zero(tpp.intoing_qty) as "intoingQtySum"
         ,tpp.intoing_amt as "intoingAmtSum"
-        ,tpp.into_qty as "intoQtySum"
+        ,sys.f_remove_zero(tpp.into_qty) as "intoQtySum"
         ,tpp.into_amt as "intoAmtSum"
-        ,tpp.return_qty as "returnQtySum"
+        ,sys.f_remove_zero(tpp.return_qty) as "returnQtySum"
         ,tpp.return_amt as "returnAmtSum"
         ,tpp.amt_payable as "amtPayable"
         ,tpp.amt_residue as "amtResidue"
@@ -628,14 +628,14 @@
         ,series.series_name as "seriesName"
         , sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "intoStatus"
         ,tppi.price_pur as "pricePur"
-        ,tppi.item_qty as "itemQty"
-        ,concat(tppi.item_qty ,tmgu.unit_name)  as "itemQtyPiece"
+        ,sys.f_remove_zero(tppi.item_qty) as "itemQty"
+        ,concat(sys.f_remove_zero(tppi.item_qty) ,tmgu.unit_name)  as "itemQtyPiece"
         ,tppi.item_amt as "itemAmt"
-        ,tppi.intoing_qty as "intoingQty"
+        ,sys.f_remove_zero(tppi.intoing_qty) as "intoingQty"
         ,tppi.intoing_amt as "intoingAmt"
-        ,tppi.into_qty as "intoQty"
+        ,sys.f_remove_zero(tppi.into_qty) as "intoQty"
         ,tppi.into_amt as "intoAmt"
-        ,tppi.return_qty as "returnQty"
+        ,sys.f_remove_zero(tppi.return_qty) as "returnQty"
         ,tppi.return_amt as "returnAmt"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tppi.box,tppi.piece) as "boxPiece"
         FROM dkic_b.t_psi_purchase as tpp
@@ -702,7 +702,7 @@
         t.sales_channel as "salesChannel",
         tmsc.channel_name as "channelName",
         t.delivery_date as "deliveryDate",
-        t.sum_quantity as "sumQuantity",
+        sys.f_remove_zero(t.sum_quantity) as "sumQuantity",
         t.sum_standard as "sumStandard",
         t.sum_amount as "sumAmount",
         t.sale_discount as "saleDiscount",
@@ -759,7 +759,7 @@
         ,t.sales_channel as "salesChannel"
         ,tmsc.channel_name as "channelName"
         ,t.delivery_date as "deliveryDate"
-        ,t.sum_quantity as "sumQuantity"
+        ,sys.f_remove_zero(t.sum_quantity) as "sumQuantity"
         ,t.sum_standard as "sumStandard"
         ,t.sum_amount as "sumAmount"
         ,t.sale_discount as "saleDiscount"
@@ -780,19 +780,19 @@
         ,tmgc.cat_name as "catName"
         ,series.series_name as "seriesName"
         ,toi.price_std as "priceStd"
-        ,toi.item_qty as "itemQty"
-        ,concat(toi.item_qty ,tmgu.unit_name)  as "itemQtyPiece"
+        ,sys.f_remove_zero(toi.item_qty) as "itemQty"
+        ,concat(sys.f_remove_zero(toi.item_qty) ,tmgu.unit_name)  as "itemQtyPiece"
         ,toi.amt_std as "amtStd"
         ,toi.price_sale as "priceSale"
         ,toi.item_amt as "itemAmt"
         ,toi.price_discount as "priceDiscount"
         ,tpo.out_no as "outNo"
         ,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) AS "outStatusName"
-        ,toi.outing_qty as "outingQty"
+        ,sys.f_remove_zero(toi.outing_qty) as "outingQty"
         ,toi.outing_amt as "outingAmt"
-        ,toi.out_qty as "outQty"
+        ,sys.f_remove_zero(toi.out_qty) as "outQty"
         ,toi.out_amt as "outAmt"
-        ,toi.return_qty as "returnQty"
+        ,sys.f_remove_zero(toi.return_qty) as "returnQty"
         ,toi.return_amt as "returnAmt"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,toi.box,toi.piece) as "boxPiece"
         FROM dkic_b.t_psi_order as t
@@ -859,11 +859,11 @@
         tmp.sup_name as "supplierName",
         sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName",
         sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "outTypeName",
-        t.outing_qty as "outingQtySum",
+        sys.f_remove_zero(t.outing_qty) as "outingQtySum",
         t.outing_amt as "outingAmtSum",
-        t.out_qty as "outQtySum",
+        sys.f_remove_zero(t.out_qty) as "outQtySum",
         t.out_amt as "outAmtSum",
-        t.return_qty as "returnOutQtySum",
+        sys.f_remove_zero(t.return_qty) as "returnOutQtySum",
         t.return_amt as "returnOutAmtSum",
         t.out_date as "outDate",
         t.make_time as "makeTime",
@@ -916,11 +916,11 @@
         ,tmp.sup_name as "supplierName"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "outStatusName"
         ,sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "outTypeName"
-        ,t.outing_qty as "outingQtySum"
+        ,sys.f_remove_zero(t.outing_qty) as "outingQtySum"
         ,t.outing_amt as "outingAmtSum"
-        ,t.out_qty as "outQtySum"
+        ,sys.f_remove_zero(t.out_qty) as "outQtySum"
         ,t.out_amt as "outAmtSum"
-        ,t.return_qty as "returnOutQtySum"
+        ,sys.f_remove_zero(t.return_qty) as "returnOutQtySum"
         ,t.return_amt as "returnOutAmtSum"
         ,t.out_date as "outDate"
         ,t.remarks
@@ -934,13 +934,13 @@
         ,tmw.wh_name as "whName"
         ,tmgc.cat_name as "catName"
         ,series.series_name as "seriesName"
-        ,tpoi.outing_qty as "outingQty"
-        ,concat(tpoi.outing_qty,tmgu.unit_name)  as "outingQtyPiece"
+        ,sys.f_remove_zero(tpoi.outing_qty) as "outingQty"
+        ,concat(sys.f_remove_zero(tpoi.outing_qty),tmgu.unit_name)  as "outingQtyPiece"
         ,tpoi.outing_amt as "outingAmt"
-        ,concat(tpoi.out_qty,tmgu.unit_name)   as "outQtyPiece"
-        ,tpoi.out_qty as "outQty"
+        ,concat(sys.f_remove_zero(tpoi.out_qty),tmgu.unit_name)   as "outQtyPiece"
+        ,sys.f_remove_zero(tpoi.out_qty) as "outQty"
         ,tpoi.out_amt as "outAmt"
-        ,tpoi.return_qty as "returnQty"
+        ,sys.f_remove_zero(tpoi.return_qty) as "returnQty"
         ,tpoi.return_amt as "returnAmt"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.outing_box,tpoi.outing_piece) as "outingBoxPiece"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.out_box,tpoi.out_piece) as "outBoxPiece"
@@ -1007,11 +1007,11 @@
         tmp.sup_name as "supplierName",
         sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName",
         sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "intoTypeName",
-        t.intoing_qty as "intoingQtySum",
+        sys.f_remove_zero(t.intoing_qty) as "intoingQtySum",
         t.intoing_amt as "intoingAmtSum",
-        t.into_qty as "intoQtySum",
+        sys.f_remove_zero(t.into_qty) as "intoQtySum",
         t.into_amt as "intoAmtSum",
-        t.return_qty as "returnintoQtySum",
+        sys.f_remove_zero(t.return_qty) as "returnintoQtySum",
         t.return_amt as "returnintoAmtSum",
         t.into_date as "intoDate",
         tmw.wh_name as "whName",
@@ -1067,11 +1067,11 @@
         ,tmp.sup_name as "supplierName"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"
         ,sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) as "intoTypeName"
-        ,t.intoing_qty as "intoingQtySum"
+        ,sys.f_remove_zero(t.intoing_qty) as "intoingQtySum"
         ,t.intoing_amt as "intoingAmtSum"
-        ,t.into_qty as "intoQtySum"
+        ,sys.f_remove_zero(t.into_qty) as "intoQtySum"
         ,t.into_amt as "intoAmtSum"
-        ,t.return_qty as "returnInQtySum"
+        ,sys.f_remove_zero(t.return_qty) as "returnInQtySum"
         ,t.return_amt as "returnInAmtSum"
         ,t.into_date as "intoDate"
         ,t.remarks
@@ -1085,13 +1085,13 @@
         ,tmw.wh_name as "whName"
         ,tmgc.cat_name as "catName"
         ,series.series_name as "seriesName"
-        ,tpoi.intoing_qty as "intoingQty"
-        ,concat(tpoi.intoing_qty,tmgu.unit_name)  as "intoingQtyPiece"
+        ,sys.f_remove_zero(tpoi.intoing_qty) as "intoingQty"
+        ,concat(sys.f_remove_zero(tpoi.intoing_qty),tmgu.unit_name)  as "intoingQtyPiece"
         ,tpoi.intoing_amt as "intoingAmt"
-        ,tpoi.into_qty as "intoQty"
-        ,concat(tpoi.into_qty,tmgu.unit_name)  as "intoQtyPiece"
+        ,sys.f_remove_zero(tpoi.into_qty) as "intoQty"
+        ,concat(sys.f_remove_zero(tpoi.into_qty),tmgu.unit_name)  as "intoQtyPiece"
         ,tpoi.into_amt as "intoAmt"
-        ,tpoi.return_qty as "returnQty"
+        ,sys.f_remove_zero(tpoi.return_qty) as "returnQty"
         ,tpoi.return_amt as "returnAmt"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.intoing_box,tpoi.intoing_piece) as "intoingBoxPiece"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.into_box,tpoi.into_piece) as "intoBoxPiece"
@@ -1196,7 +1196,7 @@
              ,tpo.order_no AS "orderNo"
              ,tpo.order_type AS "orderType"
              ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) AS "orderTypeName"
-             ,tpo.sum_quantity AS "sumQuantity"
+             ,sys.f_remove_zero(tpo.sum_quantity) AS "sumQuantity"
              ,tpo.sum_amount AS "sumAmount"
              ,tpo.sum_standard AS "sumStandard"
              ,tpo.sale_discount AS "saleDiscount"
@@ -1204,11 +1204,11 @@
              ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "orderStatusName"
              ,tpo.out_status AS "outStatus"
              ,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "outStatusName"
-             ,tpo.outing_qty AS "outingQty"
+             ,sys.f_remove_zero(tpo.outing_qty) AS "outingQty"
              ,tpo.outing_amt AS "outingAmt"
-             ,tpo.out_qty AS "outQty"
+             ,sys.f_remove_zero(tpo.out_qty) AS "outQty"
              ,tpo.out_amt AS "outAmt"
-             ,tpo.return_qty AS "returnQty"
+             ,sys.f_remove_zero(tpo.return_qty) AS "returnQty"
              ,tpo.return_amt AS "returnAmt"
              ,tpo.amt_receivable AS "amtReceivable"
              ,tpo.amt_handle AS "amtHandle"
@@ -1298,11 +1298,11 @@
             t.price_discount AS "priceDiscount",
             t.non_std_code AS "nonStdCode",
             t.out_status AS "outStatus",
-            t.outing_qty AS "outingQty",
+        sys.f_remove_zero(t.outing_qty) AS "outingQty",
             t.outing_amt AS "outingAmt",
-            t.out_qty AS "outQty",
+        sys.f_remove_zero(t.out_qty) AS "outQty",
             t.out_amt AS "outAmt",
-            t.return_qty AS "returnQty",
+        sys.f_remove_zero(t.return_qty) AS "returnQty",
             t.return_amt AS "returnAmt",
             t.remarks,
             t.wh_id AS "whId",
@@ -1456,12 +1456,12 @@
                     tmgs.sku_images AS "skuImages",
                     tmgb.brand_name AS "brandName",
                     tmgb.short_name AS "shortName",
-                    tpo.return_qty AS "returnQty",
-                    tpo.out_qty AS "outQty",
-                    tpo.outing_qty AS "outingQty",
+                    sys.f_remove_zero(tpo.return_qty) AS "returnQty",
+                    sys.f_remove_zero(tpo.out_qty) AS "outQty",
+                    sys.f_remove_zero(tpo.outing_qty) AS "outingQty",
                     tpoi.price_sale AS "priceSale",
-                    tpoi.item_qty AS "itemQty",
-                    tpo.sum_quantity AS "sumQuantity",
+                    sys.f_remove_zero(tpoi.item_qty) AS "itemQty",
+                    sys.f_remove_zero(tpo.sum_quantity) AS "sumQuantity",
                     tpo.sum_amount AS "sumAmount",
                     0.00 AS "sumAmtRec",
                     0.00 AS "sumShouldHandle",
@@ -1491,14 +1491,14 @@
                     tmgs.sku_images AS "skuImages",
                     tmgb.brand_name AS "brandName",
                     tmgb.short_name AS "shortName",
-                    tpob.return_qty AS "returnQty",
-                    tpob.out_qty AS "outQty",
-                    tpob.outing_qty AS "outingQty",
+                    sys.f_remove_zero(tpob.return_qty) AS "returnQty",
+                    sys.f_remove_zero(tpob.out_qty) AS "outQty",
+                    sys.f_remove_zero(tpob.outing_qty) AS "outingQty",
                     tpobi.price_out AS "priceSale",
                     CASE
 
                     WHEN tpobi.out_status = '出库状态-出库中' THEN
-                    tpobi.outing_qty ELSE tpobi.out_qty
+                    sys.f_remove_zero(tpobi.outing_qty) ELSE sys.f_remove_zero(tpobi.out_qty)
                     END AS "itemQty",
                     0.00 AS "sumQuantity",
                     0.00 AS "sumAmount",
@@ -1529,14 +1529,14 @@
                     tmgs.sku_images AS "skuImages",
                     tmgb.brand_name AS "brandName",
                     tmgb.short_name AS "shortName",
-                    tpob.return_qty AS "returnQty",
-                    tpob.out_qty AS "outQty",
-                    tpob.outing_qty AS "outingQty",
+                    sys.f_remove_zero(tpob.return_qty) AS "returnQty",
+                    sys.f_remove_zero(tpob.out_qty) AS "outQty",
+                    sys.f_remove_zero(tpob.outing_qty) AS "outingQty",
                     tpobi.price_out AS "priceSale",
                     CASE
 
                     WHEN tpobi.out_status = '出库状态-出库中' THEN
-                    tpobi.outing_qty ELSE tpobi.out_qty
+                    sys.f_remove_zero(tpobi.outing_qty) ELSE sys.f_remove_zero(tpobi.out_qty)
                     END AS "itemQty",
                     0.00 AS "sumQuantity",
                     0.00 AS "sumAmount",
@@ -1605,7 +1605,7 @@
         ,tpp.contact_phone AS "contactPhone"
         ,tpp.wh_id AS "whId"
         ,tpp.pickup_date AS "pickupDate"
-        ,tpp.sum_quantity AS "sumQuantity"
+        ,sys.f_remove_zero(tpp.sum_quantity) AS "sumQuantity"
         ,tpp.sum_standard AS "sumStandard"
         ,tpp.sum_amount AS "sumAmount"
         ,tpp.pur_discount AS "purDiscount"
@@ -1613,11 +1613,11 @@
         ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "purStatusName"
         ,tpp.into_status AS "intoStatus"
         ,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "intoStatusName"
-        ,tpp.intoing_qty AS "intoingQty"
+        ,sys.f_remove_zero(tpp.intoing_qty) AS "intoingQty"
         ,tpp.intoing_amt AS "intoingAmt"
-        ,tpp.into_qty AS "intoQty"
+        ,sys.f_remove_zero(tpp.into_qty) AS "intoQty"
         ,tpp.into_amt AS "intoAmt"
-        ,tpp.return_qty AS "returnQty"
+        ,sys.f_remove_zero(tpp.return_qty) AS "returnQty"
         ,tpp.return_amt AS "returnAmt"
         ,tpp.amt_payable AS "amtPayable"
         ,tpp.amt_handle AS "amtHandle"
@@ -1735,10 +1735,10 @@
                      ,tpp.contact_phone AS "contactPhone"
                      ,tpp.wh_id AS "whId"
                      ,tpp.pickup_date AS "pickupDate"
-                     ,tpp.sum_quantity AS "sumQuantity"
+                     ,sys.f_remove_zero(tpp.sum_quantity) AS "sumQuantity"
                      ,tpp.sum_amount AS "sumAmount"
-                     ,tpp.into_qty AS "intoQty"
-                     ,tpp.return_qty AS "returnQty"
+                     ,sys.f_remove_zero(tpp.into_qty) AS "intoQty"
+                     ,sys.f_remove_zero(tpp.return_qty) AS "returnQty"
                      ,0.00 AS "sumAmtRec"
                      ,0.00 AS "sumShouldHandle"
                      ,0.00 AS "sumUsePaymentResidue"
@@ -1753,7 +1753,7 @@
                      ,tmgb.brand_name AS "brandName"
                      ,tmgb.short_name AS "shortName"
                      ,tppi.price_pur AS "pricePur"
-                     ,tppi.item_qty AS "itemQty"
+                     ,sys.f_remove_zero(tppi.item_qty) AS "itemQty"
                      ,tppi.remarks AS "remarks"
                      ,tpp.make_time AS  "makeTime"
                 FROM
@@ -1830,8 +1830,8 @@
                         ,tmgb.short_name AS "shortName"
                         ,tpii.price_into AS "pricePur"
                         , CASE
-                    WHEN tpii.into_status = '入库状态-入库中' THEN  tpii.intoing_qty
-                    ELSE tpii.into_qty
+                    WHEN tpii.into_status = '入库状态-入库中' THEN  sys.f_remove_zero(tpii.intoing_qty)
+                    ELSE sys.f_remove_zero(tpii.into_qty)
                     END AS "itemQty"
                         ,tpii.remarks AS "remarks"
                         ,tpi.make_time AS  "makeTime"
@@ -2004,7 +2004,7 @@
         T.sales_channel AS "salesChannel",
         tmsc.channel_name AS "channelName",
         T.delivery_date AS "deliveryDate",
-        T.sum_quantity AS "sumQuantity",
+        sys.f_remove_zero(T.sum_quantity) AS "sumQuantity",
         T.sum_standard AS "sumStandard",
         T.sum_amount AS "sumAmount",
         T.sale_discount AS "saleDiscount",
@@ -2012,11 +2012,11 @@
         sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) AS "orderStatusName",
         T.out_status AS "orderStatus",
         sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) AS "outStatusName",
-        T.outing_qty AS "outingQty",
+        sys.f_remove_zero(T.outing_qty) AS "outingQty",
         T.outing_amt AS "outingAmt",
-        T.out_qty AS "outQty",
+        sys.f_remove_zero(T.out_qty) AS "outQty",
         T.out_amt AS "outAmt",
-        T.return_qty AS "returnQty",
+        sys.f_remove_zero(T.return_qty) AS "returnQty",
         T.return_amt AS "returnAmt",
         T.amt_receivable AS "amtReceivable",
         T.amt_handle AS "amtHandle",
@@ -2120,11 +2120,11 @@
         T.out_status AS "outStatus",
         sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) AS "outStatusName",
         sys.f_get_name_i18n(tdktype.kind_name_i18n, #{i18n}) AS  "outTypeName",
-        T.outing_qty AS "outingQty",
+        sys.f_remove_zero(T.outing_qty) AS "outingQty",
         T.outing_amt AS "outingAmt",
-        T.out_qty AS "outQty",
+        sys.f_remove_zero(T.out_qty) AS "outQty",
         T.out_amt AS "outAmt",
-        T.return_qty AS "returnQty",
+        sys.f_remove_zero(T.return_qty) AS "returnQty",
         T.return_amt AS "returnAmt",
         T.out_date AS "outDate",
         T.remarks AS "remarks",

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

@@ -47,6 +47,10 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
 
+    @Excel(name = "使用位置")
+    @ApiModelProperty(value = "使用位置")
+    private String usePlace;
+
 
     /**
      * 出库ID
@@ -220,6 +224,21 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(fill = FieldFill.INSERT)
     private Integer cpId;
 
+    /**
+     * 商品名称--skuid空的时候要取当前的名称
+     */
+    @Excel(name = "商品名称")
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
+
+    /**
+     * 商品型号--skuid空的时候要取当前的商品型号
+     */
+    @Excel(name = "商品型号")
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
+
 
     /**
      * 创建时间 (触发器自动处理)

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

@@ -363,6 +363,10 @@ public class OutboundItemResponse {
     @ApiModelProperty(value = "基本单位名称")
     private String unitName;
 
+    @Excel(name = "使用位置")
+    @ApiModelProperty(value = "使用位置")
+    private String usePlace;
+
     @Excel(name = "包装单位编码")
     @ApiModelProperty(value = "包装单位编码")
     private String subUnitCode;

src/main/java/com/dk/mdm/model/vo/ivt/InboundItemVO.java

@@ -144,6 +144,11 @@ public class InboundItemVO  {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
+
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
 
     /**
      * 库存ID

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -38,6 +38,9 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
+    @Excel(name = "使用位置")
+    @ApiModelProperty(value = "使用位置")
+    private String usePlace;
 
     /**
      * 入库金额
@@ -202,7 +205,18 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "片（已出库）")
     private  Integer outPiece;
 
+    /**
+     * 商品名称--skuid空的时候要取当前的名称
+     */
+    @ApiModelProperty(value = "商品名称")
+    private String skuName;
+
 
+    /**
+     * 商品型号--skuid空的时候要取当前的商品型号
+     */
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
 
     /**
      * 企业ID

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -521,7 +521,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsBrandListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsBrandListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
@@ -544,7 +544,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 姜永辉
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<List<Map<String, Object>>> goodsBrandListNoPage(Map<String, Object> param) {
+    public ResponseResultVO<List<Map<String, Object>>> getGoodsBrandListNoPage(Map<String, Object> param) {
         // 获取公司
         List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
         return ResponseResultUtil.success(list);
@@ -555,7 +555,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsCategoryListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsCategoryListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
@@ -578,7 +578,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> goodsSeriesListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getGoodsSeriesListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
@@ -601,7 +601,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
      * @author : 王英杰
      * @date : 2024/3/1 9:20
      */
-    public ResponseResultVO<PageList<Map<String, Object>>> unitListBy(Map<String, Object> param) {
+    public ResponseResultVO<PageList<Map<String, Object>>> getUnitListBy(Map<String, Object> param) {
         // 校验分页参数
         if (param.get("pageSize") == null || param.get("currentPage") == null) {
             return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -644,9 +644,9 @@ public class InventoryService extends BaseService<Inventory> {
 
                     inOutRecordVO.setInvId(inventoryResponse.getInvId());
 
-                    //region 库存批次 编辑
-                    this.updateInventoryBatch(inOutRecordVO);
-                    //endregion
+                    //修改库存数量
+                    this.updateInventoryMessageAdd(inventoryResponse, inOutRecordVO);
+
 
                     //region  修改/新建   库存数量，可用量，金额等信息
                     //销售退货出库  新建库存批次
@@ -655,7 +655,7 @@ public class InventoryService extends BaseService<Inventory> {
                     }
                     //其他类型出库   修改库存数量，可用量，金额等信息
                     else {
-                        this.updateInventoryMessageAdd(inventoryResponse, inOutRecordVO);
+                        this.updateInventoryBatch(inOutRecordVO);
                     }
                     //endregion