Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/productreceiptRequestDetail/index.ts

@@ -65,6 +65,10 @@ export const getProductreceiptRequestDetailPageScrap = async (params) => {
     return await request.get({ url: `/wms/productreceipt-request-detail/page`, params })
   }
 }
+// 根据物料代码查计量单位
+export const getQueryItemCodeInfo = async (data) => {
+  return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data })
+}
 
 // 查询制品收货申请子详情
 export const getProductreceiptRequestDetail = async (id: number) => {

src/api/wms/purchasePlanDetail/index.ts

@@ -56,3 +56,14 @@ export const deletePurchasePlanDetail = async (id: number) => {
 export const exportPurchasePlanDetail = async (params) => {
   return await request.download({ url: `/wms/purchase-plan-detail/export-excel`, params })
 }
+
+// WMS查询要货计划子列表
+export const getPurchasePlanDetailPagewms = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-plan-detail/seniorWMS', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-plan-detail/pageWMS`, params })
+  }
+}

src/api/wms/saleDetail/index.ts

@@ -27,7 +27,13 @@ export interface SaleDetailVO {
 
 // 查询销售订单子列表
 export const getSaleDetailPage = async (params) => {
-  return await request.get({ url: `/wms/sale-detail/page`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/sale-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/sale-detail/page`, params })
+  }
 }
 
 // 查询销售订单子详情

src/api/wms/warehouse/index.ts

@@ -59,3 +59,14 @@ export const exportWarehouse = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/warehouse/get-import-template' })
 }
+
+// 查询仓库列表
+export const pageBusinessTypeToWarehouse = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/warehouse/pageBusinessTypeToWarehouseSenior', data })
+  } else {
+    return await request.get({ url: `/wms/warehouse/pageBusinessTypeToWarehouse`, params })
+  }
+}

src/views/wms/basicDataManage/itemManage/itembasic/index.vue

@@ -305,11 +305,11 @@ const changeTabs = (item) => {
     detailAllSchemas.value = Customeritem.allSchemas  
   }  else if(item.prop == 'PurchaseOrder'){
     tabsExtend.value = true
-    apiPage.value = PurchaseDetailApi.getPurchaseDetailPage
+    apiPage.value = PurchaseDetailApi.getPurchaseDetailPageWMS
     detailAllSchemas.value = PurchaseMain.allSchemas  
   } else if(item.prop == 'PurchasingPlan'){
     tabsExtend.value = true
-    apiPage.value = PurchasePlanDetailApi.getPurchasePlanDetailPage
+    apiPage.value = PurchasePlanDetailApi.getPurchasePlanDetailPagewms
     detailAllSchemas.value = PurchasePlanMain.allSchemas  
   } else if(item.prop == 'InventoryBalance'){
     tabsExtend.value = true

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -177,7 +177,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
     item.form.componentProps.searchCondition = [
@@ -187,7 +187,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
     item.tableForm.searchCondition = [
@@ -197,7 +197,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
     item.form.componentProps.searchCondition = [
@@ -207,7 +207,7 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
   }

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@@ -118,6 +118,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       row['inventoryStatus'] = val[0]['inventoryStatus']
       row['fromLocationCode'] = val[0]['locationCode']
       row['itemCode'] = val[0]['itemCode']
+      row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -136,6 +137,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     setV['inventoryStatus'] = val[0]['inventoryStatus']
     setV['fromLocationCode'] = val[0]['locationCode']
     setV['itemCode'] = val[0]['itemCode']
+    setV['uom'] = val[0]['uom']
     formRef.setValues(setV)
   })
 }

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts

@@ -506,7 +506,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
   },
   {

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@@ -83,9 +83,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请科目账户信息',
+        searchListPlaceholder: '请选择领用描述',
         searchField: 'usageDescription',
-        searchTitle: '科目账户信息',
+        searchTitle: '领用描述信息',
         searchAllSchemas: SubjectAccount.allSchemas,
         searchPage: SubjectAccountApi.getSubjectAccountPage
       }
@@ -605,7 +605,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'code', // 查询列表中字段
         value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
+        message: '请选择成本中心信息！', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       }]
     },
@@ -621,7 +621,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key: 'code', // 查询列表中字段
           value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择成本中心信息!', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件不是主表的字段的值
         }]
       }
@@ -644,12 +644,12 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'code', // 查询列表中字段
         value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       },{
         key: 'costcentreCode', // 查询列表中字段
         value: 'costcentreCode', // 指查询具体值
-        message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+        message: '请选择成本中心代码!', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       }]
     },
@@ -665,12 +665,12 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchCondition: [{
           key: 'code', // 查询列表中字段
           value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件不是主表的字段的值
         },{
           key: 'costcentreCode', // 查询列表中字段
           value: 'costecentreCode', // 指查询具体值
-          message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+          message: '请选择成本中心代码!', // 当前置条件为空时 弹出信息提示
           isMainValue: false // 表示查询条件不是主表的字段的值
         }]
       }

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -14,7 +14,7 @@ import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/loc
 import * as LocationApi from "@/api/wms/location";
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
-
+const businessType = 'UnplannedReceipt'
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -165,9 +165,9 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请科目账户信息',
+        searchListPlaceholder: '请领用描述信息',
         searchField: 'usageDescription',
-        searchTitle: '科目账户信息',
+        searchTitle: '领用描述信息',
         searchAllSchemas: SubjectAccount.allSchemas,
         searchPage: SubjectAccountApi.getSubjectAccountPage
       }
@@ -643,7 +643,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchField: 'code',
       searchTitle: '库位信息',
       searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.getLocationPage,
+      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
@@ -653,6 +653,15 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         value: 'toWarehouseCode',
         message: '请填写到仓库代码！',
         isMainValue: true,
+      },
+      {
+        key: 'businessType',
+        value: businessType ,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
       }]
     },
     form: {
@@ -663,7 +672,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchPage: LocationApi.getLocationListByAreaAndBusinesstype, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -673,6 +682,15 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
           value: 'toWarehouseCode',
           message: '请填写到仓库代码！',
           isMainValue: true,
+        },
+        {
+          key: 'businessType',
+          value: businessType ,
+          isMainValue: false
+        },{
+          key: 'isIn',
+          value: 'in',
+          isMainValue: false
         }]
       }
     }
@@ -796,7 +814,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchCondition: [{
         key: 'code', // 查询列表中字段
         value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
+        message: '请选择成本中心信息！', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       }]
     },
@@ -812,7 +830,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         searchCondition: [{
           key: 'code', // 查询列表中字段
           value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择成本中心信息!', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件不是主表的字段的值
         }]
       }
@@ -835,12 +853,12 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchCondition: [{
         key: 'code', // 查询列表中字段
         value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       },{
         key: 'costcentreCode', // 查询列表中字段
         value: 'costcentreCode', // 指查询具体值
-        message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+        message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       }]
     },
@@ -848,20 +866,20 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '选择成本中心',
+        searchListPlaceholder: '选择科目代码',
         searchField: 'projectCode',
-        searchTitle: '成本中心信息',
+        searchTitle: '科目代码信息',
         searchAllSchemas: SubjectAccount.allSchemas,
         searchPage: SubjectAccountApi.getSubjectAccountPage,
         searchCondition: [{
           key: 'code', // 查询列表中字段
           value: 'usageCode', // 指查询具体值
-          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件不是主表的字段的值
         },{
           key: 'costcentreCode', // 查询列表中字段
           value: 'costecentreCode', // 指查询具体值
-          message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+          message: '请选择科目代码信息!', // 当前置条件为空时 弹出信息提示
           isMainValue: false // 表示查询条件不是主表的字段的值
         }]
       }

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -464,6 +464,8 @@ const submitForm = async (formType, data) => {
       await InventorychangeRequestMainApi.createInventorychangeRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
+      console.log('data',data);
+      data.id = data.masterId
       await InventorychangeRequestMainApi.updateInventorychangeRequestMain(data)
       message.success(t('common.updateSuccess'))
     }

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

@@ -167,7 +167,77 @@ const { tableObject, tableMethods } = useTable({
     toInventoryStatus:'SCRAP'
   }
 }
-
+console.log(99 ,  businessType.value)
+InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
+  if(item.field == 'fromWarehouseCode') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }
+     ]
+    } else if (fromInventoryStatus.value == null) {
+      item.tableForm.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+      item.form.componentProps.searchCondition = [
+      {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'businessType',
+        value: businessType.value,
+        isMainValue: false
+      },{
+        key: 'isIn',
+        value: 'out',
+        isMainValue: false
+      }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+})
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
   if(item.field == 'fromPackingNumber') {
@@ -211,7 +281,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
       item.form.componentProps.searchCondition = [
@@ -221,7 +291,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
     }else if (toInventoryStatus.value == null) {
@@ -232,7 +302,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
       item.form.componentProps.searchCondition = [
@@ -242,7 +312,7 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
         isMainValue: false
       },{
         key: 'isIn',
-        value: true,
+        value: 'in',
         isMainValue: false
       }]
     }

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -78,12 +78,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'code',
       searchTitle: '仓库基础信息',
       searchAllSchemas: Warehouse.allSchemas,
-      searchPage: WarehouseApi.getWarehousePage,
+      searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -93,12 +88,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code',
         searchTitle: '仓库基础信息',
         searchAllSchemas: Warehouse.allSchemas,
-        searchPage: WarehouseApi.getWarehousePage,
+        searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
       }
     }
   },
@@ -680,6 +670,10 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         key: 'type',
         value: 'businessType',
         isMainValue: true
+      },{
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
       }]
     },
     form: {
@@ -696,6 +690,10 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
             key: 'type',
             value: 'businessType',
             isMainValue: true
+          },{
+            key: 'isIn',
+            value: 'in',
+            isMainValue: false
           }]
       }
     }

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -120,6 +120,7 @@
 </template>
 
 <script setup lang="ts">
+// 报废收货申请
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
@@ -184,12 +185,19 @@ const updataTableColumns = (val) => {
 }
 
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+const searchTableSuccess = async (formField, searchField, val, formRef, type, row ) => {
-  nextTick(() => {
+  nextTick(async () => {
     if (type == 'tableForm') {
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+      }else if(formField == 'itemCode'){
+        
+        let res = await ProductreceiptRequestDetailApi.getQueryItemCodeInfo({itemCodes:val.map(item=>item.itemCode).join(',')})
+        if(res.length>0){
+          row['uom'] = res[0]['uom']
+        }
+        console.log('获取计量单位',res)
       }
       // 明细查询页赋值
       row[formField] = val[0][searchField]

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@@ -953,6 +953,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
+      disabled:true,
       type: 'Select'
     }
     

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -1528,7 +1528,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '包装数量1',
+    label: '物料数量1',
     field: 'packQty',
     sort: 'custom',
     table: {
@@ -1597,7 +1597,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '包装数量2',
+    label: '物料数量2',
     field: 'secondPackQty',
     sort: 'custom',
     table: {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -1090,6 +1090,26 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isDetail: false,
     isTable: true,
   },
+  //仅是主列表页面的筛选搜索条件
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    sort: 'custom',
+    isDetail:false,
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isSearch:true,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
   {
     label: '到货时间',
     field: 'planArriveTime',