diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java index bb1e467..8f332d7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PartPurchaseOrderPageRespVO.java @@ -114,7 +114,7 @@ public class PartPurchaseOrderPageRespVO extends BaseDO { /** * 订单状态 未生成/已生成 1/2 */ - private Boolean orderStatus; + private Integer orderStatus; /** * 子项目编码 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java index 3d1f961..5cc8d27 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java @@ -121,7 +121,7 @@ public class PurchaseOrderMakeDetailDO extends BaseDO { /** * 订单状态 未生成/已生成 1/2 */ - private Boolean orderStatus; + private Integer orderStatus; /** * 子项目编码 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java index b9927aa..fdcc6a5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java @@ -163,6 +163,10 @@ public class PurchaseOrderNoDetailDO extends BaseDO { * 责任人id */ private Long duEmpId; + /** + * 工序id + */ + private Long procedureId; @TableField(exist = false) private Long matId; @TableField(exist = false) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java index 0dc13ab..191bdcb 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java @@ -81,7 +81,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ PurchaseOrderMakeDetailDO purchaseOrderMakeDetailDO = new PurchaseOrderMakeDetailDO(); purchaseOrderMakeDetailDO.setId(detailDO.getId()); - purchaseOrderMakeDetailDO.setOrderStatus(true); + purchaseOrderMakeDetailDO.setOrderStatus(2); purchaseOrderMakeDetailDO.setPurchaseOrderNoId(purchaseOrderId); purchaseOrderMakeDetailDO.setPurchaseOrderNoDetailId(purchaseOrderDetailId); purchaseOrderMakeDetailMapper.updateById(purchaseOrderMakeDetailDO); diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index bea430e..72a44ac 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts @@ -288,5 +288,6 @@ export enum DICT_TYPE { HELI_PART_PURCHASE_ORDER_TYPE='heli_part_purchase_order_type', HELI_MAT_REQ_TYPE='heli_mat_req_type', HELI_MAT_REQ_STATUS='heli_mat_req_status', - HELI_MATERIAL_STATUS='heli_material_status' + HELI_MATERIAL_STATUS='heli_material_status', + HELI_DOCUMENT_STATUS='heli_document_status' } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue index f3fc10b..84b5028 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue @@ -6,8 +6,8 @@ - - + @@ -20,9 +20,14 @@ - - - + + + + + + + + @@ -41,33 +46,29 @@ - + + + - - - - - - + + @@ -99,7 +100,7 @@ const queryParams = reactive({ pageNo: 1, pageSize: 10, id: undefined, - purchaseNo: undefined, + contractNo: undefined, projectId: undefined, projectPlanId: undefined, submitUserId: undefined, @@ -109,10 +110,11 @@ const queryParams = reactive({ submitTime: [], auditor: undefined, auditTime: [], - goodStatus: undefined, + goodType: 2, description: undefined, createTime: [], matType:0, + status:1 }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue index ba4ee53..c07f26e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue @@ -54,6 +54,7 @@ @@ -72,7 +73,15 @@ - + + + @@ -179,6 +188,9 @@ const singleSubmission= (val) =>{ multipleTable.value.push(val) submitForm(); } +const routerToPurchaseOrderNo=()=>{ + router.push({ path: '/purchase/purchaseorderno'}); +} const singleSubmissions=()=>{ submitForm(); } @@ -230,7 +242,6 @@ const submitForm = async () => { ]); message.success("提交成功"); - router.push({ path: '/purchase/purchaseorderno'}) getList(); // 确保刷新完成 emit('success');