From f1027c45e89837fa297735515ddd88a7aca79f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A3=AE=E5=B1=BF=E6=B5=B7=E5=B7=B7?= <15711450175@163.com> Date: Fri, 24 Sep 2021 15:58:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=AE=8C=E6=88=90=20=20=20?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=89=80=E5=B1=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=B8=8E=E7=89=A9=E6=96=99=E5=BA=93=E4=BD=8D=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BaseLocationInfoController.java | 20 +++++++++++++++++++ .../system/baselocationinfo/edit.html | 2 +- .../mapper/BaseMaterialStoreMapper.java | 8 ++++++++ .../service/IBaseMaterialStoreService.java | 8 ++++++++ .../impl/BaseMaterialStoreServiceImpl.java | 5 +++++ .../mapper/system/BaseMaterialStoreMapper.xml | 14 +++++++++++++ 6 files changed, 56 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java index 39bacab..f1d34c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/BaseLocationInfoController.java +++ b/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,7 +134,22 @@ 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)); + } /** diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html index 222be7d..883b5ba 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/edit.html @@ -31,7 +31,7 @@
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java index 81fd33f..ea1a14b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseMaterialStoreMapper.java +++ b/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); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java index 9808032..a957a54 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseMaterialStoreService.java +++ b/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); + /** * 批量删除物料库位关系 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java index 6bf774a..59ade29 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseMaterialStoreServiceImpl.java +++ b/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); + } + /** * 批量删除物料库位关系 * diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml index d998453..7e07a94 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BaseMaterialStoreMapper.xml +++ b/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 base_material_store + + material_code = #{materialCode}, + material_type = #{materialType}, + + location_status = #{locationStatus}, + location_area = #{locationArea}, + delete_flag = #{deleteFlag}, + record_time = #{recordTime}, + + where location_code = #{locationCode} + + delete from base_material_store where objid = #{objid}