From 7d5d7d7ce2e3155e1b9baed181e8071ed40dde0c Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 25 Nov 2022 21:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InspectionsheetmstServiceImpl.java | 19 +++++++-- .../wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql | 22 ++++++++++ .../rest/DevicesafetyqtyqueryController.java | 6 +++ .../service/DevicesafetyqtyqueryService.java | 2 + .../impl/DevicesafetyqtyqueryServiceImpl.java | 41 ++++++++++++++++++ .../service/impl/CheckOutBillServiceImpl.java | 2 +- .../st/returns/wql/QST_IVT_INANDOUTRETRUN.wql | 4 +- .../em/equipmentfile/ChangeDialog.vue | 35 +++++++++++++--- .../views/wms/basedata/st/safeIvt/index.vue | 9 +++- .../src/views/wms/lk/libraryquery/index.vue | 30 ++----------- .../views/wms/pa/performance/AddDialog.vue | 2 + .../views/wms/pa/workloadreview/AddDialog.vue | 2 + .../wms/sb/stat/safetyqtyquery/index.vue | 4 +- .../wms/st/core/outbill/backoutbill/index.vue | 12 +++--- .../st/core/outbill/checkoutbill/AddDtl.vue | 14 +++---- .../st/core/outbill/checkoutbill/index.vue | 18 ++++---- .../src/views/wms/st/inStor/check/index.vue | 16 +++---- .../views/wms/st/inStor/moreOrless/index.vue | 24 +++++------ .../st/inStor/moveStor/handmovestor/index.vue | 16 +++---- .../views/wms/st/inStor/shutFrame/index.vue | 16 +++---- .../views/wms/st/inStor/shutFrame2/index.vue | 16 +++---- .../wms/st/return/inAndOutReturn/index.vue | 42 ++++++++----------- 22 files changed, 221 insertions(+), 131 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java index 4c54e6e6..1a2c125f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/InspectionsheetmstServiceImpl.java @@ -867,11 +867,24 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService */ JSONArray IvtArr = new JSONArray(); if (StrUtil.equals(jsonDtl.getString("result"), "01") || StrUtil.equals(jsonDtl.getString("result"), "03")) { - IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "' and quality_scode <> '01'").getResultJSONArray(0); + IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "'").getResultJSONArray(0); } else if (StrUtil.equals(jsonDtl.getString("result"), "02")) { - IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "' and quality_scode <> '02'").getResultJSONArray(0); + IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "'").getResultJSONArray(0); } - if (!ObjectUtil.isEmpty(IvtArr)) { + if (ObjectUtil.isNotEmpty(IvtArr)) { + //判断当前库存是否有冻结数或者待入数 + JSONObject ivt_now = WQL.getWO("QL_TEST_INSPECTIONSHEET002") + .addParam("flag", "5") + .addParam("material_id", jsonDtl.getString("material_id")) + .addParam("pcsn", jsonDtl.getString("pcsn")) + .process().uniqueResult(0); + if(ivt_now != null){ + double frozen_qty = ivt_now.getDouble("frozen_qty"); + double warehousing_qty = ivt_now.getDouble("warehousing_qty"); + if(frozen_qty!=0 || warehousing_qty != 0){ + throw new BadRequestException("此批次物料库存冻结数或待入数不为0,有未完成的单据,请稍后再试！"); + } + } /* * 更新仓位库存表 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql index 8f6e35b4..ac4ca4e1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_INSPECTIONSHEET002.wql @@ -140,3 +140,25 @@ ENDQUERY ENDIF + IF 输入.flag = "5" + QUERY + SELECTinandoutreturn + sum(ivt.frozen_qty) AS frozen_qty, + sum(ivt.warehousing_qty) AS warehousing_qty, + ivt.material_id, + ivt.pcsn + FROM + ST_IVT_StructIvt ivt + WHERE + 1=1 + OPTION 输入.material_id <> "" + ivt.material_id = 输入.material_id + ENDOPTION + OPTION 输入.pcsn <> "" + ivt.pcsn = 输入.pcsn + ENDOPTION + group by ivt.material_id,ivt.pcsn + ENDSELECT + ENDQUERY + ENDIF + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java index 797dd0c3..bcadf41e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java @@ -81,4 +81,10 @@ public class DevicesafetyqtyqueryController { devicesafetyqtyqueryService.download(whereJson, response); } + @ApiOperation("导出数据") + @GetMapping(value = "/download2") + public void download2(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { + devicesafetyqtyqueryService.download2(whereJson, response); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java index 50c7d2b6..2926b661 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java @@ -81,4 +81,6 @@ public interface DevicesafetyqtyqueryService { void download(Map whereJson, HttpServletResponse response) throws IOException; + void download2(Map whereJson, HttpServletResponse response) throws IOException; + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java index 17315e71..2624a324 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java @@ -215,4 +215,45 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ FileUtil.downloadExcel(list, response); } + @Override + public void download2(Map whereJson, HttpServletResponse response) throws IOException { + String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); + String class_idStr = (String) whereJson.get("class_idStr"); + String material_code = MapUtil.getStr(whereJson, "material_code"); + String type = MapUtil.getStr(whereJson, "type"); + String is_all = MapUtil.getStr(whereJson, "is_all"); + if(StrUtil.isEmpty(class_idStr)){ + class_idStr = MaterOptTypeEnum.BCP_AND_YL_AND_FL.getClass_idStr(); + } + HashMap map = new HashMap<>(); + map.put("flag", "2"); + map.put("type",type); + map.put("is_all",is_all); + if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%"); + //处理物料当前节点的所有子节点 + if (StrUtil.isNotEmpty(material_type_id)) { + map.put("material_type_id", material_type_id); + String classIds = classstandardService.getChildIdStr(material_type_id); + map.put("classIds", classIds); + } else if (ObjectUtil.isNotEmpty(class_idStr)) { + String classIds = classstandardService.getAllChildIdStr(class_idStr); + map.put("classIds", classIds); + } + JSONArray rows = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).process().getResultJSONArray(0); + + List> list = new ArrayList<>(); + for (int i = 0; i < rows.size(); i++) { + JSONObject jo = rows.getJSONObject(i); + Map dtl_map = new LinkedHashMap<>(); + dtl_map.put("物料编码", jo.getString("material_code")); + dtl_map.put("物料名称", jo.getString("material_name")); + dtl_map.put("物料分类", jo.getString("class_name")); + dtl_map.put("安全库存下限", jo.getString("safe_ivt_down")); + dtl_map.put("库存", jo.getString("ivt_qty")); + dtl_map.put("单位", jo.getString("qty_unit_name")); + list.add(dtl_map); + } + FileUtil.downloadExcel(list, response); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java index 8789582f..7be45c56 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java @@ -117,7 +117,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { if (StrUtil.isNotEmpty(map.get("remark"))) { map.put("remark", "%" + map.get("remark") + "%"); } - JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), ""); + JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_code"); return jo; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql index 704cc687..5ad43581 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql @@ -98,11 +98,11 @@ ENDOPTION OPTION 输入.begin_time <> "" - mst.biz_date >= 输入.begin_time + mst.input_time >= 输入.begin_time ENDOPTION OPTION 输入.end_time <> "" - mst.biz_date <= 输入.end_time + mst.input_time <= 输入.end_time ENDOPTION OPTION 输入.material_search <> "" diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue index be2d55f6..94cffc41 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue @@ -67,10 +67,30 @@ > - + + + - + @@ -477,9 +497,14 @@ export default { } }, deleteRow(index, row) { - localStorage.del([row.storage_id]) - equipmentfile.queryivt3(this.form).then(res => { - this.tableDtl3 = res + localStorage.del([row.storage_id]).then(res => { + equipmentfile.queryivt3(this.form).then(res => { + this.tableDtl3 = res + }) + }).catch(() => { + equipmentfile.queryivt3(this.form).then(res => { + this.tableDtl3 = res + }) }) }, inv_typeFormat(row) { diff --git a/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue b/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue index eca964de..93bffedb 100644 --- a/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue +++ b/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue @@ -50,6 +50,7 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > + @@ -122,6 +123,7 @@ export default { return { stors: [], classes: [], + checkrows: [], class_idStr: null, materOpt_code: '02', stor_id: '', @@ -209,9 +211,14 @@ export default { this.crud.notify('请选择仓库', CRUD.NOTIFICATION_TYPE.INFO) return } + this.checkrows = this.$refs.table.selection + if (this.checkrows.length === 0) { + this.crud.notify('请勾选需要保存的记录！') + return false + } const data = {} data.stor_id = this.stor_id - data.rows = this.crud.data + data.rows = this.checkrows crudMaterialsafeivt.insertSafe(data).then(() => { this.crud.dleChangePage(1) this.crud.editSuccessNotify() diff --git a/mes/qd/src/views/wms/lk/libraryquery/index.vue b/mes/qd/src/views/wms/lk/libraryquery/index.vue index a7743fd5..80b03be2 100644 --- a/mes/qd/src/views/wms/lk/libraryquery/index.vue +++ b/mes/qd/src/views/wms/lk/libraryquery/index.vue @@ -51,7 +51,8 @@ @change="hand" > @@ -70,28 +71,12 @@ > - - - - - - @@ -174,18 +159,9 @@ export default { openParam: null, queryDtlShow: false, ponitList: [], - qualitylist: [ - { 'label': '合格', 'value': '01' }, - { 'label': '不合格', 'value': '02' } - ], rules: { }} }, - created() { - crudLibraryquery.getPoint().then(res => { - this.ponitList = res - }) - }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { diff --git a/mes/qd/src/views/wms/pa/performance/AddDialog.vue b/mes/qd/src/views/wms/pa/performance/AddDialog.vue index 21ec1838..29ddcefc 100644 --- a/mes/qd/src/views/wms/pa/performance/AddDialog.vue +++ b/mes/qd/src/views/wms/pa/performance/AddDialog.vue @@ -231,9 +231,11 @@ export default { if (!numRe.test(val)) { this.crud.notify('请输入不小于0的数字', CRUD.NOTIFICATION_TYPE.INFO) row.workload = 0 + return false } else { if (row.workload_audit === '') { row.workload = 0 + return false } } row.workload_audit = val diff --git a/mes/qd/src/views/wms/pa/workloadreview/AddDialog.vue b/mes/qd/src/views/wms/pa/workloadreview/AddDialog.vue index f7d40dcc..1d678fb7 100644 --- a/mes/qd/src/views/wms/pa/workloadreview/AddDialog.vue +++ b/mes/qd/src/views/wms/pa/workloadreview/AddDialog.vue @@ -228,9 +228,11 @@ export default { if (!numRe.test(val)) { this.crud.notify('请输入不小于0的数字', CRUD.NOTIFICATION_TYPE.INFO) row.workload_audit = 0 + return false } else { if (row.workload_audit === '') { row.workload_audit = 0 + return false } } this.form.tableData.splice(index, 1, row) diff --git a/mes/qd/src/views/wms/sb/stat/safetyqtyquery/index.vue b/mes/qd/src/views/wms/sb/stat/safetyqtyquery/index.vue index 10d49cae..9453f629 100644 --- a/mes/qd/src/views/wms/sb/stat/safetyqtyquery/index.vue +++ b/mes/qd/src/views/wms/sb/stat/safetyqtyquery/index.vue @@ -160,8 +160,8 @@ export default { downdtl() { if (this.currentRow !== null) { crud.downloadLoading = true - download('/api/devicesafetyqtyquery/download', this.crud.query).then(result => { - downloadFile(result, '备件安全库存量', 'xlsx') + download('/api/devicesafetyqtyquery/download2', this.crud.query).then(result => { + downloadFile(result, '安全库存预警', 'xlsx') crud.downloadLoading = false }).catch(() => { crud.downloadLoading = false diff --git a/mes/qd/src/views/wms/st/core/outbill/backoutbill/index.vue b/mes/qd/src/views/wms/st/core/outbill/backoutbill/index.vue index deb2869a..0b47cbf5 100644 --- a/mes/qd/src/views/wms/st/core/outbill/backoutbill/index.vue +++ b/mes/qd/src/views/wms/st/core/outbill/backoutbill/index.vue @@ -149,18 +149,18 @@ - + - + - - - + + + - + diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue index 1526fbc8..f864eef7 100644 --- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue +++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue @@ -44,13 +44,13 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - - - - - - - + + + + + + + diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/index.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/index.vue index 214a4b9f..e30a27c3 100644 --- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/index.vue +++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/index.vue @@ -173,18 +173,18 @@ - + - - - - - - - + + + + + + + @@ -280,7 +280,7 @@ export default { this.handleCurrentChange(null) }, handleSelectionChange(val, row) { - if (val.length > 1) { + if (val.length > 1) {工作量汇报 this.$refs.table.clearSelection() this.$refs.table.toggleRowSelection(val.pop()) this.buttonChange(row) diff --git a/mes/qd/src/views/wms/st/inStor/check/index.vue b/mes/qd/src/views/wms/st/inStor/check/index.vue index b957c475..5f3741b9 100644 --- a/mes/qd/src/views/wms/st/inStor/check/index.vue +++ b/mes/qd/src/views/wms/st/inStor/check/index.vue @@ -173,18 +173,18 @@ - + - - - - - - - + + + + + + + diff --git a/mes/qd/src/views/wms/st/inStor/moreOrless/index.vue b/mes/qd/src/views/wms/st/inStor/moreOrless/index.vue index 3c2bbdc3..591a7c34 100644 --- a/mes/qd/src/views/wms/st/inStor/moreOrless/index.vue +++ b/mes/qd/src/views/wms/st/inStor/moreOrless/index.vue @@ -133,26 +133,26 @@ - + - - - - + + + + - - - - - - - + + + + + + + diff --git a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue index 9a8f7402..f2b24556 100644 --- a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue +++ b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue @@ -171,18 +171,18 @@ - + - - - - - - - + + + + + + + diff --git a/mes/qd/src/views/wms/st/inStor/shutFrame/index.vue b/mes/qd/src/views/wms/st/inStor/shutFrame/index.vue index c9452947..a6814b3d 100644 --- a/mes/qd/src/views/wms/st/inStor/shutFrame/index.vue +++ b/mes/qd/src/views/wms/st/inStor/shutFrame/index.vue @@ -160,18 +160,18 @@ - + - - - - - - - + + + + + + + diff --git a/mes/qd/src/views/wms/st/inStor/shutFrame2/index.vue b/mes/qd/src/views/wms/st/inStor/shutFrame2/index.vue index 12e34bc4..ed59b1b6 100644 --- a/mes/qd/src/views/wms/st/inStor/shutFrame2/index.vue +++ b/mes/qd/src/views/wms/st/inStor/shutFrame2/index.vue @@ -150,18 +150,18 @@ - + - - - - - - - + + + + + + + diff --git a/mes/qd/src/views/wms/st/return/inAndOutReturn/index.vue b/mes/qd/src/views/wms/st/return/inAndOutReturn/index.vue index d5b64644..82c7d3c2 100644 --- a/mes/qd/src/views/wms/st/return/inAndOutReturn/index.vue +++ b/mes/qd/src/views/wms/st/return/inAndOutReturn/index.vue @@ -187,34 +187,28 @@ @selection-change="crud.selectionChangeHandler" > - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +