商品名称修改功能调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/WareHouseDetailedMapper.java

@@ -43,8 +43,11 @@ public interface WareHouseDetailedMapper extends BaseMapper<WareHouseDetailed> {
     // 根据入库id删除关联附件  物理删除
     void deleteFilesByIdList(List<String> attachmentIdList);
 
-    // 根据商品名称修改
-    void saveTradeName(@Param("oldTradeName") String oldTradeName, @Param("tradeName") String tradeName);
+    // 修改入库详情商品名称
+    void saveTradeName(@Param("oldTradeName") String oldTradeName, @Param("tradeName") String tradeName, @Param("wareHouseType") String wareHouseType);
+
+    // 修改领用详情商品名称
+    void saveGoodsName(@Param("oldTradeName") String oldTradeName, @Param("tradeName") String tradeName, @Param("wareHouseType") String wareHouseType);
 
     // 根据入库类型查询商品
     List<WareHouseDetailed> getByTypeId(String typeId);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseDetailedMapper.xml

@@ -55,7 +55,14 @@
         </foreach>
     </delete>
     <update id="saveTradeName">
-        update material_management_warehouse_detailed set trade_name = #{tradeName} where trade_name = #{oldTradeName}
+        update material_management_warehouse_detailed set
+        trade_name = #{tradeName}
+        where trade_name = #{oldTradeName} and ware_house_type = #{wareHouseType} and del_flag = '0'
+    </update>
+    <update id="saveGoodsName">
+        update material_management_collect_detailed set
+        goods_name = #{tradeName}
+        where goods_name = #{oldTradeName} and collect_type = #{wareHouseType} and del_flag = '0'
     </update>
     <select id="getByTypeId" resultType="com.jeeplus.test.materialManagement.wareHouse.domain.WareHouseDetailed">
         SELECT

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -948,8 +948,11 @@ public class WareHouseBasicService {
 
     public void saveTradeName (WareHouseDto wareHouseDto) {
         if (ObjectUtil.isNotEmpty(wareHouseDto)) {
-            if (StringUtils.isNotBlank(wareHouseDto.getOldTradeName()) && StringUtils.isNotBlank(wareHouseDto.getTradeName())) {
-                detailedMapper.saveTradeName(wareHouseDto.getOldTradeName(), wareHouseDto.getTradeName());
+            if (StringUtils.isNotBlank(wareHouseDto.getOldTradeName()) && StringUtils.isNotBlank(wareHouseDto.getTradeName()) && StringUtils.isNotBlank(wareHouseDto.getWareHouseType())) {
+                // 修改入库详情 商品名称
+                detailedMapper.saveTradeName(wareHouseDto.getOldTradeName(), wareHouseDto.getTradeName(), wareHouseDto.getWareHouseType());
+                // 修改领用详情 商品名称
+                detailedMapper.saveGoodsName(wareHouseDto.getOldTradeName(), wareHouseDto.getTradeName(), wareHouseDto.getWareHouseType());
             }
         }
     }