Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/post/flow.vue

@@ -129,8 +129,7 @@ const NODE_EVENT_CONFIG = {
     { id: 'H', label: '选择工艺路线', handler: 'handleOpen', params: { componentPath: 'wms/post/aps/schedule' } },
     { id: 'I', label: '自动生成排产项', handler: 'handleOpen', params: { componentPath: 'wms/post/aps/schedule' } },
     { id: 'J', label: '已排产明细管理', handler: 'handleOpen', params: { componentPath: 'wms/post/aps/schedule' } },
-    { id: 'K', label: '按工序绑定钢卷', handler: 'handleOpen', params: { componentPath: 'wms/post/aps/compare' } },
+    { id: 'K', label: '执行生产', handler: 'handleOpen', params: { componentPath: 'wms/post/aps/schedule' } },
-    { id: 'L', label: '执行生产', handler: 'handleOpen', params: { componentPath: 'wms/post/aps/schedule' } },
   ],
   equipmentRepair: [
     { id: 'A', label: '创建维修计划', handler: 'handleOpen', params: { componentPath: 'wms/post/eqp/index' } },
@@ -164,11 +163,14 @@ const NODE_EVENT_CONFIG = {
 
   inspection: [
     { id: 'A', label: '维护检验方案模板', handler: 'handleOpen', params: { componentPath: 'mes/qc/template/index' } },
-    { id: 'B', label: '取样/检验数据录入', handler: 'handleOpen', params: { componentPath: 'mes/qc/inspectionSample/index' } },
+    { id: 'B', label: '检验数据录入', handler: 'handleOpen', params: { componentPath: 'mes/qc/inspectionSample/index' } },
-    { id: 'D', label: '常规检验录入', handler: 'handleOpen', params: { componentPath: 'mes/qc/inspectionSample/index' } },
+    { id: 'D', label: '化学检验数据', handler: 'handleOpen', params: { componentPath: 'mes/qc/inspectionSample/index' } },
     { id: 'E', label: '拉伸检验（专项）', handler: 'handleOpen', params: { componentPath: 'mes/qc/inspectionTensile/index' } },
-    { id: 'H', label: '生成质量证明书', handler: 'handleOpen', params: { componentPath: 'mes/qc/certificate/book' } },
+    { id: 'F', label: '创建审批申请', handler: 'handleOpen', params: { componentPath: 'mes/qc/approval/index' } },
-    { id: 'I', label: '触发质量评审', handler: 'handleOpen', params: { componentPath: 'mes/qc/qualityReview/index' } },
+    { id: 'H', label: '审批中', handler: 'handleOpen', params: { componentPath: 'mes/qc/approval/index' } },
+    { id: 'J', label: '填写检验数据', handler: 'handleOpen', params: { componentPath: 'mes/qc/approval/index' } },
+    { id: 'M', label: '生成质量证明书', handler: 'handleOpen', params: { componentPath: 'mes/qc/certificate/book' } },
+    { id: 'N', label: '触发质量评审', handler: 'handleOpen', params: { componentPath: 'mes/qc/qualityReview/index' } },
   ],
 
   qualityReview: [
@@ -320,9 +322,8 @@ graph TD
 
   H --> I["<b>自动生成排产项</b><br/>按工序步骤分组"]:::p7
   I --> J["<b>已排产明细管理</b><br/>按步骤查看/编辑<br/>内联修改排产状态"]:::p7
-  J --> K["<b>按工序绑定钢卷</b><br/>将现存钢卷绑定到<br/>对应的排产明细"]:::p8
+  J --> K["<b>执行生产</b>"]:::p8
-  K --> L["<b>执行生产</b>"]:::p9
+  K --> L(["<b>排产完结</b>"]):::pend
-  L --> M(["<b>排产完结</b>"]):::pend
 
   classDef p1 fill:#409eff,stroke:#337ecc,color:#fff,stroke-width:2px
   classDef p2 fill:#e6fffa,stroke:#13c2c2,color:#303133,stroke-width:2px
@@ -332,7 +333,6 @@ graph TD
   classDef p6 fill:#fffbe6,stroke:#fadb14,color:#606266,stroke-width:2px
   classDef p7 fill:#fff0f6,stroke:#eb2f96,color:#303133,stroke-width:2px
   classDef p8 fill:#f6ffed,stroke:#52c41a,color:#303133,stroke-width:2px
-  classDef p9 fill:#f0f5ff,stroke:#597ef7,color:#303133,stroke-width:2px
   classDef dec fill:#f9f0ff,stroke:#722ed1,color:#303133,stroke-width:2px
   classDef pend fill:#dcf7e8,stroke:#52c41a,color:#303133,stroke-width:2px,rx:10,ry:10
   linkStyle default stroke:#bfbfbf,stroke-width:2px
@@ -427,25 +427,34 @@ graph TD
 
   inspection: `
 graph TD
-  A["<b>维护检验方案模板</b><br/>定义检验项/单位/标准"]:::i1
+  A["<b>维护检验方案模板</b><br/>定义检验项目/单位/标准值"]:::i1
-  A --> B["<b>取样/检验数据录入</b><br/>选择方案模板<br/>动态生成检验项表格"]:::i2
+  A --> B["<b>检验数据录入</b><br/>选择方案模板<br/>填写样品信息<br/>录入检验结果"]:::i2
-  B --> C{"检验项类型"}:::dec
+  B --> C{"检验类型"}:::dec
-  C -->|常规项| D["<b>常规检验录入</b><br/>直接在模板表格<br/>填写检测数据"]:::i3
+  C -->|化学检验| D["<b>化学检验数据</b><br/>按模板动态生成<br/>检验项表格并填值"]:::i3
-  C -->|拉伸试验| E["<b>拉伸检验（专项）</b><br/>独立试验记录<br/>管理明细数据"]:::i4
+  C -->|物理检验| E["<b>拉伸检验（专项）</b><br/>独立试验记录<br/>管理明细数据"]:::i4
-  D --> F["<b>汇总检验结果</b>"]:::i5
+  D --> F["<b>创建审批申请</b><br/>关联检验记录<br/>填写申请信息"]:::i5
   E --> F
-  F --> G{"判定"}:::dec
+  F --> G{"审批流转"}:::dec
-  G -->|合格| H["<b>生成质量证明书</b><br/>汇总全部检验数据"]:::i6
+  G -->|送审| H["<b>审批中</b><br/>待审批"]:::i6
-  G -->|不合格| I["<b>触发质量评审</b><br/>进入评审流程"]:::i7
+  H --> I{"审批"}:::dec
-  H --> J(["检验归档"]):::iend
+  I -->|通过| J["<b>填写检验数据</b><br/>录入详细检验结果<br/>含判定"]:::i7
+  I -->|驳回| K["<b>退回修改</b><br/>重新编辑后送审"]:::i8
+  K --> F
+  J --> L{"判定"}:::dec
+  L -->|合格| M["<b>生成质量证明书</b><br/>管理/编辑/打印<br/>支持化学/物理模板"]:::i9
+  L -->|不合格| N["<b>触发质量评审</b><br/>进入评审流程"]:::i10
+  M --> O(["检验归档"]):::iend
 
   classDef i1 fill:#409eff,stroke:#337ecc,color:#fff,stroke-width:2px
   classDef i2 fill:#e6fffa,stroke:#13c2c2,color:#303133,stroke-width:2px
   classDef i3 fill:#fff7e6,stroke:#fa8c16,color:#303133,stroke-width:2px
   classDef i4 fill:#f0f5ff,stroke:#597ef7,color:#303133,stroke-width:2px
   classDef i5 fill:#fffbe6,stroke:#fadb14,color:#303133,stroke-width:2px
-  classDef i6 fill:#f6ffed,stroke:#52c41a,color:#303133,stroke-width:2px
+  classDef i6 fill:#e6f7ff,stroke:#1890ff,color:#303133,stroke-width:2px
-  classDef i7 fill:#fff1f0,stroke:#f5222d,color:#303133,stroke-width:2px
+  classDef i7 fill:#f6ffed,stroke:#52c41a,color:#303133,stroke-width:2px
+  classDef i8 fill:#fff1f0,stroke:#f5222d,color:#303133,stroke-width:2px
+  classDef i9 fill:#f0f5ff,stroke:#597ef7,color:#303133,stroke-width:2px
+  classDef i10 fill:#fff1f0,stroke:#f5222d,color:#303133,stroke-width:2px
   classDef dec fill:#f9f0ff,stroke:#722ed1,color:#303133,stroke-width:2px
   classDef iend fill:#dcf7e8,stroke:#52c41a,color:#303133,stroke-width:2px,rx:10,ry:10
   linkStyle default stroke:#bfbfbf,stroke-width:2px