From 7e925e5a025e90c42edb2865f5085b8eedcea3b9 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 14 四月 2021 12:52:54 +0800
Subject: [PATCH] 修改领用单数据
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 90690cd..e84cdfa 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -15,6 +15,7 @@
import com.nanometer.smartlab.util.MessageUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.DuplicateKeyException;
@@ -41,10 +42,13 @@
@Resource(name = "opeApplyDao")
OpeApplyDao opeApplyDao;
+ @Lazy
@Resource
OpeOrderService opeOrderService;
+ @Lazy
@Resource
OpeReagentStatusService opeReagentStatusService;
+ @Lazy
@Resource
OpeWarehouseReserveService opeWarehouseReserveService;
@@ -526,7 +530,7 @@
}
@Override
- public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
+ public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -535,6 +539,7 @@
params.put("productSn",productSn);
params.put("applyCode",applyCode);
params.put("status",status);
+ params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -544,7 +549,7 @@
}
@Override
public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
- Integer pageSize,String productSn,String applyCode,Integer status) {
+ Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -555,6 +560,7 @@
params.put("productSn",productSn);
params.put("applyCode",applyCode);
params.put("status",status);
+ params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveListFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -678,12 +684,12 @@
if (codeList == null){
//无条码入库 不需要增加状态和流向
//1.1库存表增加
- opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
}else{
//条码入库
assert codeList.size() > 0;
//1.1入库(库存表增加)
- opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
//1.2试剂状态表增加,流向增加
opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo);
}
@@ -707,5 +713,12 @@
}
}
+ /**
+ * 补贴条码更新订单的领用数量
+ */
+ @Override
+ public void btUpdateApplyAndOrder(List<OpeApply> opeList) {
+
+ }
}
--
Gitblit v1.9.2