diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java index 3159f15ed..174639631 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java @@ -69,9 +69,16 @@ public interface EmisWarehouseInMapper extends BaseMapper public int deleteEmisWarehouseInByIds(Long[] ids); /** - * 改变使用状态 + * 改变未使用状态 * @param emisWarehouseIn * @return */ - public int changeUseStatus(EmisWarehouseIn emisWarehouseIn); + public int changeUseStatusByUnUse(EmisWarehouseIn emisWarehouseIn); + + /** + * 改变未使用状态 + * @param emisWarehouseIn + * @return + */ + public int changeUseStatusByUse(EmisWarehouseIn emisWarehouseIn); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 7497b30e6..9341f54b9 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -449,8 +449,7 @@ public class EmisBaseService { if(oldWarehouseInNoArr.length>0){ for (String oldInNo:oldWarehouseInNoArr) { emisWarehouseIn.setInNo(oldInNo); - emisWarehouseIn.setUsedStatus("0"); - emisWarehouseInMapper.changeUseStatus(emisWarehouseIn); + emisWarehouseInMapper.changeUseStatusByUnUse(emisWarehouseIn); } } @@ -465,8 +464,7 @@ public class EmisBaseService { if(newWarehouseInNoNoArr.length>0){ for (String newInNo:newWarehouseInNoNoArr) { emisWarehouseIn.setInNo(newInNo); - emisWarehouseIn.setUsedStatus("1"); - emisWarehouseInMapper.changeUseStatus(emisWarehouseIn); + emisWarehouseInMapper.changeUseStatusByUse(emisWarehouseIn); } } diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml index 6f2eaad05..8941e9a7f 100644 --- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml @@ -146,15 +146,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + update emis_warehouse_in - used_status = #{usedStatus}, + bill_code = #{billCode}, + used_status ='1', update_by = #{updateBy}, update_time = #{updateTime}, update_site = #{updateSite}, - where bill_code = #{billCode} and in_no = #{inNo} + where in_no = #{inNo} + + + + update emis_warehouse_in + + bill_code =null, + used_status ='0', + update_by = #{updateBy}, + update_time = #{updateTime}, + update_site = #{updateSite}, + + where in_no = #{inNo}