订单相关

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -830,42 +830,44 @@
 
     <!-- 查询库存 -->
     <select id="getInventory" resultType="java.util.Map">
-        select tpi.sku_id            as "skuId",
-        tmgs.sku_code          as "skuCode",
-        tmgs.sku_name          as "skuName",
-        tmgs.sku_model         as "skuModel",
-        tmgs.brand_id          as "brandId",
-        tmgb.brand_name        as "brandName",
-        tmgs.category_id       as "categoryId",
-        tmgc.cat_name          as "categoryName",
-        tmgs.unit_id           as "unitId",
-        tmgu.unit_name         as "unitName",
-        tmgs.sub_unit_id       as "subUnitId",
-        tmgs.conversion_factor as "conversionFactor",
-        tmgs.series_id         as "seriesId",
-        tmgseries.series_name  as "seriesName",
-        tmgs.sku_spec          as "skuSpec",
-        tmgs.price_purchase    as "pricePurchase",
-        tmgs.price_standard    as "priceStandard",
-        tmgs.price_wholesale   as "priceWholesale",
-        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",
-        tmw.wh_code            as "whCode",
-        tmw.wh_name            as "whName",
-        tpi.remarks
+        select tpi.inv_id             as "invId",
+               tpi.sku_id             as "skuId",
+               tmgs.sku_code          as "skuCode",
+               tmgs.sku_name          as "skuName",
+               tmgs.sku_model         as "skuModel",
+               tmgs.brand_id          as "brandId",
+               tmgb.brand_name        as "brandName",
+               tmgs.category_id       as "categoryId",
+               tmgc.cat_name          as "categoryName",
+               tmgs.unit_id           as "unitId",
+               tmgu.unit_name         as "unitName",
+               tmgs.sub_unit_id       as "subUnitId",
+               tmgs.conversion_factor as "conversionFactor",
+               tmgs.series_id         as "seriesId",
+               tmgseries.series_name  as "seriesName",
+               tmgs.sku_spec          as "skuSpec",
+               tmgs.price_purchase    as "pricePurchase",
+               tmgs.price_standard    as "priceStandard",
+               tmgs.price_wholesale   as "priceWholesale",
+               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.wh_id              as "whId",
+               tmw.wh_code            as "whCode",
+               tmw.wh_name            as "whName",
+               tpi.remarks
         from dkic_b.t_psi_inventory as tpi
-        inner join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
-        inner join dkic_b.t_mst_goods_sku as tmgs on tmgs.sku_id = tpi.sku_id
-        left join dkic_b.t_mst_goods_brand as tmgb on tmgs.brand_id = tmgb.brand_id
-        left join dkic_b.t_mst_goods_category as tmgc on tmgs.category_id = tmgc.cat_id
-        left join dkic_b.t_mst_goods_series as tmgseries on tmgs.series_id = tmgseries.series_id
-        left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
+                 inner join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
+                 inner join dkic_b.t_mst_goods_sku as tmgs on tmgs.sku_id = tpi.sku_id
+                 left join dkic_b.t_mst_goods_brand as tmgb on tmgs.brand_id = tmgb.brand_id
+                 left join dkic_b.t_mst_goods_category as tmgc on tmgs.category_id = tmgc.cat_id
+                 left join dkic_b.t_mst_goods_series as tmgseries on tmgs.series_id = tmgseries.series_id
+                 left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
         where tpi.flg_valid
-        AND tpi.cp_id = #{cpId}
+          AND tpi.cp_id = #{cpId}
         <if test="skuId != null">
             AND tpi.sku_id = #{skuId} ::uuid
         </if>
@@ -873,13 +875,13 @@
             AND tpi.non_std_code = #{nonStdCode}
         </if>
         <if test="skuCode != null">
-            AND tmgs.sku_code = #{skuCode}
+            AND tmgs.sku_code LIKE concat('%',my_ex.likequery(#{skuCode}),'%')
         </if>
         <if test="skuName != null">
-            AND tmgs.sku_name = #{skuName}
+            AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
         <if test="whName != null">
-            AND tmgs.wh_name = #{whName}
+            AND tmgs.wh_name LIKE concat('%',my_ex.likequery(#{whName}),'%')
         </if>
     </select>
 

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

@@ -291,7 +291,7 @@
         </foreach>
     </insert>
 
-    <!-- 根据条件进行查询（出库用） -->
+    <!-- 根据条件进行查询（出库编辑用） -->
     <select id="selectByCondForOutEdit" resultMap="BaseResultMapResponse">
         SELECT t.item_id,
                t.out_id,

src/main/java/com/dk/mdm/mapper/sale/OutReturnItemMapper.java

@@ -3,6 +3,7 @@ package com.dk.mdm.mapper.sale;
 import com.dk.mdm.model.pojo.sale.OutReturnItem;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.sale.OutReturnItemQuery;
+import com.dk.mdm.model.response.ivt.OutboundItemResponse;
 import com.dk.mdm.model.response.sale.OutReturnItemResponse;
 import org.springframework.stereotype.Repository;
 
@@ -33,5 +34,12 @@ public interface OutReturnItemMapper extends BaseMapper<OutReturnItem>{
      * @date   : 2024-03-09 11:36
      */
     List<OutReturnItem> selectByZIdForUpdate(String id);
+
+    /**
+     * @desc   : 获取退货信息（编辑用）
+     * @author : 付斌
+     * @date   : 2024-03-12 11:07
+     */
+    List<OutReturnItemResponse> selectByCondForReturnEdit(String id);
 }
 

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

@@ -287,4 +287,39 @@
             )
         </foreach>
     </insert>
+
+    <!-- 根据条件进行查询（退货编辑用） -->
+    <select id="selectByCondForReturnEdit" resultMap="BaseResultMapResponse">
+        SELECT t.item_id,
+               t.out_id,
+               t.from_item_id,
+               t.from_id,
+               t.item_index,
+               t.sku_id,
+               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 + t.outing_qty as "canOutingQty",
+               t.outing_qty,
+               t.price_out,
+               t.outing_amt,
+               t.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"
+        FROM 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_mst_goods_sku tmgs on tpoi.sku_id = tmgs.sku_id
+                 left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = t.inv_id
+                 left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
+        where t.flg_valid
+          and t.out_id = #{id}::uuid
+        order by t.item_index
+    </select>
 </mapper>

src/main/java/com/dk/mdm/service/ivt/OutboundService.java

@@ -303,8 +303,8 @@ public class OutboundService extends BaseService<Outbound> {
         outboundInfo.put("outbound", outboundResponse);
 
         // 商品明细
-        List<OutboundItemResponse> outboundItemResponse = outboundItemMapper.selectByCondForOutEdit(id);
-        outboundInfo.put("outboundItem", outboundItemResponse);
+        List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCondForOutEdit(id);
+        outboundInfo.put("outboundItem", outboundItemResponseList);
         return ResponseResultUtil.success(outboundInfo);
     }
 

src/main/java/com/dk/mdm/service/sale/OutReturnService.java

@@ -27,6 +27,8 @@ import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.sale.OutReturnItemQuery;
 import com.dk.mdm.model.query.sale.OutReturnQuery;
+import com.dk.mdm.model.response.ivt.OutboundItemResponse;
+import com.dk.mdm.model.response.ivt.OutboundResponse;
 import com.dk.mdm.model.response.sale.OutReturnItemResponse;
 import com.dk.mdm.model.response.sale.OutReturnResponse;
 import com.dk.mdm.model.vo.sale.OutReturnItemVO;
@@ -289,4 +291,20 @@ public class OutReturnService extends BaseService<OutReturn> {
                 UUID.fromString(outReturnForUpdate.getReturnId())));
         return ResponseResultUtil.success();
     }
+
+    /**
+     * @desc : 获取退货信息（编辑用）
+     * @author : 付斌
+     * @date : 2024-03-02 17:27
+     */
+    public ResponseResultVO<?> getOutReturnForUpdate(String id) {
+        Map<String, Object> outReturnInfo = new HashMap<>();
+        OutReturnResponse outReturnResponse = outReturnMapper.selectById(id);
+        outReturnInfo.put("outReturn", outReturnResponse);
+
+        // 商品明细
+        List<OutReturnItemResponse> outReturnItemResponseList = outReturnItemMapper.selectByCondForReturnEdit(id);
+        outReturnInfo.put("outReturnItem", outReturnItemResponseList);
+        return ResponseResultUtil.success(outReturnInfo);
+    }
 }