零件采购单审批

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;
     /**
      * 子项目编码
      */

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;
     /**
      * 子项目编码
      */

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)

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);

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'
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue

@@ -6,8 +6,8 @@
   <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
     <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="130px">
-      <el-form-item label="采购单号" prop="purchaseNo">
+      <el-form-item label="采购单号" prop="contractNo">
-        <el-input v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.enter="handleQuery"
+        <el-input v-model="queryParams.contractNo" placeholder="采购单号" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
@@ -20,9 +20,14 @@
       <el-form-item label="供应商" prop="supplierName">
         <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="采购单类型" prop="goodStatus">
+      <el-form-item label="采购单类型" prop="goodType">
-        <el-select v-model="queryParams.goodStatus" placeholder="请选择采购状态" clearable class="!w-240px">
+        <el-select v-model="queryParams.goodType" placeholder="请选择采购单类型" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.PART_PURCHASE_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PART_PURCHASE_ORDER_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DOCUMENT_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item style="margin-left:15px">
@@ -41,33 +46,29 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
       <el-table-column label="序号" type="index" align="center" fixed min-width="70px" />
-      <el-table-column label="物料需求计划单号" align="center" prop="projectMaterialPlanNo" min-width="180" fixed>
+      <el-table-column label="采购单号" align="center" prop="contractNo" min-width="180" fixed>
         <template #default="scope">
           <el-button text type="primary" @click="openForm('detail', scope.row.id)">
-            {{ scope.row.projectMaterialPlanNo }}
+            {{ scope.row.contractNo }}
           </el-button>
         </template>
       </el-table-column>
+      <el-table-column label="采购单类型" align="center" prop="goodType" min-width="180px" />
+      <el-table-column label="客户简码" align="center" prop="brief" min-width="180px" />
       <el-table-column label="项目名称" align="center" prop="projectName" min-width="180px" />
-      <el-table-column label="子项目名称" align="center" prop="name" min-width="180px" />
+      <el-table-column label="项目简码" align="center" prop="projectNameSim" min-width="180px" />
-      <el-table-column label="客户简称" align="center" prop="brief" min-width="180px" />
+      <el-table-column label="单据状态" align="center" prop="status" min-width="180px" />
-      <el-table-column label="制单日期" align="center" prop="matPlanDate" :formatter="dateFormatter1" min-width="150" />
-      <el-table-column label="需求计划类型" align="center" prop="matType"  min-width="150">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HELI_MAT_TYPE" :value="scope.row.matType" />
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" min-width="180">
         <template #default="scope">
           <el-button
             link
-            type="danger"
+            type="primary"
-            @click="handleDelete(scope.row.id)"
+            @click="openForm('detail', scope.row.id)"
           >
-            删除
+            去审核
           </el-button>
           <el-button link type="primary" @click="openForm('detail', scope.row.id)">
-            详情信息
+            查看详情
           </el-button>
         </template>
       </el-table-column>
@@ -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) // 导出的加载中

mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue

@@ -54,6 +54,7 @@
       <template #header>
         <div class="hl-card-info-icona"></div><span class="hl-card-info-text">采购单明细</span>
         <el-button  style="margin-left: 18px" @click="singleSubmissions()" type="success"  size="large">订单生成</el-button>
+        <el-button  style="margin-left: 18px" @click="routerToPurchaseOrderNo()" type="success"  size="large">零件采购订单管理</el-button>
       </template>
       <el-row>
         <el-col>
@@ -72,7 +73,15 @@
                 <el-table-column label="技术要求" align="center" prop="description" min-width="180" />
                 <el-table-column label="理论重量" align="center" prop="theWeight" min-width="100" />
                 <el-table-column label="价格" align="center" prop="estimatedPrice" min-width="100" />
-                <el-table-column label="订单状态" align="center" prop="orderStatus" min-width="100" />
+                <el-table-column label="订单状态" align="center" prop="orderStatus" min-width="100" >
+                  <template #default="scope">
+                    {{
+                      getIntDictOptions(DICT_TYPE.PART_PURCHASE_STATUS).find(
+                          (dict) => dict.value === scope.row.orderStatus
+                      )?.label || '未知状态'
+                    }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="采购订单号" align="center" prop="purchaseNo" min-width="180" />
                 <el-table-column label="责任人" align="center" prop="duEmpName" min-width="100" />
               </el-table>
@@ -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');