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

src/api/wms/balance/index.ts

@@ -51,6 +51,16 @@ export const getBalancePageReturn= async (params) => {
     return await request.get({ url: `/wms/balance/pageReturn`, params })
   }
 }
+// 查询库存余额列表
+export const getBalancePagePutaway= async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/senior', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pagePutaway`, params })
+  }
+}
 // 查询库存余额列表增加物品筛选条件
 export const getBalanceItemPage = async (params) => {
   if (params.isSearch) {

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -71,6 +71,7 @@
     :apiDelete="DeliverRequestDetailApi.deleteDeliverRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShow = trueFalse
   />
 
   <!-- 导入 -->
@@ -98,6 +99,8 @@ routeName.value = route.name
 const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)
 
 const isShowButton = ref(true)
+//定义  展示子表数据时是否显示新增/修改/删除按钮
+const trueFalse = ref()
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -314,6 +317,12 @@ const openForm =async (type: string, row?: number) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  console.log(999,row.deliverPlanNumber);
+  if(row.deliverPlanNumber != null){
+        trueFalse.value = false
+    }else {
+      trueFalse.value = true
+    }
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -277,17 +277,17 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['fromLocationCode'] = val[0]['locationCode']
       setV['uom'] = val[0]['uom']
       if(routeName.value == 'OktoholdRequestMain'){
-          row['toInventoryStatus'] = "HOLD"
+        setV['toInventoryStatus'] = "HOLD"
         }else if ( routeName.value == 'HoldtookRequestMain') {
-          row['toInventoryStatus'] = "OK"
+          setV['toInventoryStatus'] = "OK"
         }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-          row['toInventoryStatus'] = "SCRAP"
+          setV['toInventoryStatus'] = "SCRAP"
         }else if ( routeName.value == 'OktoscrapRequestMain') {
-          row['toInventoryStatus'] = "SCRAP"
+          setV['toInventoryStatus'] = "SCRAP"
         }else if ( routeName.value == 'ScraptoholdRequestMain') {
-          row['toInventoryStatus'] = "HOLD"
+          setV['toInventoryStatus'] = "HOLD"
         }else{
-          row['toInventoryStatus'] = null
+          setV['toInventoryStatus'] = null
         }
     } else {
       setV[formField] = val[0][searchField]

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -576,12 +576,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceItemPage,
+      searchPage: BalanceApi.getBalanceItemPage
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -591,12 +586,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalanceItemPage,
+        searchPage: BalanceApi.getBalanceItemPage
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
       }
     }
   },

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -618,12 +618,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceItemPage,
+      searchPage: BalanceApi.getBalanceItemPage
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -633,12 +628,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalanceItemPage,
+        searchPage: BalanceApi.getBalanceItemPage
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
       }
     }
   },

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -5,28 +5,16 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-      @button-base-click="buttonBaseClick"
+    :allSchemas="InspectRequestMain.allSchemas" />
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="InspectRequestMain.allSchemas"
-    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -39,33 +27,18 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="formRef" @success="getList" :rules="InspectRequestMainRules"
-    ref="formRef"
+    :formAllSchemas="InspectRequestMain.allSchemas" :tableAllSchemas="InspectRequestDetail.allSchemas"
-    @success="getList"
+    :tableFormRules="InspectRequestDetailRules" :tableData="tableData"
-    :rules="InspectRequestMainRules"
-    :formAllSchemas="InspectRequestMain.allSchemas"
-    :tableAllSchemas="InspectRequestDetail.allSchemas"
-    :tableFormRules="InspectRequestDetailRules"
-    :tableData="tableData"
     :apiUpdate="InspectRequestMainApi.updateInspectRequestMain"
-    :apiCreate="InspectRequestMainApi.createInspectRequestMain"
+    :apiCreate="InspectRequestMainApi.createInspectRequestMain" :isBusiness="true" @handleAddTable="handleAddTable"
-    :isBusiness="true"
+    @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
 
   <!-- 详情 -->
-  <Detail
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectRequestMain.allSchemas"
-    ref="detailRef"
+    :detailAllSchemas="InspectRequestDetail.allSchemas" :detailAllSchemasRules="InspectRequestDetailRules"
-    :isBasic="false"
-    :allSchemas="InspectRequestMain.allSchemas"
-    :detailAllSchemas="InspectRequestDetail.allSchemas"
-    :detailAllSchemasRules="InspectRequestDetailRules"
     :apiPage="InspectRequestDetailApi.getInspectRequestDetailPage"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
-  />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/inspect-request-main/import" :importTemplateData="importTemplateData"
@@ -98,7 +71,6 @@ const updataTableColumns = (val) => {
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(() => {
-    console.log(val[0]['number'])
       if (type == 'tableForm') {
         // 明细查询页赋值
         row[formField] = val[0][searchField]
@@ -107,9 +79,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         const setV = {}
         setV[formField] = val[0][searchField]
         setV['purchaseReceiptRecordNumber'] = val[0]['number']
-      setV['supplierCode'] = val[0]['supplierCode']
+        // setV['supplierCode'] = val[0]['supplierCode']
-      // row['poNumber'] = val[0]['number']
-      // row['poLine'] = val[0]['lineNumber']
         formRef.setValues(setV)
       }
     })

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts

@@ -1,8 +1,16 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize: 10,
@@ -31,64 +39,121 @@ import * as LocationApi from '@/api/wms/location'
  * @returns {Array} 检验申请主表
  */
 export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
   {
-    label: '采购收货记录单号',
+    label: '要货计划单号',
-    field: 'purchaseReceiptRecordNumber',
+    field: 'ppNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isForm: false,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      labelMessage: '影响明细中物品代码，需在供应商物品中维护',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
+        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '采购收货记录', // 查询弹窗标题
+        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 查询弹窗所需分页方法
+        searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
+  
   {
-    label: '供应商代码',
+    label: '收货数量',
-    field: 'supplierCode',
+    field: 'receiveQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: true,
+    isForm: true,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isSearch: true,
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled:true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
   {
-    label: '单据号',
+    label: '运输方式',
-    field: 'number',
+    field: 'transferMode',
     sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    dictClass: 'string',
     table: {
-      width: 150,
+      width: 150
-      fixed: 'left'
     },
-    isForm: false,
-    isSearch: true,
   },
   {
-    label: '业务类型',
+    label: '车牌号',
-    field: 'businessType',
+    field: 'vehiclePlateNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      value: 'Inspect',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '从仓库代码',
@@ -100,19 +165,20 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库区代码范围',
+    label: '到仓库代码',
-    field: 'fromAreaCodes',
+    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTableForm: false,
     isForm: false,
   },
   {
     label: '从库位类型范围',
     field: 'fromLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
@@ -121,17 +187,21 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '备注',
+    label: '到库位类型范围',
-    field: 'remark',
+    field: 'toLocationTypes',
+    // dictType: DICT_TYPE.LOCATION_TYPE,
+    // dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '创建者',
+    label: '从库区代码范围',
-    field: 'creator',
+    field: 'fromAreaCodes',
     sort: 'custom',
     table: {
       width: 150
@@ -139,23 +209,46 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '创建时间',
+    label: '到库区代码范围',
-    field: 'createTime',
+    field: 'toAreaCodes',
-    formatter: dateFormatter,
+    sort: 'custom',
-    detail: {
+    table: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      width: 150
     },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '从月台代码',
+    field: 'fromDockCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
     },
     form: {
-      component: 'DatePicker',
+      value: 'PurchaseReturn',
       componentProps: {
-        style: {width:'100%'},
+        disabled: true
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
       }
     },
     isForm: false,
@@ -236,181 +329,44 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '订单号',
+    label: '备注',
-    field: 'poNumber',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
+    isTable: false,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage
-      }
-    }
   },
   {
-    label: '订单行',
+    label: '创建者',
-    field: 'poLine',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
+    isForm: false,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单行',
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage
-      }
-    }
   },
   {
-    label: '批次',
+    label: '创建时间',
-    field: 'batch',
+    field: 'createTime',
-    sort: 'custom',
+    formatter: dateFormatter,
-    table: {
+    detail: {
-      width: 150
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     },
-  {
-    label: '物品代码',
-    field: 'itemCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'DatePicker',
       componentProps: {
-        isSearchList: true,
+        style: { width: '100%' },
-        searchListPlaceholder: '请选择物品代码',
+        type: 'datetime',
-        searchField: 'code',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        searchTitle: '物品基础信息',
+        valueFormat: 'x',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
-      }
       }
     },
-  {
+    isForm: false,
-    label: '检验类型',
-    field: 'inspectType',
-    dictType: DICT_TYPE.INSPECT_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '下一步检验动作',
-    field: 'nextAction',
-    dictType: DICT_TYPE.NEXT_ACTION,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '抽检方式',
-    field: 'sampleMethod',
-    dictType: DICT_TYPE.SAMPLE_METHOD,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '收货数量',
-    field: 'receiveQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-    },
-    isForm: false
-  },
-  {
-    label: '样品数量',
-    field: 'sampleQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-    },
-    isForm: false
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false
   },
   {
     label: '自动提交',
@@ -632,24 +588,23 @@ export const InspectRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      disabled: true,
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
+      earchListPlaceholder: '请选择包装号',
-      searchField: 'code',
+      searchField: 'packingNumber',
-      searchTitle: '物品基础信息',
+      searchTitle: '库存余额信息',
-      searchAllSchemas: Itembasic.allSchemas,
+      searchAllSchemas: Balance.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
+      searchPage: BalanceApi.getBalancePagePutaway,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
     },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物品代码',
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
-      }
-    }
   },
   {
     label: '物品名称',

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -106,9 +106,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      row['itemCode'] = val[0]['code']
+      if (formField == 'itemCode') {
-      row['poNumber'] = val[0]['number']
+       row['poNumber'] = val[0]['poNumber']
-      row['poLine'] = val[0]['lineNumber']
+       row['poLine'] = val[0]['poLine']
+       row['itemCode'] = val[0]['itemCode']
+       row['uom'] = val[0]['uom']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@@ -3,8 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
-// import * as SupplierApi from '@/api/wms/supplier'
+import * as SupplierApi from '@/api/wms/supplier'
-// import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as InspectRequestMainApi from '@/api/wms/inspectRequestMain'
 import { InspectRequestMain } from '@/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data'
 
@@ -17,6 +17,12 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 
+import * as BalanceApi from '@/api/wms/balance'
+import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+
+import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
+import * as WarehouseApi from "@/api/wms/warehouse";
+
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -37,15 +43,15 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 上架申请主表
  */
 export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '从仓库代码',
+  //   label: '从仓库代码',
-    field: 'fromWarehouseCode',
+  //   field: 'fromWarehouseCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
   {
     label: '从库位类型范围',
     field: 'fromLocationTypes',
@@ -72,26 +78,108 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
     isSearch: true,
   },
   {
-    label: '业务类型',
+    label: '供应商代码',
-    field: 'businessType',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
     form: {
-      value: 'PurchasePutaway',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
       }
     }
   },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择仓库代码',
+      searchField: 'code',
+      searchTitle: '仓库信息',
+      searchAllSchemas: Warehouse.allSchemas,
+      searchPage: WarehouseApi.getWarehousePage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+
   {
     label: '备注',
     field: 'remark',
@@ -410,6 +498,46 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      earchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePagePutaway,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'workshopCode',
+        value: 'workshopCode',
+        isMainValue: true
+      }]
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -505,33 +633,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物品代码',
-      searchField: 'code',
-      searchTitle: '物品基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物品代码',
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
-      }
-    }
-  },
   {
     label: '备注',
     field: 'remark',
@@ -633,20 +735,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
-  {
+
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select'
-    }
-  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',