From b54dc0e6a1a6db14209bb0d7595017fb92c197c0 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Sun, 07 Feb 2021 14:23:47 +0800
Subject: [PATCH] 扫码枪新增领用单号
---
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
index bbbd518..8033b98 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
@@ -48,8 +48,6 @@
@Resource
private OpeUseFlowService opeUseFlowService;
- @Resource
- private OpeWarehouseReserveService opeWarehouseReserveService;
@Resource(name="baseMetaDao")
private BaseMetaDao baseMetaDao;
@@ -598,8 +596,7 @@
@Transactional
public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId) {
- OpeWarehouseReserve ope = this.opeWarehouseReserveService
- .getOpeWarehouseReserve2(opeApplyReserve.getReagent().getId(), opeApplyReserve.getArticleNumber(),opeApplyReserve.getHouseId());
+ OpeWarehouseReserve ope = this.getOpeWarehouseReserve2(opeApplyReserve.getReagent().getId(), opeApplyReserve.getArticleNumber(),opeApplyReserve.getHouseId());
if (ope == null) {
ope = new OpeWarehouseReserve();
@@ -623,7 +620,7 @@
opeWarehouseReserveDao.insertOpeWarehouseReserve2(ope);
}else {
ope.setReserve(ope.getReserve() + opeApplyReserve.getArrivalNum());
- this.opeWarehouseReserveService.updateOpeWarehouseReserve(ope);
+ this.updateOpeWarehouseReserve(ope);
}
@@ -690,7 +687,7 @@
List<OpeWarehouseReserve> cacheUpdateList = oar.getCacheUpdateList();
for (OpeWarehouseReserve owr : cacheUpdateList) {
//1.根据仓库id和试剂id搜索不同批号的试剂库存
- List<OpeWarehouseReserve> reserveList = opeWarehouseReserveService
+ List<OpeWarehouseReserve> reserveList = this
.selectWarehouseByRidAndArticleNumberAndWarehouse(reagentId, owr.getArticleNumber(), owr.getWarehouseId());
Integer numLeave = owr.getUseNum();
@@ -738,9 +735,9 @@
}
-
+
//更新库存
- opeWarehouseReserveService.updateBtReserve(warehouseReserve.getId(),usedNum);
+ this.updateBtReserve(warehouseReserve.getId(),usedNum);
if (numLeave < 1) {
break;
}
@@ -827,7 +824,7 @@
// 仓库库存update
- opeWarehouseReserve = this.opeWarehouseReserveService.getOpeWarehouseReserve2(opeApply.getReagent().getId(), opeApply.getArticleNumber(),opeApply.getHouseId());
+ opeWarehouseReserve = this.getOpeWarehouseReserve2(opeApply.getReagent().getId(), opeApply.getArticleNumber(),opeApply.getHouseId());
if (opeWarehouseReserve == null) {
opeWarehouseReserve = new OpeWarehouseReserve();
opeWarehouseReserve.setReagentId(opeApply.getReagent().getId());
@@ -839,9 +836,9 @@
}
opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + opeApply.getArrivalNum());
if (StringUtils.isBlank(opeWarehouseReserve.getId())) {
- this.opeWarehouseReserveService.insertOpeWarehouseReserve(opeWarehouseReserve);
+ this.insertOpeWarehouseReserve(opeWarehouseReserve);
} else {
- this.opeWarehouseReserveService.updateOpeWarehouseReserve(opeWarehouseReserve);
+ this.updateOpeWarehouseReserve(opeWarehouseReserve);
}
}
}
--
Gitblit v1.9.2