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/controller/WarehouseStockMngController.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 4aaf691..d7d1c54 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -220,6 +220,8 @@
//private boolean flag = false;
//领用单号
private String receiptNumber;
+ //备注
+ private String note;
// 试剂库
private LazyDataModel<SysReagent> reagentDataModel;
// 直接入库试剂List
@@ -396,7 +398,7 @@
String reagentId = selectedOpeWarehouseReserve.getReagentId();
String articleNumber = selectedOpeWarehouseReserve.getArticleNumber();
- this.setReagentStatusSelectList(opeReagentStatusService.getOpeReagentStatusList(reagentId, articleNumber,
+ this.setReagentStatusSelectList(opeReagentStatusService.getOpeReagentStatusList22(reagentId, articleNumber,
ArrivalStatus.WAREHOUSE.getKey(), reagentCode, null, null, null));
// System.out.print("this.getReagentStatusSelectList().size(): " + this.reagentStatusSelectList.size());
@@ -415,7 +417,7 @@
System.out.println(reagentId);
System.out.println(articleNumber);
System.out.println(reagentCode);
- this.setReagentStatusSelectListForPerson(opeReagentStatusService.getOpeReagentStatusList(reagentId, articleNumber,
+ this.setReagentStatusSelectListForPerson(opeReagentStatusService.getOpeReagentStatusList22(reagentId, articleNumber,
ArrivalStatus.WAREHOUSE.getKey(), reagentCode, null, null, null));
}
@@ -671,7 +673,11 @@
checkTable = null;
//
this.userId = selectedTmpOrderList.get(0).getApplyUser();
-
+ SysUser sysUser = sysUserService.getSysUser(this.userId);
+ if (sysUser == null){
+ FacesUtils.info("申领人不存在");
+ return;
+ }
this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG);
}
@@ -1271,7 +1277,7 @@
*/
public void associatedFlowReceiptNumber() {
try {
- opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
+ opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber, note);
//弹出打印窗口
RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
} catch (Exception e) {
@@ -1287,7 +1293,7 @@
public void associatedFlowReceiptNumber2() {
try {
- opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
+ opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber,note);
//弹出打印窗口
RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
} catch (Exception e) {
@@ -1299,7 +1305,7 @@
public void closeDialog() {
try {
- opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
+ opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber,note);
onCancelBtnClick();
} catch (Exception e) {
logger.info(e.getMessage());
@@ -1309,7 +1315,7 @@
public void closeDialog2() {
try {
- opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
+ opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber,note);
onCancelBtnClick();
} catch (Exception e) {
logger.info(e.getMessage());
@@ -1648,7 +1654,7 @@
sum += list2.get(i).getSelectNum();
}
- this.opeWarehouseReserveService.reagentDStore4(opeList,userId);
+ this.opeWarehouseReserveService.reagentDStore4(opeList,userId,receiptNum);
for(int i=0;i<list2.size();i++){
List<String> reagentCodes = opeReagentStatusService
@@ -2103,6 +2109,12 @@
}
}
}
+ }
+
+
+ public void onExportOutAndIn(){
+
+
}
public HSSFWorkbook exportExcelNew(List<String> headerList, List<OpeWarehouseReserve> dataList) {
@@ -2567,7 +2579,6 @@
}
public void handleEvent2(){
- System.out.println("===============================");
if(useNum!=null && useNum>0){
if(startReagentCode!=null && !startReagentCode.equals("")){
if (startReagentCode.matches(".*\\D+.*")) {
@@ -2603,6 +2614,10 @@
}else {
FacesUtils.info("请输入领用数量");
}
+ }
+
+ public void clearStartAndEndCode(){
+ endReagentCode = "";
}
public void handleEventForPerson(){
@@ -3192,4 +3207,12 @@
opeApplyService.updateOpeApplyStatus(ApplyStatus.SUPPLIER_CONFIRM, null, ids);
FacesUtils.warn("操作成功。");
}
+
+ public String getNote() {
+ return note;
+ }
+
+ public void setNote(String note) {
+ this.note = note;
+ }
}
--
Gitblit v1.9.2