已经完成

修改所属仓库与物料库位关系绑定

ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java

@@ -3,8 +3,10 @@ package com.ruoyi.web.controller.basic;
 import java.util.List;
 
 import com.ruoyi.system.domain.BaseEfficiencyLevel;
+import com.ruoyi.system.domain.BaseMaterialStore;
 import com.ruoyi.system.domain.BaseStoreInfo;
 import com.ruoyi.system.service.IBaseEfficiencyLevelService;
+import com.ruoyi.system.service.IBaseMaterialStoreService;
 import com.ruoyi.system.service.IBaseStoreInfoService;
 import com.ruoyi.web.controller.tool.UUIDTool;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -46,6 +48,9 @@ public class BaseLocationInfoController extends BaseController
     @Autowired
     private IBaseStoreInfoService baseStoreInfoService;
 
+    @Autowired
+    private IBaseMaterialStoreService baseMaterialStoreService;
+
     @RequiresPermissions("system:baselocationinfo:view")
     @GetMapping()
     public String baselocationinfo()
@@ -129,8 +134,23 @@ public class BaseLocationInfoController extends BaseController
     @ResponseBody
     public AjaxResult editSave(BaseLocationInfo baseLocationInfo)
     {
+        BaseMaterialStore baseMaterialStore = new BaseMaterialStore();
+        baseMaterialStore.setLocationCode(baseLocationInfo.getLocationCode());
+        baseMaterialStore.setMaterialType(baseLocationInfo.getMaterialType());
+        baseMaterialStore.setLocationCode(baseLocationInfo.getLocationCode());
+        baseMaterialStore.setLocationStatus(baseLocationInfo.getLocationStatus());
+        baseMaterialStore.setLocationArea(baseLocationInfo.getLocationArea());
+        baseMaterialStore.setDeleteFlag(baseLocationInfo.getDeleteFlag());
+        baseMaterialStore.setRecordTime(baseLocationInfo.getRecordTime());
+        int baseMaterialStoreCounts = baseMaterialStoreService.updateBaseMaterialStoreByPosition(baseMaterialStore);
+        int baseLocationInfoCounts = baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo);
+
+        if(baseMaterialStoreCounts >0 && baseLocationInfoCounts>0){
             return toAjax(baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo));
         }
+        return toAjax(baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo));
+
+    }
 
     /**
      * 删除库位信息

ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html

@@ -31,7 +31,7 @@
                 <div class="col-sm-8">
                     <!--<input name="storeCode" th:field="*{storeCode}" class="form-control" type="text">  baseStoreInfoService.selectBaseStoreInfoList(baseStoreInfo)       -->
                     <select name="storeCode" class="form-control m-b" th:with="type=${@baseStoreInfoService.selectBaseStoreInfoList(null)}">
-                        <option th:each="dict : ${type}" th:text="${dict.storeName}" th:value="${dict.storeName}" th:field="*{storeCode}"></option>
+                        <option th:each="dict : ${type}" th:text="${dict.storeName}" th:value="${dict.storeCode}" th:field="*{storeCode}"></option>
                     </select>
 
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java

@@ -58,4 +58,12 @@ public interface BaseMaterialStoreMapper
      * @return 结果
      */
     public int deleteBaseMaterialStoreByObjids(String[] objids);
+
+    /**
+     *  修改库位信息同时修改物料库位关系
+     *
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    public int updateBaseMaterialStoreByPosition(BaseMaterialStore baseMaterialStore);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java

@@ -43,6 +43,14 @@ public interface IBaseMaterialStoreService
      */
     public int updateBaseMaterialStore(BaseMaterialStore baseMaterialStore);
 
+    /**
+     *  修改库位信息同时修改物料库位关系
+     *
+     * @param baseMaterialStore 物料库位关系
+     * @return 结果
+     */
+    public int updateBaseMaterialStoreByPosition(BaseMaterialStore baseMaterialStore);
+
     /**
      * 批量删除物料库位关系
      * 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java

@@ -68,6 +68,11 @@ public class BaseMaterialStoreServiceImpl implements IBaseMaterialStoreService
         return baseMaterialStoreMapper.updateBaseMaterialStore(baseMaterialStore);
     }
 
+    @Override
+    public int updateBaseMaterialStoreByPosition(BaseMaterialStore baseMaterialStore) {
+        return baseMaterialStoreMapper.updateBaseMaterialStoreByPosition(baseMaterialStore);
+    }
+
     /**
      * 批量删除物料库位关系
      * 

ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml

@@ -77,6 +77,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where objid = #{objid}
     </update>
 
+    <update id="updateBaseMaterialStoreByPosition" parameterType="BaseMaterialStore">
+        update base_material_store
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="materialCode != null">material_code = #{materialCode},</if>
+            <if test="materialType != null">material_type = #{materialType},</if>
+
+            <if test="locationStatus != null">location_status = #{locationStatus},</if>
+            <if test="locationArea != null">location_area = #{locationArea},</if>
+            <if test="deleteFlag != null">delete_flag = #{deleteFlag},</if>
+            <if test="recordTime != null">record_time = #{recordTime},</if>
+        </trim>
+        where location_code = #{locationCode}
+    </update>
+
     <delete id="deleteBaseMaterialStoreByObjid" parameterType="String">
         delete from base_material_store where objid = #{objid}
     </delete>