Merge remote-tracking branch 'origin/weiqiao-vue3' into weiqiao-vue3

xjrsoft-vue3/src/api/scgl/scrw/model/ScrwModel.ts

@@ -6,7 +6,9 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface MesProductionTaskPageParams extends BasicPageParams {
   rwbh: string;
 
-  sfnbdd: string;
+  jhbh: string;
+
+  hjzt: string;
 }
 
 /**
@@ -17,14 +19,14 @@ export interface MesProductionTaskPageModel {
 
   jhbh: string;
 
+  rwbh: string;
+
   cpid: string;
 
   rch: string;
 
   zch: string;
 
-  sfnbdd: string;
-
   jhksrq: string;
 
   jhjsrq: string;
@@ -115,6 +117,8 @@ export interface MesProductionTaskModel {
   modifyUserId: string;
 
   mesProductionGongdanList?: MesProductionGongdanModel;
+
+  mesWarehouseMaterialList?: MesWarehouseMaterialModel;
 }
 
 /**
@@ -123,6 +127,8 @@ export interface MesProductionTaskModel {
 export interface MesProductionGongdanModel {
   id: string;
 
+  roductionTaskId: string;
+
   deleteMark: string;
 
   rwbh: string;
@@ -141,7 +147,9 @@ export interface MesProductionGongdanModel {
 
   cplx: string;
 
-  gx: string;
+  gxId: string;
+
+  gxbh: string;
 
   gxmc: string;
 
@@ -203,6 +211,97 @@ export interface MesProductionGongdanModel {
 }
 
 /**
+ * @description: MesWarehouseMaterial表类型
+ */
+export interface MesWarehouseMaterialModel {
+  id: string;
+
+  wlId: string;
+
+  roductionTaskId: string;
+
+  deleteMark: string;
+
+  bz: string;
+
+  zt: string;
+
+  wlbh: string;
+
+  wlmc: string;
+
+  wlgg: string;
+
+  wlxh: string;
+
+  xjbom: string;
+
+  blsl: string;
+
+  kcl: string;
+
+  khbz: string;
+
+  nkbz: string;
+
+  sftl: string;
+
+  bldh: string;
+
+  lldh: string;
+
+  llr: string;
+
+  llbm: string;
+
+  llsl: string;
+
+  shren: string;
+
+  fllldh: string;
+
+  fllrq: string;
+
+  fllr: string;
+
+  fllbm: string;
+
+  fllsl: string;
+
+  flgg: string;
+
+  flbz: string;
+
+  p1: string;
+
+  p2: string;
+
+  p3: string;
+
+  p4: string;
+
+  p5: string;
+
+  p6: string;
+
+  p7: string;
+
+  p8: string;
+
+  p9: string;
+
+  p10: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
+}
+
+/**
  * @description: MesProductionTask分页返回值结构
  */
 export type MesProductionTaskPageResult = BasicFetchResult<MesProductionTaskPageModel>;