From 169f2ae1155f62bbd529dba27fdc19d653906175 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 11 May 2022 17:24:57 +0800
Subject: [PATCH] sout删除一部分
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 5092e03..8dae14b 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import com.hazelcast.core.IFunction;
import com.nanometer.smartlab.dao.*;
import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.dto.PersonUseDetail;
@@ -374,12 +375,12 @@
}
@Override
- public void updateReceiptNumber(String code, String receiptNumber) {
- opeUseFlowDao.updateReceiptNumber(code, receiptNumber);
+ public void updateReceiptNumber(String code, String receiptNumber,String note) {
+ opeUseFlowDao.updateReceiptNumber(code, receiptNumber,note);
}
@Transactional
- public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber) {
+ public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber,String note) {
for (OpeApplyReserve oar : selectedTmpOrderList) {
if (oar.getFlag() == 1) {
@@ -387,14 +388,14 @@
for (String statusId : oar.getReagentCode()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}else{
//根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
List<String> codeTmp = opeReagentStatusService
.generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
for (String code : codeTmp) {
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}
@@ -432,21 +433,21 @@
}
@Override
- public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber) {
+ public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber,String note) {
for (OpeWarehouseReserve owr : selectTmpList) {
if (owr.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
for (String statusId : owr.getReagentCodes()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}else{
//根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
List<String> codeTmp = opeReagentStatusService
.generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
for (String code : codeTmp) {
- this.updateReceiptNumber(code, receiptNumber);
+ this.updateReceiptNumber(code, receiptNumber,note);
}
}
@@ -487,7 +488,6 @@
params.put("endTime",sdfend.format(now));
}
- params.put("userId", userId);
params.put("receiptNumber", receiptNumber);
params.put("department", department);
params.put("project", project);
@@ -542,7 +542,6 @@
}else {
params.put("endTime",sdfend.format(now));
}
- params.put("userId", userId);
params.put("receiptNumber", receiptNumber);
params.put("department", department);
params.put("project", project);
@@ -736,4 +735,61 @@
return true;
}
+
+ /**
+ * @Description: 查询导出
+ */
+ @Override
+ public List<Map> selectExportDetail(String reagentCode, String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, String applyPerson, String reagentName) {
+ Map<String, Object> params = new HashMap<>();
+ Map<String, String> metaMap2 = new HashMap<>();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if (startTime != null) {
+ params.put("startTime", sdf.format(startTime) +" 00:00:00");
+ }
+
+ if (endTime != null) {
+ params.put("endTime", sdf.format(endTime) + " 23:59:59");
+ }
+
+ params.put("reagentCode", reagentCode);
+
+ params.put("endTime", endTime);
+ params.put("receiptNumber", receiptNumber);
+ params.put("department", department);
+ params.put("project", project);
+ params.put("applyPerson", applyPerson);
+ params.put("reagentName", reagentName);
+ params.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.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+ addParamByUserId(userId, params);
+ return opeUseFlowDao.selectDetail(params);
+ }
+
+ @Override
+ public boolean export22Excel(List<Map> list) throws Exception {
+ Map<String,String> map = new LinkedHashMap<>();
+ map.put("productSn", "产品编号");
+ map.put("reagentName", "试剂名称");
+ map.put("reagentCode", "试剂条形码");
+ map.put("controlProducts", "管制品");
+ map.put("reagentFormat", "规格型号");
+ map.put("perInfo", "包装");
+ map.put("productHome", "厂家");
+ map.put("articleNumber", "批号");
+ map.put("username", "申领人");
+ map.put("project", "课题组");
+ map.put("department", "部门");
+ map.put("location", "地点");
+ map.put("createTime", "领用时间");
+ ExcelUtils.export2Excel(list,"试剂领用记录表",map);
+ return true;
+ }
+
}
--
Gitblit v1.9.2