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

src/main/java/com/dk/mdm/controller/mst/GoodsSkuController.java

@@ -103,4 +103,13 @@ public class GoodsSkuController{
        return goodsSkuService.importSKU(list,response,cpId);
     }
 
+    /**
+     * @desc : 保存修改数据
+     * @author : 刘尧
+     * @date : 2024/6/17 13:50
+     */
+    @PostMapping("/saveUpdateList")
+    public ResponseResultVO<?> saveUpdateList(@RequestBody List<GoodsSkuVO> goodsSkuVOS){
+        return goodsSkuService.saveUpdateList(goodsSkuVOS);
+    }
 }

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

@@ -589,8 +589,8 @@
         <include refid="Base_Column_List_Response"/>
         ,tpid.into_no as "intoNo"
         ,tmgs.sku_code  as "skuCode"
-        ,tpii.sku_model as "skuModel"
-        ,tpii.sku_name  as "skuName"
+        ,tmgs.sku_model as "skuModel"
+        ,tmgs.sku_name  as "skuName"
         ,tmgs.sku_spec  as "skuSpec"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"
@@ -669,6 +669,9 @@
                 AND tpii.into_status =
                 any(#{intoStatusList, typeHandler= StringListTypeHandler})
             </if>
+            <if test="skuModel != null and skuModel != ''">
+                AND tmgs.sku_model LIKE concat('%',my_ex.likequery(#{skuModel}),'%')
+            </if>
             <if test="searchText !=null">
                 AND  (tpid.into_no LIKE concat('%',my_ex.likequery(#{searchText}), '%')    OR   tmgs.sku_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')   OR   tmgs.sku_code LIKE concat('%',my_ex.likequery(#{searchText}),'%'))
             </if>
@@ -682,6 +685,7 @@
     <update id="updateCost" parameterType="com.dk.mdm.model.pojo.ivt.InboundItem">
         update dkic_b.t_psi_inbound_item
         <set>
+            flg_cost_check = true,
             <if test="costPrice!= null">
                 cost_price= #{costPrice},
             </if>

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

@@ -312,8 +312,8 @@
         FROM dkic_b.t_psi_inventory tpi
         <include refid="Join_Table"/>
         <where>
-            (tmgs.warning_lower_limit &lt;&gt; 0 AND tpi.inv_qty &lt; tmgs.warning_lower_limit)
-            OR (tmgs.warning_upper_limit &lt;&gt; 0 AND tpi.inv_qty > tmgs.warning_upper_limit)
+            ((tmgs.warning_lower_limit &lt;&gt; 0 AND tpi.inv_qty &lt; tmgs.warning_lower_limit)
+            OR (tmgs.warning_upper_limit &lt;&gt; 0 AND tpi.inv_qty > tmgs.warning_upper_limit))
             <if test="whId != null and whId != ''">
                 AND tpi.wh_id = #{whId}::UUID
             </if>
@@ -360,7 +360,7 @@
             <if test="brandId != null and brandId != ''">
                 AND tmgs.brand_id = #{brandId}::UUID
             </if>
-            <if test="searchText != null">
+            <if test="searchText != null and searchText != ''">
                 AND (tmgs.sku_model  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  tpi.non_std_code like concat('%', my_ex.likequery(#{searchText}) , '%')
@@ -391,8 +391,8 @@
         LEFT JOIN dkic_b.t_mst_unit tmu ON tmu.unit_id = tmgs.unit_id
         LEFT JOIN dkic_b.t_mst_unit subtmu ON subtmu.unit_id = tmgs.sub_unit_id
         <where>
-            (tmgs.warning_lower_limit &lt;&gt; 0 AND tpi.inv_qty &lt; tmgs.warning_lower_limit)
-            OR (tmgs.warning_upper_limit &lt;&gt; 0 AND tpi.inv_qty > tmgs.warning_upper_limit)
+            ((tmgs.warning_lower_limit &lt;&gt; 0 AND tpi.inv_qty &lt; tmgs.warning_lower_limit)
+            OR (tmgs.warning_upper_limit &lt;&gt; 0 AND tpi.inv_qty > tmgs.warning_upper_limit))
             <if test="flgValid != null">
                 AND tpi.flg_valid = #{flgValid}
             </if>
@@ -408,7 +408,7 @@
             <if test="brandId != null and brandId != ''">
                 AND tmgs.brand_id = #{brandId}::UUID
             </if>
-            <if test="searchText != null">
+            <if test="searchText != null and searchText != ''">
                 AND (tmgs.sku_model  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  tpi.non_std_code like concat('%', my_ex.likequery(#{searchText}) , '%')

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.java

@@ -6,6 +6,8 @@ import com.dk.mdm.model.query.mst.GoodsSkuQuery;
 import com.dk.mdm.model.query.mst.RoleQuery;
 import com.dk.mdm.model.response.mst.GoodsSkuResponse;
 import com.dk.mdm.model.response.mst.RoleResponse;
+import com.dk.mdm.model.vo.mst.GoodsSkuVO;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -28,5 +30,12 @@ public interface GoodsSkuMapper extends BaseMapper<GoodsSku>{
      * @date : 2024/2/26 10:36
      */
     Long countByCond(GoodsSkuQuery goodsSkuQuery);
+
+    /**
+     * @desc : 更新预警信息
+     * @author : 刘尧
+     * @date : 2024/6/17 13:50
+     */
+    Boolean saveWarningList(@Param("list") List<GoodsSkuVO> goodsSkuVOS);
 }
 

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -10,6 +10,14 @@
         , 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, warning_upper_limit, warning_lower_limit
     </sql>
+    <!--  更新预警信息  -->
+    <update id="saveWarningList">
+        <foreach collection="list" item="item" index="index" separator=";">
+            UPDATE dkic_b.t_mst_goods_sku
+            SET warning_lower_limit = #{item.warningLowerLimit}, warning_upper_limit = #{item.warningUpperLimit}
+            WHERE sku_id = #{item.skuId}::uuid
+        </foreach>
+    </update>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.GoodsSku">

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

@@ -2228,7 +2228,7 @@ public class InventoryService extends BaseService<Inventory> {
                 item.setWarningMsg("超出警戒上限" + "(" + warningUpperLimit + item.getUnitName() + ")");
             }
             if (warningLowerLimit != 0 && invQty < warningLowerLimit){
-                item.setWarningMsg("超出警戒下限" + "(" + warningLowerLimit + item.getUnitName() + ")");
+                item.setWarningMsg("低于警戒下限" + "(" + warningLowerLimit + item.getUnitName() + ")");
             }
         });
 

src/main/java/com/dk/mdm/service/mst/GoodsSkuService.java

@@ -294,4 +294,8 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 		}
 	}
 
+    public ResponseResultVO<?> saveUpdateList(List<GoodsSkuVO> goodsSkuVOS) {
+		Boolean saveBoolean = goodsSkuMapper.saveWarningList(goodsSkuVOS);
+		return ResponseResultUtil.success();
+    }
 }