From f37b0afe88e43115918217e6c3915889c89e8aed Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Fri, 30 Jun 2023 10:23:26 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=96=B0=E5=A2=9E=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PcsIfPurchaseorderController.java | 14 ++ .../impl/PcsIfPurchaseorderServiceImpl.java | 9 +- mes/qd/src/api/data.js | 2 +- .../views/wms/pcs/purchaseplan/AddDialog.vue | 136 ++---------------- .../src/views/wms/pcs/purchaseplan/index.vue | 17 ++- 5 files changed, 42 insertions(+), 136 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java index af312ad3..85266b21 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java @@ -83,6 +83,20 @@ public class PcsIfPurchaseorderController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/confirm") + @Log("强制确认原料需求") + @ApiOperation("强制确认原料需求") + public ResponseEntity confirm(@RequestBody List list) { + list.forEach(order -> { + order.setStatus(PCSEnum.BILL_STATUS.code("完成")); + order.setConfirm_id(SecurityUtils.getCurrentUserId()); + order.setConfirm_name(SecurityUtils.getCurrentNickName()); + order.setConfirm_time(DateUtil.now()); + purchaseorderService.updateById(order); + }); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("/getDtl") @Log("获取原料需求明细") @ApiOperation("获取原料需求明细") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java index 740a299a..708b24b3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java @@ -73,7 +73,8 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl getDtl(JSONObject jo) { String material_id = jo.getString("material_id"); - return this.list(new QueryWrapper().eq("material_id", material_id).eq("status", PCSEnum.BILL_STATUS.code("生成")).eq("is_delete", false)); + String status = jo.getString("status"); + return this.list(new QueryWrapper().eq("material_id", material_id).eq("status", status).eq("is_delete", false)); } @Override @@ -82,6 +83,12 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl - + @@ -30,6 +30,7 @@ - -
- - - - - 新增一行 - - - -
- - + + - + + + - + - - - - -1) { // 移除找到的指定元素 - this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty) - rows.splice(index, 1) - this.form.detail_count = this.form.tableData.length - } - } - } - }, - tableChanged(item) { - this.form.qty_unit_id = item.base_unit_id - this.form.qty_unit_name = item.base_unit_name - this.form.material_code = item.material_code - this.form.material_name = item.material_name - this.form.material_id = item.material_id - this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(row.plan_qty) - }, - add() { - if (!this.form.material_code){ - this.crud.notify('请选择一种物料进行新增！', CRUD.NOTIFICATION_TYPE.INFO) - return false - } - const row = {} - row.material_code = this.form.material_code - row.material_name = this.form.material_name - row.qty_unit_name = this.form.qty_unit_name - this.$set(row,'ask_time',null) - this.$set(row,'qty',null) - this.form.tableData.splice(-1, 0, row) - }, - insertEvent() { - this.materShow = true - }, - insertBill(row) { - this.billShow = true - }, - changeQty() { - this.form.total_qty = 0 - this.form.tableData.forEach((item) => { - this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty) - }) } } } diff --git a/mes/qd/src/views/wms/pcs/purchaseplan/index.vue b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue index 9a2d4504..9a04da2e 100644 --- a/mes/qd/src/views/wms/pcs/purchaseplan/index.vue +++ b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue @@ -34,11 +34,10 @@ @@ -118,7 +117,7 @@ icon="el-icon-finished" :disabled="crud.selections.length !== 1" size="mini" - @click="commit(crud.selections)" + @click="crud.toEdit(crud.selections[0])" > 确认采购 @@ -129,7 +128,7 @@ icon="el-icon-check" :disabled="crud.selections.length === 0" size="mini" - @click="commit(crud.selections)" + @click="confirm(crud.selections)" > 强制完成 @@ -163,7 +162,7 @@ - + @@ -194,7 +193,7 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import DateRangePicker from '@/components/DateRangePicker/index' -import AddDialog from '@/views/wms/pcs/purchaseorder/AddDialog' +import AddDialog from '@/views/wms/pcs/purchaseplan/AddDialog' import crudStorattr from '@/views/wms/storage_manage/basedata/basedata' import { download } from '@/api/data' import { downloadFile } from '@/utils' @@ -207,7 +206,7 @@ export default { return CRUD({ title: '', optShow: {reset: true}, - idField: 'id', + idField: 'id,desc', query: { 'status': '1' }, @@ -282,8 +281,8 @@ export default { crud.downloadLoading = false }) }, - commit(rows) { - crudPurchase.commit(rows).then(res => { + confirm(rows) { + crudPurchase.confirm(rows).then(res => { this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() })