diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 4c93094a..d70d1f5f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -787,7 +787,15 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { private int updateStorageNum(BoxBindWarehouseDto boxMa) { int result = 0; - result = bmQrBoxMapper.updateStorageNum(boxMa); + + + String maStatus = boxMa.getMaStatus(); + if("0".equals(maStatus)){ + boxMa.setInputNum(BigDecimal.valueOf(1)); + result = bmQrBoxMapper.updateStorageNum(boxMa); + result = machineMapper.updateMaStatus(boxMa); + } + return result; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java index 0564c61b..9a4079fb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.common.biz.domain.lease.LeaseOutDetails; import com.bonus.material.basic.domain.BmQrBoxInfo; +import com.bonus.material.basic.domain.dto.BoxBindWarehouseDto; import com.bonus.material.ma.domain.Machine; import com.bonus.material.ma.domain.Type; import com.bonus.material.ma.domain.vo.MachineVo; @@ -222,4 +223,6 @@ public interface MachineMapper int batchUpdateSynchReport(@Param("list") List samples); int editMachineStatus(Machine machine); + + int updateMaStatus(BoxBindWarehouseDto boxMa); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index d2e89eb4..9fa8eae4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -442,7 +442,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update ma_type set storage_num = storage_num + #{inputNum} where type_id = #{maTypeId} + update ma_type set storage_num = ifnull(storage_num,0) + #{inputNum} where type_id = #{maTypeId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index cb51c0d0..1f5c9b92 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -990,4 +990,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join bm_project bp on bai.project_id = bp.pro_id where ba.id = #{parentId} + + + update ma_machine set ma_status = 1 where ma_id = #{maId} +