From 29166bc750623bea12a367ba7c527facdb582235 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 13 七月 2021 17:12:28 +0800
Subject: [PATCH] 修改转移试剂，生成领用单
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 15 +++++++--------
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 2 ++
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 24 ++++++++++++------------
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 7789cf4..73989a6 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -1426,6 +1426,7 @@
return ResponseModel.getErrInstance(reagentCode+",该试剂在库存中不存在");
}
}
+ String number = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
for (String reagentCode : reagentReceiving.getReagentCode()) {
OpeReagentStatus opeReagentStatus = opeReagentStatusService
.getOpeReagentStatusByReagentCode(reagentCode);
@@ -1458,6 +1459,7 @@
opeUseFlow.setRemainder(opeUseFlowExist.getRemainder());
BaseMeta baseMeta = baseMetaService.getBaseMeta("operate_status",String.valueOf(OperateStatus.TRANSFER.getKey()),"转移");
opeUseFlow.setOperateState(baseMeta.getId());
+ opeUseFlow.setReceiptNumber(number);
opeUseFlowService.insertOpeUseFlow(opeUseFlow);
}
return ResponseModel.getOkInstence("转移成功");
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 4f0ff72..0a2d528 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -199,8 +199,8 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -249,8 +249,7 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -300,8 +299,8 @@
LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
- WHERE ouf.operatestate = #{operatestate}
- and ouf.receipt_number = #{receiptNumber}
+ WHERE
+ ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -357,8 +356,8 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
and ouf.receipt_number = #{receiptNumber}
group by ouf.receipt_number
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 5f61489..2047277 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -501,9 +501,9 @@
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
- metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
- List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
- params.put("operatestate", baseMetas.get(0).getId());
+// metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+// List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+// params.put("operatestate", baseMetas.get(0).getId());
addParamByUserId(userId, params);
return opeUseFlowDao.countPersonalUseInfo(params);
@@ -548,9 +548,9 @@
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
- metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
- List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
- params.put("operatestate", baseMetas.get(0).getId());
+// metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+// List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+// params.put("operatestate", baseMetas.get(0).getId());
params.put("first", first);
params.put("pageSize", pageSize);
@@ -563,9 +563,9 @@
Map<String,Object> params = new HashMap<>();
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
- metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
- List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
- params.put("operatestate", baseMetas.get(0).getId());
+// metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+// List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+// params.put("operatestate", baseMetas.get(0).getId());
params.put("receiptNumber", receiptNumber);
return opeUseFlowDao.getApplyInfo(params);
@@ -643,9 +643,9 @@
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
- metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
- List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
- params.put("operatestate", baseMetas.get(0).getId());
+// metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+// List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+// params.put("operatestate", baseMetas.get(0).getId());
addParamByUserId(userId, params);
--
Gitblit v1.9.2