From c3bca4743c5b8ea15d45cf2ffa1787529f4995ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 18 Nov 2022 10:11:23 +0800
Subject: [PATCH] 1.试剂表体积字段和相关接口返回 2.供应商订单修改试剂价格联动试剂原本价格一起变更
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index e617b77..d7d1c54 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -398,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());
@@ -417,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));
}
@@ -673,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);
}
@@ -2107,6 +2111,12 @@
}
}
+
+ public void onExportOutAndIn(){
+
+
+ }
+
public HSSFWorkbook exportExcelNew(List<String> headerList, List<OpeWarehouseReserve> dataList) {
HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
Integer total = null;
@@ -2569,7 +2579,6 @@
}
public void handleEvent2(){
- System.out.println("===============================");
if(useNum!=null && useNum>0){
if(startReagentCode!=null && !startReagentCode.equals("")){
if (startReagentCode.matches(".*\\D+.*")) {
--
Gitblit v1.9.2