Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/mes/workstation/index.vue

@@ -65,7 +65,6 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import {mainBindBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'Workstation' })
 
@@ -136,7 +135,7 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
-  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 删除
+  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定
 ]
 
 // 列表-操作按钮事件
@@ -144,9 +143,9 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    await handleDelete(row.id)
-  }else if (val == 'bind') { // 绑定
+  }else if (val == 'bind') { // 删除
-    detailRef.value.openDetail(row, row.name, "绑定", 'mesWorkstation')
+    await detailRef.value.openDetail(row, '绑定', row.name, 'mesWorkstation')
   }
 }
 

src/views/mes/workstation/workstation.data.ts

@@ -1,12 +1,13 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
 // 表单校验
 export const WorkstationRules = reactive({
-  code: [required],
+  code: [required]
-  name: [required]
 })
 
 export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
+
   {
     label: '代码',
     field: 'code',

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -8,6 +8,18 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data'
 
+import * as WarehouseApi  from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkStationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
 // 表单校验
 export const CallmaterialsRules = reactive({
   itemCode: [required],
@@ -81,12 +93,22 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
-    sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
     table: {
-      width: 120
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'  
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '批次',
@@ -116,6 +138,126 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '车间',
+    field: 'workshopCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '工位',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'available',
+          value:'TRUE',
+          isMainValue: false
+        }] 
+    },
+  },
   {
     label: '是否确认接收',
     field: 'isRecive',
@@ -123,7 +265,6 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    sort: 'custom',
     table: {
       width: 150
     },

src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@@ -82,7 +82,12 @@ const tableColumns = ref(Callmaterials.allSchemas.tableColumns)
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
+    if (formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+      setV['uom'] = val[0]['uom']
+    } else {
+      setV[formField] = val[0][searchField]
+    }
     formRef.setValues(setV)
   })
 }

src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts

@@ -19,12 +19,6 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isForm: false,
   },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    isForm: false,
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@@ -34,15 +34,6 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 180
-    },
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -89,7 +89,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
 // 备货申请
 defineOptions({ name: 'StockupMainRequest' })
 
@@ -124,9 +124,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['inventoryStatus'] = val[0]['inventoryStatus']
         row['itemCode'] = val[0]['itemCode']
         row['uom'] = val[0]['uom']
-      } else if(formField == 'toLocationCode'){
+      }
-        console.log(row,111);
+      if(formField == 'toLocationCode'){
-        
         row['toLocationCode'] = val[0]['code']
       }else{
         row[formField] = val[0][searchField]

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -4,9 +4,6 @@ import { TableColumn } from '@/types/table'
 import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
-import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
-import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
-
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
@@ -51,35 +48,6 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    table: {
-      width: 140
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '发货计划信息', // 查询弹窗标题
-        searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
-        {
-          key: 'status',
-          value: '6',
-          isMainValue: false
-        }]
-      }
-    }
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -142,7 +142,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -155,7 +155,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',