diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java index 8697fd67..9a83ad3c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java @@ -227,6 +227,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService { String nickName = SecurityUtils.getNickName(); String now = DateUtil.now(); WQLObject PDM_BI_WorkOrder = WQLObject.getWQLObject("PDM_BI_WorkOrder"); + WQLObject PDM_BI_Formula = WQLObject.getWQLObject("PDM_BI_Formula"); WQLObject PDM_BI_WorkTask = WQLObject.getWQLObject("PDM_BI_WorkTask"); WQLObject PDM_BI_WorkTaskJob = WQLObject.getWQLObject("PDM_BI_WorkTaskJob"); WQLObject PDM_BI_ProduceProcessRoute = WQLObject.getWQLObject("pdm_bi_productprocessroute"); @@ -256,6 +257,11 @@ public class WorkOrderServiceImpl implements WorkOrdereService { if (jsonMst == null) { throw new BadRequestException(jo.getString("workorder_code") + "当前工令记录状态异常,操作失败！"); } + + JSONObject Formula = PDM_BI_Formula.query("workorder_id ='" + jo.getString("workorder_id") + "' and is_delete = '0' and is_audit='0' ").uniqueResult(0); + if (Formula != null) { + throw new BadRequestException(jo.getString("workorder_code") + "工令对应配方未审核,操作失败！"); + } String nowStatus = jsonMst.getString("status"); JSONObject Route = PDM_BI_ProduceProcessRoute.query("is_delete='0' and productprocess_status='20' and material_id='" + jsonMst.getString("material_id") + "'").uniqueResult(0); if (Route == null) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FormulaController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FormulaController.java index 24ccefb5..5077ca2f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FormulaController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/rest/FormulaController.java @@ -58,6 +58,14 @@ public class FormulaController { public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(formulaService.queryAll(whereJson,page),HttpStatus.OK); } + @PostMapping("/audit") + @Log("保存") + @ApiOperation("保存") + public ResponseEntity audit(@RequestBody JSONObject whereJson){ + formulaService.audit(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/cancel") @Log("保存") @ApiOperation("保存") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FormulaService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FormulaService.java index b4264122..3b135dc6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FormulaService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FormulaService.java @@ -25,6 +25,11 @@ public interface FormulaService { * @param whereJson / */ void cancel(JSONObject whereJson); + /** + * 编辑 + * @param whereJson / + */ + void audit(JSONObject whereJson); /** * 提交 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java index 7baebaf6..88194ce3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java @@ -66,6 +66,10 @@ public class FormulaServiceImpl implements FormulaService { if (StrUtil.isNotEmpty(workorder_code)) { map.put("workorder_code", "%" + workorder_code + "%"); } + String formula_code = map.get("formula_code"); + if (StrUtil.isNotEmpty(formula_code)) { + map.put("formula_code", "%" + formula_code + "%"); + } String pcsn = map.get("pcsn"); if (StrUtil.isNotEmpty(pcsn)) { map.put("pcsn", "%" + pcsn + "%"); @@ -145,6 +149,30 @@ public class FormulaServiceImpl implements FormulaService { } } + @Override + @Transactional(rollbackFor = Exception.class) + public void audit(JSONObject whereJson) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getNickName(); + String now = DateUtil.now(); + + WQLObject PDM_BI_Formula = WQLObject.getWQLObject("PDM_BI_Formula"); + JSONArray rows = whereJson.getJSONArray("rows"); + for(int i=0;i "" Formula.status = 输入.status ENDOPTION + OPTION 输入.is_audit <> "" + Formula.is_audit = 输入.is_audit + ENDOPTION OPTION 输入.formula_code <> "" Formula.formula_code like 输入.formula_code ENDOPTION diff --git a/mes/qd/src/api/wms/pf/formula.js b/mes/qd/src/api/wms/pf/formula.js index 6328332b..51c21465 100644 --- a/mes/qd/src/api/wms/pf/formula.js +++ b/mes/qd/src/api/wms/pf/formula.js @@ -7,6 +7,13 @@ export function cancel(data) { data }) } +export function audit(data) { + return request({ + url: 'api/formula/audit', + method: 'post', + data + }) +} export function submit(data) { return request({ url: 'api/formula/submit', @@ -49,4 +56,4 @@ export function print(data) { data }) } -export default { cancel, getform, submit, getView, pointCard, preview, print } +export default { audit, cancel, getform, submit, getView, pointCard, preview, print } diff --git a/mes/qd/src/views/wms/pf/formula/ViewDialog.vue b/mes/qd/src/views/wms/pf/formula/ViewDialog.vue index ca80a29a..824ea1fe 100644 --- a/mes/qd/src/views/wms/pf/formula/ViewDialog.vue +++ b/mes/qd/src/views/wms/pf/formula/ViewDialog.vue @@ -90,6 +90,22 @@ /> + + + + + diff --git a/mes/qd/src/views/wms/pf/formula/index.vue b/mes/qd/src/views/wms/pf/formula/index.vue index eb402a09..f7984a0b 100644 --- a/mes/qd/src/views/wms/pf/formula/index.vue +++ b/mes/qd/src/views/wms/pf/formula/index.vue @@ -40,6 +40,15 @@ @change="crud.toQuery" /> + + + - - + + + - + + + + @@ -82,6 +108,17 @@ > 作废 + + 审核 + - - - - - - - - - - + + + + + + + + + + + + + @@ -244,7 +284,7 @@ export default { }, mixins: [presenter(), header(), crud()], // 数据字典 - dicts: ['formula_status', 'workorder_type', 'product_series', 'bucket_type'], + dicts: ['formula_status', 'workorder_type', 'product_series', 'bucket_type', 'is_again_put'], data() { return { dialogUpload: false, @@ -256,6 +296,7 @@ export default { }, divShow: false, dissub_flag: true, + audit_flag: true, change_flag: true, Export_flag: true, show_flag: true, @@ -301,6 +342,7 @@ export default { buttonChange(rows) { if (rows.length !== 0) { this.dissub_flag = false + this.audit_flag = false this.change_flag = false this.Export_flag = false this.show_flag = false @@ -308,10 +350,13 @@ export default { if (rows[i].status !== '20') { this.dissub_flag = true } + if (rows[i].status !== '20' || rows[i].is_audit !== '0') { + this.audit_flag = true + } if (rows[i].status === '99') { this.Export_flag = true } - if (!'30,20'.includes(rows[i].status) || rows.length !== 1) {//后台校验首道工序 + if (!'30,20'.includes(rows[i].status) || rows.length !== 1) { this.change_flag = true } } @@ -322,6 +367,9 @@ export default { stateFormat(row) { return this.dict.label.formula_status[row.status] }, + stateFormat2(row) { + return this.dict.label.is_again_put[row.is_audit] + }, bill_typeFormat(row) { return this.dict.label.workorder_type[row.workorder_type] }, @@ -339,6 +387,7 @@ export default { this.checkrows = [] this.mstrow = {} this.dissub_flag = true + this.audit_flag = true this.change_flag = true this.Export_flag = true this.show_flag = true @@ -366,6 +415,17 @@ export default { this.querytable() }) }, + audit(){ + this.checkrows = this.$refs.table.selection + if(this.checkrows.length === 0){ + this.crud.notify('请先选择需要审核的配方记录！') + return false + } + formula.audit({'rows':this.checkrows}).then(res => { + this.crud.notify('审核配方成功！') + this.querytable() + }) + }, querytable() { this.crud.toQuery() this.handleCurrentChange()