diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
index 71a97bcb..cf20251d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
@@ -42,4 +42,11 @@ public interface MaMachineMapper {
SltAgreementApply getLeaseProject(MaMachine ma);
SltAgreementApply getBackProject(MaMachine ma);
+
+ /**
+ * 根据typeId修改库存
+ * @param typeId
+ * @return
+ */
+ int updateNum(long typeId);
}
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
index 479940e6..7d9744e1 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
@@ -90,7 +90,17 @@ public class MaMachineServiceImpl implements MaMachineService {
@Override
public int remove(Long[] maIds) {
- return maMachineMapper.remove(maIds);
+ int res = 0;
+ if (maIds != null || maIds.length > 0) {
+ for (Long maId : maIds) {
+ MaMachine maMachine = maMachineMapper.selectMaMachineByMaId(maId);
+ if (maMachine.getTypeId() != 0 && ("15").equals(maMachine.getMaStatus())) {
+ res = maMachineMapper.updateNum(maMachine.getTypeId());
+ }
+ }
+ }
+ res += maMachineMapper.remove(maIds);
+ return res;
}
@Override
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index eedad0f4..485e5a3b 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -262,6 +262,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where ma_id = #{maId}
+
+ update ma_type set num = num - 1 where type_id = #{typeId}
+
delete from ma_machine where ma_id in
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
index 765452ca..8712d5f6 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue
@@ -325,8 +325,8 @@ export default {
proList: [], //工程集合
statusList: [
{ id: '33', name: '待出库' },
- { id: '34', name: '出库中' },
- { id: '35', name: '已出库' },
+ { id: '34', name: '出库进行中' },
+ { id: '35', name: '完成' },
], //工程集合
//搜索下拉数据
typeList: [],