From fe59eb7ea9e69a14f5a7b7ddabd244f2dc134788 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期五, 22 十月 2021 18:34:32 +0800 Subject: [PATCH] 领用添加备注,个人领用页面查看 --- src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java index 931da06..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 @@ -3196,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