feat(jcsj): 更新工艺管理配置和生产计划组件

- 添加额定工时字段配置
- 修改产品物料相关字段映射关系
- 调整工作流权限配置中的字段定义
- 更新生产计划产品列表组件配置
- 修改表单模型中字段名称映射逻辑

xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts

@@ -26,6 +26,8 @@ export interface RokeProcessPageModel {
   categoryId: string;
 
   collectionSchemeId: string;
+
+  ratedWorkingHours: string;
 }
 
 /**
@@ -118,60 +120,26 @@ export interface RokeProcessModel {
 
   zyzdtpFile: string;
 
-  mesProcessItemList?: MesProcessItemModel;
-
   mesProcessProductList?: MesProcessProductModel;
+
+  mesProcessSchemeList?: MesProcessSchemeModel;
 }
 
 /**
- * @description: MesProcessItem表类型
+ * @description: MesProcessProduct表类型
  */
-export interface MesProcessItemModel {
+export interface MesProcessProductModel {
   id: string;
 
-  processId: string;
-
-  code: string;
-
-  name: string;
-
-  required: string;
-
-  categoryId: string;
-
-  contentType: string;
-
-  dataType: string;
-
-  dictId: string;
-
-  relatedModelId: string;
-
-  relatedModelName: string;
-
-  relatedModelDomain: string;
-
-  standardValue: string;
-
-  upperValue: string;
-
-  lowerValue: string;
-
-  note: string;
-
-  companyId: string;
-
-  qualityCategoryId: string;
-
-  analysisMethod: string;
+  deleteMark: string;
 
-  qualityMethodId: string;
+  productId: string;
 
-  destructive: string;
+  processId: string;
 
-  keyItem: string;
+  erpid: string;
 
-  deleteMark: string;
+  bz: string;
 
   createDate: string;
 
@@ -180,67 +148,27 @@ export interface MesProcessItemModel {
   modifyDate: string;
 
   modifyUserId: string;
+
+  isFeeding: string;
+
+  number: string;
 }
 
 /**
- * @description: MesProcessProduct表类型
+ * @description: MesProcessScheme表类型
  */
-export interface MesProcessProductModel {
+export interface MesProcessSchemeModel {
   id: string;
 
-  deleteMark: string;
-
-  cpbh: string;
-
-  cpmc: string;
-
-  nbdm: string;
-
-  hjzt: string;
-
-  cptp: string;
-
-  kxs: string;
-
-  kcg: string;
-
-  wllx: string;
-
-  cplx: string;
-
-  gg: string;
-
-  xh: string;
-
-  fpl: string;
-
-  bzzl: string;
-
-  erpid: string;
-
-  zygf: string;
-
-  bz: string;
-
-  p1: string;
-
-  p2: string;
-
-  p3: string;
-
-  p4: string;
-
-  p5: string;
-
-  p6: string;
+  processId: string;
 
-  p7: string;
+  collectionSchemeId: string;
 
-  p8: string;
+  required: string;
 
-  p9: string;
+  note: string;
 
-  p10: string;
+  deleteMark: string;
 
   createDate: string;
 
@@ -249,12 +177,6 @@ export interface MesProcessProductModel {
   modifyDate: string;
 
   modifyUserId: string;
-
-  processId: string;
-
-  isFeeding: string;
-
-  number: string;
 }
 
 /**

xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts

@@ -155,8 +155,23 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesProcessProductList',
+        fieldName: '产品物料id',
+        fieldId: 'productId',
+        type: 'Input',
+        key: '6e053d43971d4157b0f9118f9cbbb4bb',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessProductList',
         fieldName: '编号',
-        fieldId: 'cpbh',
+        fieldId: 'bianHao3907',
         type: 'Input',
         key: '00c0e93b675841f48265b896515a5241',
         children: [],
@@ -171,7 +186,7 @@ export const permissionList = [
         showChildren: false,
         tableName: 'mesProcessProductList',
         fieldName: '名称',
-        fieldId: 'cpmc',
+        fieldId: 'mingChen2461',
         type: 'Input',
         key: '91863c5a0ec24d76ade8735cd401059b',
         children: [],
@@ -216,9 +231,9 @@ export const permissionList = [
         showChildren: false,
         tableName: 'mesProcessProductList',
         fieldName: '备注',
-        fieldId: 'bz',
-        type: 'InputTextArea',
-        key: '1084a7c39baf47ba9a0251cb4e2f8c14',
+        fieldId: 'beiZhu7713',
+        type: 'Input',
+        key: '86ad9fb6998c4d0ea8e11ed0ef6585cb',
         children: [],
       },
     ],
@@ -230,9 +245,9 @@ export const permissionList = [
     disabled: false,
     isSubTable: true,
     showChildren: false,
-    tableName: 'mesProcessItemList',
+    tableName: 'mesProcessSchemeList',
     fieldName: '',
-    fieldId: 'mesProcessItemList',
+    fieldId: 'mesProcessSchemeList',
     type: 'form',
     key: '3fd474ce5f8c4bf78bd86dc701cbdc4f',
     children: [
@@ -244,9 +259,9 @@ export const permissionList = [
         isSubTable: false,
         isSaveTable: false,
         showChildren: false,
-        tableName: 'mesProcessItemList',
+        tableName: 'mesProcessSchemeList',
         fieldName: '编码',
-        fieldId: 'code',
+        fieldId: 'bianMa8881',
         type: 'Input',
         key: '3999831fde0a4e879f64f33eb2a1edd1',
         children: [],
@@ -259,9 +274,9 @@ export const permissionList = [
         isSubTable: false,
         isSaveTable: false,
         showChildren: false,
-        tableName: 'mesProcessItemList',
+        tableName: 'mesProcessSchemeList',
         fieldName: '名称',
-        fieldId: 'name',
+        fieldId: 'mingChen4867',
         type: 'Input',
         key: 'ab6576e960ee44b4af09975e64088f05',
         children: [],
@@ -274,11 +289,11 @@ export const permissionList = [
         isSubTable: false,
         isSaveTable: false,
         showChildren: false,
-        tableName: 'mesProcessItemList',
+        tableName: 'mesProcessSchemeList',
         fieldName: '数据类型',
-        fieldId: 'dataType',
-        type: 'XjrSelect',
-        key: '745cb3bb014d4dd9ba38139d17b2f305',
+        fieldId: 'mingChen3506',
+        type: 'Input',
+        key: 'f086101bc78b4471b3cb95b3970c368e',
         children: [],
       },
       {
@@ -289,11 +304,11 @@ export const permissionList = [
         isSubTable: false,
         isSaveTable: false,
         showChildren: false,
-        tableName: 'mesProcessItemList',
+        tableName: 'mesProcessSchemeList',
         fieldName: '是否必填',
-        fieldId: 'required',
-        type: 'Switch',
-        key: '36a40652260d491e8a088ff843aab982',
+        fieldId: 'mingChen6235',
+        type: 'Input',
+        key: '5d40e3c7f274461aba1f041c5f33c13d',
         children: [],
       },
       {
@@ -304,11 +319,11 @@ export const permissionList = [
         isSubTable: false,
         isSaveTable: false,
         showChildren: false,
-        tableName: 'mesProcessItemList',
+        tableName: 'mesProcessSchemeList',
         fieldName: '备注',
-        fieldId: 'note',
-        type: 'InputTextArea',
-        key: 'f3ba1f809888475d925665668e2a1851',
+        fieldId: 'beiZhu2454',
+        type: 'Input',
+        key: '7674096c8feb431a8689c584a93c5b8a',
         children: [],
       },
     ],

xjrsoft-vue3/src/views/scgl/scjh/components/config.ts

@@ -487,6 +487,36 @@ export const formProps: FormProps = {
         mainKey: 'mesProductionPlanProductList',
         columns: [
           {
+            key: '0b5e3de2d92f4a1cba6a650cff672653',
+            title: 'id',
+            dataIndex: 'id',
+            componentType: 'Input',
+            defaultValue: '',
+            componentProps: {
+              width: '100%',
+              span: '',
+              defaultValue: '',
+              placeholder: '请输入id',
+              prefix: '',
+              suffix: '',
+              addonBefore: '',
+              addonAfter: '',
+              disabled: false,
+              allowClear: false,
+              showLabel: true,
+              required: false,
+              rules: [],
+              events: {},
+              listStyle: '',
+              isSave: false,
+              isShow: false,
+              scan: false,
+              bordered: true,
+              isShowAi: false,
+              tooltipConfig: { visible: false, title: '提示文本' },
+            },
+          },
+          {
             key: '416cd1b15c314d0dafaf6fc91e3f4653',
             title: '产品选择',
             dataIndex: 'cpid',

xjrsoft-vue3/src/views/scgl/scjh/components/workflowPermission.ts

@@ -156,6 +156,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesProductionPlanProductList',
+        fieldName: 'id',
+        fieldId: 'id',
+        type: 'Input',
+        key: '0b5e3de2d92f4a1cba6a650cff672653',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProductionPlanProductList',
         fieldName: '产品选择',
         fieldId: 'cpid',
         type: 'MultiplePopup',