From f2d6527297ad1ae8aad6881d4c672e5bc9c1f908 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 28 十月 2021 11:05:48 +0800
Subject: [PATCH] 采购管理新增：供应商需求管理
---
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 57e71cf..e617b77 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
@@ -1271,7 +1273,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 +1289,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 +1301,7 @@
public void closeDialog() {
try {
- opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
+ opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber,note);
onCancelBtnClick();
} catch (Exception e) {
logger.info(e.getMessage());
@@ -1309,7 +1311,7 @@
public void closeDialog2() {
try {
- opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
+ opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber,note);
onCancelBtnClick();
} catch (Exception e) {
logger.info(e.getMessage());
@@ -1648,7 +1650,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
@@ -1817,7 +1819,7 @@
List<OpeApplyReserve> list = null;
SysUser loginUser = getUser();
String id="";
- if(loginUser.getSeeFlag()==SeeFlag.MANAGE){
+ if(loginUser.getSeeFlag()==SeeFlag.MANAGE||loginUser.getSeeFlag() ==SeeFlag.LEADING){
}else {
//userName=loginUser.getName();
@@ -1925,7 +1927,7 @@
//map=null;
SysUser loginUser = getUser();
String id="";
- if(loginUser.getSeeFlag()==SeeFlag.MANAGE){
+ if(loginUser.getSeeFlag()==SeeFlag.MANAGE||loginUser.getSeeFlag() == SeeFlag.LEADING){
}else {
//userName=loginUser.getName();
@@ -2605,6 +2607,10 @@
}
}
+ public void clearStartAndEndCode(){
+ endReagentCode = "";
+ }
+
public void handleEventForPerson(){
if(useNum!=null && useNum>0){
if(startReagentCodeForPerson!=null && !startReagentCodeForPerson.equals("")){
@@ -3192,4 +3198,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