diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/CheckOutBillController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/CheckOutBillController.java index cde67c03..9f94e8e1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/CheckOutBillController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/CheckOutBillController.java @@ -52,6 +52,13 @@ public class CheckOutBillController { public ResponseEntity getOutBillDtl(@RequestParam Map whereJson){ return new ResponseEntity<>(checkOutBillService.getOutBillDtl(whereJson), HttpStatus.OK); } + + @GetMapping("/queryDtl2") + @Log("查询出库单") + @ApiOperation("查询出库单") + public ResponseEntity queryDtl2(@RequestParam Map whereJson){ + return new ResponseEntity<>(checkOutBillService.queryDtl2(whereJson), HttpStatus.OK); + } @Log("删除出库单") @ApiOperation("删除出库单") //@PreAuthorize("@el.check('checkoutbill:del')") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/CheckOutBillService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/CheckOutBillService.java index d1e832fe..f3f0b83d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/CheckOutBillService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/CheckOutBillService.java @@ -60,6 +60,12 @@ public interface CheckOutBillService { * @return */ JSONArray getOutBillDtl(Map whereJson); + /** + * 查询出库单明细 + * @param whereJson / + * @return + */ + JSONArray queryDtl2(Map whereJson); /** * 查询出库单分配明细 * @param whereJson / 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 eaa0940c..736a4fd1 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 @@ -114,8 +114,54 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { str = "(" + str.substring(1) + ")"; map.put("source_bill_code", str); } - JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iosdtl2.material_id"); - return jo; + JSONObject ret = WQL.getWO("QST_IVT_CHECKOUTBILL2").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "iosdtl2.material_id"); + JSONArray json = ret.getJSONArray("content"); + JSONArray ja = new JSONArray(); + for(int i=0;i map = new HashMap<>(whereJson); + map.put("flag", "14"); + if (StrUtil.isNotEmpty(map.get("username"))) { + map.put("username", "%" + map.get("username") + "%"); + } + String begin_time = map.get("begin_time"); + if (StrUtil.isNotEmpty(begin_time)) { + map.put("begin_time", begin_time.substring(0,10)); + } + String end_time = map.get("end_time"); + if (StrUtil.isNotEmpty(end_time)) { + map.put("end_time", end_time.substring(0,10)); + } + String source_bill_code = map.get("source_bill_code"); + if (StrUtil.isNotEmpty(source_bill_code)) { + StringBuilder sb = new StringBuilder(); + String[] strs = source_bill_code.split(","); + for(int i=0;i "" - (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code) - ENDOPTION - OPTION 输入.username <> "" - (user.username like 输入.username or ios.input_optname like 输入.username) - ENDOPTION - OPTION 输入.pcsn <> "" - iosdtl.pcsn like 输入.pcsn - ENDOPTION - OPTION 输入.source_bill_code <> "" - iosdtl.source_bill_code in 输入.source_bill_code - ENDOPTION - OPTION 输入.begin_time <> "" - ios.biz_date >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - ios.biz_date <= 输入.end_time - ENDOPTION - OPTION 输入.bill_type <> "" - ios.bill_type = 输入.bill_type - ENDOPTION - OPTION 输入.stor_id <> "" - ios.stor_id = 输入.stor_id - ENDOPTION - ) iosdtl2 - where 1=1 - GROUP BY - iosdtl2.material_id, - iosdtl2.pcsn, - iosdtl2.is_active, - iosdtl2.ivt_level, - iosdtl2.quality_scode, - iosdtl2.material_name, - iosdtl2.material_code, - iosdtl2.qty_unit_id, - iosdtl2.qty_unit_name - ENDSELECT - ENDPAGEQUERY - ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL2.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL2.wql new file mode 100644 index 00000000..22b66fd8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL2.wql @@ -0,0 +1,281 @@ +[交易说明] + 交易名： 基础点位分页查询 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.bill_status TYPEAS s_string + 输入.bill_code TYPEAS s_string + 输入.source_bill_code TYPEAS f_string + 输入.username TYPEAS s_string + 输入.create_mode TYPEAS s_string + 输入.bill_type TYPEAS s_string + 输入.stor_id TYPEAS s_string + 输入.iostorinv_id TYPEAS s_string + 输入.buss_type TYPEAS s_string + 输入.end_time TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.material_id TYPEAS s_string + 输入.material_code TYPEAS s_string + 输入.quality_scode TYPEAS s_string + 输入.pcsn TYPEAS s_string + 输入.ivt_level TYPEAS s_string + 输入.is_active TYPEAS s_string + 输入.sect_id TYPEAS s_string + 输入.io_type TYPEAS s_string + 输入.iostorinvdtl_id TYPEAS s_string + 输入.unassign_flag TYPEAS s_string + 输入.struct_id TYPEAS s_string + 输入.iostorinvdis_id TYPEAS s_string + 输入.is_issued TYPEAS s_string + 输入.remark TYPEAS s_string + 输入.task_id TYPEAS s_string + 输入.task_status TYPEAS s_string + 输入.deptIds TYPEAS f_string +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "12" + PAGEQUERY + SELECT + SUM( iosdtl2.plan_qty ) AS sum_plan_qty, + iosdtl2.qty_unit_id, + iosdtl2.qty_unit_name, + iosdtl2.material_name, + iosdtl2.material_code, + iosdtl2.material_id, + iosdtl2.pcsn, + iosdtl2.is_active, + iosdtl2.ivt_level, + iosdtl2.quality_scode + FROM + ( + SELECT + iosdtl.material_id, + iosdtl.pcsn, + iosdtl.quality_scode, + iosdtl.ivt_level, + iosdtl.is_active, + iosdtl.plan_qty, + iosdtl.real_qty, + iosdtl.qty_unit_id, + iosdtl.qty_unit_name, + mb.material_name, + mb.material_code + FROM + ST_IVT_IOStorInvDtl iosdtl + LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id + LEFT JOIN sys_user user ON ios.input_optid = user.user_id + WHERE + 1 = 1 + AND ios.is_delete = '0' + AND ios.bill_type in ('010301','010302') + OPTION 输入.material_code <> "" + (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code) + ENDOPTION + OPTION 输入.username <> "" + (user.username like 输入.username or ios.input_optname like 输入.username) + ENDOPTION + OPTION 输入.pcsn <> "" + iosdtl.pcsn like 输入.pcsn + ENDOPTION + OPTION 输入.source_bill_code <> "" + iosdtl.source_bill_code in 输入.source_bill_code + ENDOPTION + OPTION 输入.begin_time <> "" + ios.biz_date >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + ios.biz_date <= 输入.end_time + ENDOPTION + OPTION 输入.bill_type <> "" + ios.bill_type = 输入.bill_type + ENDOPTION + OPTION 输入.stor_id <> "" + ios.stor_id = 输入.stor_id + ENDOPTION + ) iosdtl2 + where 1=1 + GROUP BY + iosdtl2.material_id, + iosdtl2.pcsn, + iosdtl2.is_active, + iosdtl2.ivt_level, + iosdtl2.quality_scode, + iosdtl2.material_name, + iosdtl2.material_code, + iosdtl2.qty_unit_id, + iosdtl2.qty_unit_name + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "13" + QUERY + SELECT + sum(FormulaDtl.confirm_qty) AS sum_real_qty + FROM + PDM_BI_FormulaDtl FormulaDtl + LEFT JOIN PDM_BI_Formula Formula ON Formula.formula_id = FormulaDtl.formula_id + INNER JOIN ( + SELECT + iosdtl.source_bill_code, + iosdtl.material_id, + iosdtl.pcsn + FROM + ST_IVT_IOStorInvDtl iosdtl + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id + LEFT JOIN sys_user USER ON ios.input_optid = USER.user_id + WHERE + 1 = 1 + AND ios.is_delete = '0' + AND ios.bill_type IN ( '010301', '010302' ) + OPTION 输入.material_id <> "" + iosdtl.material_id = 输入.material_id + ENDOPTION + OPTION 输入.username <> "" + (user.username like 输入.username or ios.input_optname like 输入.username) + ENDOPTION + OPTION 输入.pcsn <> "" + iosdtl.pcsn = 输入.pcsn + ENDOPTION + OPTION 输入.source_bill_code <> "" + iosdtl.source_bill_code in 输入.source_bill_code + ENDOPTION + OPTION 输入.begin_time <> "" + ios.biz_date >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + ios.biz_date <= 输入.end_time + ENDOPTION + OPTION 输入.bill_type <> "" + ios.bill_type = 输入.bill_type + ENDOPTION + OPTION 输入.stor_id <> "" + ios.stor_id = 输入.stor_id + ENDOPTION + GROUP BY + iosdtl.source_bill_code, + iosdtl.pcsn, + iosdtl.material_id + ) iosdtl2 ON ( iosdtl2.source_bill_code = Formula.workorder_code AND iosdtl2.material_id = FormulaDtl.material_id AND iosdtl2.pcsn = FormulaDtl.pcsn ) + WHERE + 1 = 1 + AND FormulaDtl.STATUS = '99' + AND Formula.is_delete = '0' + OPTION 输入.material_id <> "" + FormulaDtl.material_id = 输入.material_id + ENDOPTION + OPTION 输入.pcsn <> "" + FormulaDtl.pcsn = 输入.pcsn + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "14" + QUERY + SELECT + FormulaDtl.confirm_qty, + FormulaDtl.formula_qty, + FormulaDtl.seq_no, + Formula.formula_code, + Formula.workorder_code, + FormulaDtl.material_id, + mb2.material_name, + mb2.material_code, + FormulaDtl.pcsn, + FormulaDtl.qty_unit_name + FROM + PDM_BI_FormulaDtl FormulaDtl + LEFT JOIN PDM_BI_Formula Formula ON Formula.formula_id = FormulaDtl.formula_id + LEFT JOIN md_me_materialbase mb2 ON mb2.material_id = FormulaDtl.material_id + INNER JOIN ( + SELECT + iosdtl.source_bill_code, + iosdtl.material_id, + iosdtl.pcsn + FROM + ST_IVT_IOStorInvDtl iosdtl + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id + LEFT JOIN sys_user USER ON ios.input_optid = USER.user_id + WHERE + 1 = 1 + AND ios.is_delete = '0' + AND ios.bill_type IN ( '010301', '010302' ) + OPTION 输入.material_id <> "" + iosdtl.material_id = 输入.material_id + ENDOPTION + OPTION 输入.username <> "" + (user.username like 输入.username or ios.input_optname like 输入.username) + ENDOPTION + OPTION 输入.pcsn <> "" + iosdtl.pcsn = 输入.pcsn + ENDOPTION + OPTION 输入.source_bill_code <> "" + iosdtl.source_bill_code in 输入.source_bill_code + ENDOPTION + OPTION 输入.begin_time <> "" + ios.biz_date >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + ios.biz_date <= 输入.end_time + ENDOPTION + OPTION 输入.bill_type <> "" + ios.bill_type = 输入.bill_type + ENDOPTION + OPTION 输入.stor_id <> "" + ios.stor_id = 输入.stor_id + ENDOPTION + GROUP BY + iosdtl.source_bill_code, + iosdtl.pcsn, + iosdtl.material_id + ) iosdtl2 ON ( iosdtl2.source_bill_code = Formula.workorder_code AND iosdtl2.material_id = FormulaDtl.material_id AND iosdtl2.pcsn = FormulaDtl.pcsn ) + WHERE + 1 = 1 + AND FormulaDtl.STATUS = '99' + AND Formula.is_delete = '0' + OPTION 输入.material_id <> "" + FormulaDtl.material_id = 输入.material_id + ENDOPTION + OPTION 输入.pcsn <> "" + FormulaDtl.pcsn = 输入.pcsn + ENDOPTION + order by Formula.formula_code + ENDSELECT + ENDQUERY + ENDIF + + + diff --git a/mes/qd/src/api/wms/st/core/outbill/checkoutbill.js b/mes/qd/src/api/wms/st/core/outbill/checkoutbill.js index 4af94a5e..4d5c4c5a 100644 --- a/mes/qd/src/api/wms/st/core/outbill/checkoutbill.js +++ b/mes/qd/src/api/wms/st/core/outbill/checkoutbill.js @@ -31,6 +31,15 @@ export function getOutBillDtl(params) { params }) } + +export function queryDtl2(params) { + return request({ + url: '/api/checkoutbill/queryDtl2', + method: 'get', + params + }) +} + export function getOutBillDis(params) { return request({ url: '/api/checkoutbill/getOutBillDis', @@ -155,4 +164,4 @@ export function getType() { method: 'get' }) } -export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType,backConfirm, getOutBillDisDtl, getType } +export default { queryDtl2, add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType } diff --git a/mes/qd/src/views/wms/statistics/outStorQuery/ViewDialog.vue b/mes/qd/src/views/wms/statistics/outStorQuery/ViewDialog.vue new file mode 100644 index 00000000..c518c8b2 --- /dev/null +++ b/mes/qd/src/views/wms/statistics/outStorQuery/ViewDialog.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/mes/qd/src/views/wms/statistics/outStorQuery/index.vue b/mes/qd/src/views/wms/statistics/outStorQuery/index.vue index 78ff6909..2daac082 100644 --- a/mes/qd/src/views/wms/statistics/outStorQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/outStorQuery/index.vue @@ -50,12 +50,12 @@ @@ -77,7 +77,7 @@ /> - + @@ -94,8 +94,7 @@ - - + - - - + + + + + @@ -121,6 +124,7 @@ + @@ -133,18 +137,19 @@ import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' import crudStorattr from '@/api/wms/basedata/st/storattr' import Date from '@/utils/datetime' +import ViewDialog from '@/views/wms/statistics/outStorQuery/ViewDialog' import StructIvt from '@/views/wms/statistics/outStorQuery/StructIvt' import crudRawAssist from '@/api/wms/st/core/inbill/rawassist' export default { - name: 'outStorQuery', - components: { StructIvt, crudOperation, rrOperation, pagination }, + name: 'OutStorQuery', + components: { ViewDialog, StructIvt, crudOperation, rrOperation, pagination }, cruds() { return CRUD({ title: '生产配粉领料', props: { // 每页数据条数 size: 20 - },idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill }, + }, idField: 'iostorinv_id', url: 'api/checkoutbill/queryDtl', crudMethod: { ...checkoutbill }, optShow: { add: false, edit: false, @@ -162,7 +167,9 @@ export default { permission: { }, structshow: false, + query_flag: true, currentRow: null, + viewShow: false, storlist: [], billtypelist: [] } @@ -181,12 +188,18 @@ export default { this.billtypelist = res }) this.crud.query.createTime = [new Date(), new Date()] - this.crud.toQuery() }, methods: { onInput() { this.$forceUpdate() }, + [CRUD.HOOK.beforeRefresh]() { + if (this.query_flag) { + this.crud.query.begin_time = (new Date()).strftime('%F', 'zh') + this.crud.query.end_time = (new Date()).strftime('%F', 'zh') + this.query_flag = false + } + }, async queryMater() { this.structshow = true }, @@ -199,16 +212,36 @@ export default { is_activeFormat(row, column) { return this.dict.label.is_usable[row.is_active] }, + mytoView(index, row) { + this.currentRow = row + this.currentRow.stor_id = this.crud.query.stor_id + this.currentRow.begin_time = this.crud.query.begin_time + this.currentRow.end_time = this.crud.query.end_time + this.currentRow.bill_type = this.crud.query.bill_type + this.currentRow.source_bill_code = this.crud.query.source_bill_code + this.currentRow.username = this.crud.query.username + this.viewShow = true + }, + mytoQuery(array1) { + if (array1 === null) { + this.crud.query.begin_time = '' + this.crud.query.end_time = '' + } else { + this.crud.query.begin_time = array1[0] + this.crud.query.end_time = array1[1] + } + this.crud.toQuery() + }, queryTableDtl(rows) { let devices = '' for (let i = 0; i < rows.length; i++) { - if ( i === 0 ) { + if (i === 0) { devices = rows[i].workorder_code - }else{ + } else { devices = devices + ',' + rows[i].workorder_code } } - if(rows.length > 0){ + if (rows.length > 0) { this.crud.query.source_bill_code = devices this.crud.toQuery() }