From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 328 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 310 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 1f61365..a576af3 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -1,11 +1,11 @@
package com.nanometer.smartlab.service;
import com.nanometer.smartlab.dao.OpeApplyDao;
-import com.nanometer.smartlab.entity.OpeApply;
-import com.nanometer.smartlab.entity.OpeApplyReserve;
-import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.dao.SysReagentDao;
+import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
+import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.exception.AlarmCode;
import com.nanometer.smartlab.exception.AlarmException;
import com.nanometer.smartlab.exception.BusinessException;
@@ -14,6 +14,15 @@
import com.nanometer.smartlab.util.MessageUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.primefaces.event.FileUploadEvent;
+import org.primefaces.model.UploadedFile;
+import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.DuplicateKeyException;
@@ -23,12 +32,14 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* Created by johnny on 17/12/12.
@@ -40,14 +51,29 @@
@Resource(name = "opeApplyDao")
OpeApplyDao opeApplyDao;
-
+ @Lazy
+ @Resource
+ OpeOrderService opeOrderService;
+ @Lazy
+ @Resource
+ OpeReagentStatusService opeReagentStatusService;
+ @Lazy
+ @Resource
+ OpeWarehouseReserveService opeWarehouseReserveService;
+ @Lazy
+ @Resource
+ SysReagentService sysReagentService;
+ @Resource
+ SysSequenceService sysSequenceService;
@Resource
private SysUserService sysUserService;
+ @Resource
+ private BaseMetaService baseMetaService;
@Transactional(propagation = Propagation.REQUIRED)
- public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
+ public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, String controlProduct,Timestamp endDeadline, Integer status,
String applyUserId, String approveUserId, String queryCas,
- Integer first, Integer pageSize,String applyCode,String applyUserName) {
+ Integer first, Integer pageSize,String applyCode,String applyUserName,Byte isShow) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(reagentName)) {
@@ -56,11 +82,14 @@
params.put("startDeadline", startDeadline);
params.put("endDeadline", endDeadline);
params.put("status", status);
+ params.put("isShow", isShow);
+ params.put("controlProduct", controlProduct);
if (StringUtils.isNotBlank(applyUserId)) {
SysUser sysUser = sysUserService.getSysUser(applyUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("applyUserId", applyUserId);
}
@@ -101,7 +130,8 @@
if (StringUtils.isNotBlank(approveUserId)) {
SysUser sysUser = sysUserService.getSysUser(approveUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("approveUserId", approveUserId);
}
}
@@ -140,7 +170,8 @@
if (StringUtils.isNotBlank(approveUserId)) {
SysUser sysUser = sysUserService.getSysUser(approveUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("approveUserId", approveUserId);
}
}
@@ -164,8 +195,8 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
- String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName) {
+ public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
+ String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName,Byte isShow) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(reagentName)) {
@@ -174,11 +205,14 @@
params.put("startDeadline", startDeadline);
params.put("endDeadline", endDeadline);
params.put("status", status);
+ params.put("isShow", isShow);
+ params.put("controlProduct", controlProduct);
if (StringUtils.isNotBlank(applyUserId)) {
SysUser sysUser = sysUserService.getSysUser(applyUserId);
// 不是管理员时，加入applyUserId
- if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+ if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
params.put("applyUserId", applyUserId);
}
@@ -519,12 +553,20 @@
}
@Override
- public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName) {
+ public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
params.put("personName", personName);
params.put("userId",id);
+ params.put("productSn",productSn);
+ params.put("applyCode",applyCode);
+ if (isExpired) {
+ params.put("status",ApplyStatus.EXPIRED.getKey());
+ }else{
+ params.put("status", status);
+ }
+ params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -534,7 +576,7 @@
}
@Override
public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
- Integer pageSize) {
+ Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -542,6 +584,14 @@
params.put("userId",id);
params.put("first", first);
params.put("pageSize", pageSize);
+ params.put("productSn",productSn);
+ params.put("applyCode",applyCode);
+ if (isExpired) {
+ params.put("status",ApplyStatus.EXPIRED.getKey());
+ }else{
+ params.put("status", status);
+ }
+ params.put("isAllApply",isAllApply);
return this.opeApplyDao.getOpeApplyReserveListFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -633,4 +683,246 @@
params.put("oldReId",oldReId);
this.opeApplyDao.updateByReId(params);
}
+
+ @Override
+ public OpeApplyReserve getOpeApplyDetail(String id) {
+ return opeApplyDao.getOpeApplyDetail(id);
+ }
+
+ @Override
+ public void updateOpeApplyInfo(ApplyStatus storage, String consigneeId, Timestamp arrivalTime, String applyId) {
+ Map<String,Object> params = new HashMap();
+ params.put("status", storage);
+ params.put("consigneeId", consigneeId);
+ params.put("arrivalTime", arrivalTime);
+ params.put("applyId", applyId);
+ opeApplyDao.updateOpeApplyInfo(params);
+ }
+
+ @Override
+ @Transactional
+ public void orderInputWarehouse(List<OpeApplyReserve> opeApplyList,String consigneeId,Timestamp arrivalTime) {
+ for (OpeApplyReserve opeApplyReserve:opeApplyList) {
+ //0.1获取该申购单的订单
+ OpeOrder oo = opeOrderService.getOrder(opeApplyReserve.getId());
+ if (oo == null) {
+ throw new BusinessException(ExceptionEnumCode.ORDER_ERROR,"订单不存在");
+ }
+ //0.2检查条码->得到试剂条码列表
+ List<String> codeList = opeReagentStatusService
+ .checkReagentCode(opeApplyReserve.getStartReagentCode2(), opeApplyReserve.getEndReagentCode2(), opeApplyReserve.getArrivalNum());
+ //1.入库
+ if (codeList == null){
+ //无条码入库 不需要增加状态和流向
+ //1.1库存表增加
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
+ }else{
+ //条码入库
+ assert codeList.size() > 0;
+ //1.1入库(库存表增加)
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
+ //1.2试剂状态表增加,流向增加
+ opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo);
+ }
+ //2.更改申购单所属订单状态(判断子订单是否全部完成)
+ //2.1更改该申购单的状态，收货人和到货时间
+ this.updateOpeApplyInfo(ApplyStatus.STORAGE,consigneeId,arrivalTime, opeApplyReserve.getId());
+ //2.2更改订单状态
+ List<OpeApply> oas = opeOrderService.getOpeApplyListByOrder(oo.getId());
+ assert oas.size() > 0;
+ //子订单是否全部入库,是则父单为已入库，否则未完成
+ boolean flag = oas.stream().allMatch(oa -> oa.getStatus() == ApplyStatus.STORAGE);
+ oo.setConsigneeUserId(consigneeId);
+ oo.setArrivalTime(arrivalTime);
+ if (flag){
+ oo.setStatus(ApplyStatus.STORAGE);
+ opeOrderService.updateOpeOrderStatus(oo);
+ }else{
+ oo.setStatus(ApplyStatus.UNCOMPLETED);
+ opeOrderService.updateOpeOrder(oo);
+ }
+
+ }
+ }
+ /**
+ * 补贴条码更新订单的领用数量
+ */
+ @Override
+ public void btUpdateApplyAndOrder(List<OpeApply> opeList) {
+
+ }
+
+ @Override
+ @Transactional
+ public void importApply(FileUploadEvent event,SysUser user) throws IOException {
+
+
+ UploadedFile file = event.getFile();
+ InputStream is = file.getInputstream();
+ boolean isExcel2003 = true;
+ if (file.getFileName().matches("^.+\\.(?i)(xlsx)$")) {
+ isExcel2003 = false;
+ }
+ Workbook wb = null;
+ if (isExcel2003) {
+ wb = new HSSFWorkbook(is);
+ } else {
+ wb = new XSSFWorkbook(is);
+ }
+ Sheet sheet = wb.getSheetAt(0);
+ int totalRows = sheet.getPhysicalNumberOfRows();
+ ArrayList<OpeApply> adds = new ArrayList<>();
+ Row row = null;
+ int totalCells = 0;
+ for (int i = 1; i < totalRows; i++) {
+ List<String> valuesList = new ArrayList<String>();
+ row = sheet.getRow(i);
+
+ totalCells = row.getLastCellNum();
+ //第10列是课题,其他都不能为空
+ for (int index = 0; index < totalCells; index++) {
+ String cellInfo = "";
+ if (row.getCell(index) != null) {
+ if (row.getCell(index).getCellType() == CellType.BLANK && index != 9) {
+ throw new BusinessException(ExceptionEnumCode.PARAM_NULL, "第" + ++i + "行：除了课题组都不能为空");
+ }
+ if (row.getCell(index).getCellType() == CellType.NUMERIC) {
+ DecimalFormat df = new DecimalFormat("#######"); //格式化number String字符
+ cellInfo = df.format(row.getCell(index).getNumericCellValue());
+ }else{
+ cellInfo = row.getCell(index).getStringCellValue();
+ }
+ }
+ valuesList.add(cellInfo);
+ }
+
+ Map<String,Object> detail = new HashMap<>();
+ detail.put("product_sn", valuesList.get(0));
+ detail.put("name", valuesList.get(1));
+ detail.put("reagent_format", valuesList.get(2));
+ detail.put("packing", valuesList.get(3));
+ detail.put("cas", valuesList.get(4));
+ detail.put("product_home", valuesList.get(5));
+ detail.put("reagent_type", valuesList.get(6));
+ SysReagent sysReagent = sysReagentService.getReagentByDetail(detail);
+ if (sysReagent == null) throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：试剂不存在或者有多条，导入失败");
+
+ //申购数量
+ Integer num = new Double(valuesList.get(7)).intValue();
+ if (num < 1) throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：试剂申购数量不合法，导入失败");
+
+ //申购人姓名
+ String applyUserName = valuesList.get(8);
+ SysUser applyUser = sysUserService.getUserByName(applyUserName);
+ if (applyUser == null) throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：申购人不存在或者申购人姓名存在重复，导入失败");
+ //课题组名称
+ String objective = valuesList.get(9);
+
+ String format = "yyyy-MM-dd";
+ SimpleDateFormat dateFormat = new SimpleDateFormat(format);
+ Date applyDate = null;
+ int cellnum = 10;
+ CellType type = row.getCell(cellnum).getCellType();
+ Object value = row.getCell(cellnum);
+ if (null == value || StringUtils.isBlank(value.toString())) {
+ throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行,申购日期不能为空");
+ } else {
+ if (type.equals(CellType.NUMERIC)) {
+ try {
+ applyDate = row.getCell(cellnum).getDateCellValue();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行,申购日期解析错误，请检查是否有无效字符");
+ }
+ } else if (type.equals(CellType.STRING)) {
+ String cellInfo = row.getCell(10).getStringCellValue();
+ try {
+ applyDate = dateFormat.parse(cellInfo);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：申购日期不合法，应如2016-10-09，导入失败");
+ }
+ } else {
+ throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：申购日期解析错误，请检查是否有无效字符");
+ }
+ }
+
+ //选择的审批人姓名
+ String approveUserName = valuesList.get(11);
+ //根据姓名获取用户信息的id
+ SysUser approveUser = sysUserService.getUserByName(approveUserName);
+ if (approveUser == null) throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, i+"行：审批人不存在或者审批人姓名存在重复，导入失败");
+
+ OpeApply opeApply = new OpeApply();
+ opeApply.setId(IDUtils.uuid());
+ opeApply.setValidFlag(ValidFlag.VALID);
+ opeApply.setStatus(ApplyStatus.PENDING_APPROVAL);
+ opeApply.setApplyCode(sysSequenceService.getApplyCode());
+ //设置试剂id
+ opeApply.setReagent(sysReagent);
+ assert applyDate != null;
+ Timestamp applyTime = new Timestamp(applyDate.getTime());
+ opeApply.setCreateTime(applyTime);
+ opeApply.setUpdateTime(applyTime);
+ //价格
+ opeApply.setApplyPrice(sysReagent.getPrice());
+ //申购数量
+ opeApply.setNum(num);
+ //申购人
+ opeApply.setApplyUserId(applyUser.getId());
+ //选择的审批人
+ opeApply.setApproveUserId(approveUser.getId());
+ //选择的课题组信息
+ opeApply.setObjective(objective);
+
+ adds.add(opeApply);
+
+ }
+
+ if (adds.size() > 0) {
+ opeApplyDao.insertList(adds);
+ }
+
+ }
+
+ @Override
+ public OpeApplyReserve getOpeApplyReserveListByNameForRowData(String rowKey) {
+ return opeApplyDao.getOpeApplyReserveListByNameForRowData(rowKey);
+ }
+
+ @Override
+ public int getOpeApplySupplerRequireMngTotalCount(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int status, byte isShow) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("reagentName",reagentName );
+ params.put("startDeadline", startDeadline);
+ params.put("endDeadline", endDeadline);
+ params.put("status", status);
+ params.put("isShow", isShow);
+ //看到供应商是自己的单位的数据
+ String company = baseMetaService.getBaseMetaValue(user.getCompany());
+ if (user.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && user.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
+ params.put("company", company);
+ }
+ return this.opeApplyDao.getOpeApplySupplerRequireMngTotalCount(params);
+ }
+
+ @Override
+ public List<OpeApply> getOpeApplySupplerRequireMngList(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int status, int first, int pageSize, byte isShow) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("reagentName", reagentName);
+ params.put("startDeadline", startDeadline);
+ params.put("endDeadline", endDeadline);
+ params.put("status", status);
+ params.put("isShow", isShow);
+ //看到供应商是自己的单位的数据
+ String company = baseMetaService.getBaseMetaValue(user.getCompany());
+ if (user.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+ && user.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
+ params.put("company", company);
+ }
+
+ return this.opeApplyDao.getOpeApplySupplerRequireMngList(params);
+ }
+
}
--
Gitblit v1.9.2