From ff775c8c9b26db6294e9169626bb30d26db14797 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 11:06:49 +0800
Subject: [PATCH 01/22] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/package/index.ts                  |  5 ++
 .../wms/inventoryManage/balance/index.vue     | 58 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index dc47bf030..11531274d 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -115,4 +115,9 @@ export const getLabelDetailPage = async (params) => {
 // 根据库存余额获取包装信息进行打印标签
 export const getBalanceToPackage = async (packingNumber: String) => {
   return await request.get({ url: `/wms/package/getBalanceToPackage?packingNumber=` + packingNumber})
+}
+
+// 根据库存余额获取包装信息进行打印标签--批量打印
+export const getBalanceToPackageSelection = async (data: any) => {
+  return await request.post({ url: `/wms/balance/batchPrintLabel` ,data})
 }
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index beead66f4..93e3a6943 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -16,7 +16,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef" v-clientTable
+      :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -26,6 +27,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
       <template #itemCode="{row}">
         <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
@@ -96,6 +98,7 @@ const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'wms:balance:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'wms:balance:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:balance:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
   defaultButtons.defaultFreshBtn(null),//刷新
   defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -126,11 +129,64 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
+  } else if (val=='selection_point'){// 批量打印
+    handleSelectionPoint()
   } else { // 其他按钮 
     console.log('其他按钮', item)
   }
 }
+watch(
+  () => tableObject.tableList,
+  () => {
+    const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
+    if(currentRows){
+      nextTick(() => {
+        currentRows.selectionRows.forEach(item=>{
+          tableRef.value.toggleRowSelection(item,true)
+        })
+      })
+    }
+  }
+)
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
 
+const handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
+  })
+  console.log('批量打印',rows.join(','))
+  PackageApi.getBalanceToPackageSelection(rows).then(res => {
+    console.log('res',res);
+    if(res.zzLabel){
+      //制造标签
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value+'&asn_number='+res.zzLabel)
+    }
+    if (res.cgLabel) {
+      //采购标签
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value+'&asn_number='+res.cgLabel)
+    }
+    
+  }).catch(err => {
+    console.log(err)
+  })
+  // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
+}
 // 列表-操作按钮
 const butttondata = [
   // {

From c9f8111fde6bfde49b1e59a7b8a0045a5ec6a82f Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 24 May 2024 11:28:10 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=86=BB=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain/index.vue       | 53 ++++++++++++-------
 .../inventorychangeRecordMain.data.ts         | 26 +++++++++
 .../inventorychangeRequestMain.data.ts        | 26 +++++++++
 3 files changed, 87 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index ee33f9cee..388c2682b 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -292,7 +292,18 @@ const butttondata = (row,$index) => {
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:agree'}), // 审批通过
         defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customerreturn-request-main:handle'}), // 处理
         defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:update'}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除
+        {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6']) }), // 标签打印
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除
     ]
 }
 
@@ -406,27 +417,33 @@ const submitFormLabel = async (formType, data) => {
   }
 }
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-
+const labelType = ref('') // 标签类别 采购还是制造等
 // 标签打印
 const showLabelRef = ref()
 const labelPrint = async (row) => {
-  tableObject.loading = true
-  const defaultParams = {'moduleName':'supplier','recordNumber':row.number}
-  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
-    defaultParams,
-    getListApi: PackageApi.getLabelDetailPage  // 分页接口
-  })
-
-  // 获得表格的各种操作
-  const { getList:getListPrint } = tableMethods
-  getListPrint()
-  tableObject.loading = false
-  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
-  tableColumns.forEach((item) => {
-    item.width = item.table?.width || 150
+  console.log(row.packingNumber,445555555555555);
+  PackageApi.getBalanceToPackage(row.packingNumber).then(res => {
+    console.log(777,res);
+      if (res.productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+      PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+        console.log(159,resLable )
+ // 判断是采购还是制造
+ if (labelType.value == 'cg') {
+    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    console.log(159,resLable )
+    window.open(src.value+'&asn_number='+resLable)
+  } else {
+    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+    window.open(src.value+'&asn_number='+resLable)
+  }
+    })
+  }).catch(err => {
+    console.log(err)
   })
-  showLabelRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
 }
 
 /** 添加/修改操作 */
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
index a17f9797c..bcb4a54d9 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@@ -613,6 +613,32 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '是否冻结',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    table: {
+      width: 120
+    },
+    tableForm: {
+      type: 'Switch',
+      default: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
   // {
   //   label: '代码',
   //   field: 'code',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 197dc1854..d9bb40b13 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -839,6 +839,32 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: '是否冻结',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    table: {
+      width: 120
+    },
+    tableForm: {
+      type: 'Switch',
+      default: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
   {
     label: '项目代码',
     field: 'projectCode',

From dd94cc1d02007e32fd4d7525cdf722eb39cddbf6 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 11:34:09 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/location/index.ts                 | 10 ++++
 .../customerreturnRequestMain.data.ts         | 34 ++++++++----
 .../inventorychangeRequestMain/index.vue      | 53 ++++++++++---------
 3 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
index ff0a8435c..231f14ed8 100644
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@@ -85,6 +85,16 @@ export const selectBusinessTypeToLocation = async (params) => {
   }
 }
 
+export const selectBusinessTypeOutLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/location/pageBusinessTypeOutLocationSenior', data })
+  } else {
+    return request.get({ url: `/wms/location/pageBusinessTypeOutLocation`, params })
+  }
+}
+
 
 export const selectPageItemAreaToLocation = async (params) => {
   if (params.isSearch) {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index caacdf50e..e58df3e48 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -5,7 +5,9 @@ import { dateFormatter, formatDate } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
-import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
+import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
+
+import { DeliverRecordMain,DeliverRecordDetail } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
 
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data'
@@ -23,6 +25,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
 import * as CustomerreturnRequestApi  from '@/api/wms/customerreturnRequestMain'
+import * as LocationApi  from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 const { t } = useI18n() // 国际化
 const dateTime = new Date().getTime()
@@ -48,6 +52,7 @@ const userDeptArray:any = [userDept]
 /**
  * @returns {Array} 客户退货申请主表
  */
+
 export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
@@ -87,8 +92,10 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '发货记录信息', // 查询弹窗标题
+        isConcatDetailSchemas:true, // 是否主子表合并
         searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类
-        searchPage: DeliverRecordMainApi.getDeliverRecordMainPage, // 查询弹窗所需分页方法
+        searchDetailSchemas: DeliverRecordDetail.allSchemas, // 查询弹窗所需类
+        searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -893,14 +900,20 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    isSearch: true,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'toLocationCode',
+      searchTitle: '到库位代码',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeOutLocation, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'businessType',
+        value: 'CustomerReject',
+        isMainValue: false
+      }]
     },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
     label: '库存状态',
@@ -1062,6 +1075,9 @@ export const CustomerreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'blur' }
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index edec628e8..9da46ac24 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -110,30 +110,35 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['fromPackingNumber'] = val[0]['packingNumber']
-      row['toPackingNumber'] = val[0]['packingNumber']
-      row['fromBatch'] = val[0]['batch']
-      row['toBatch'] = val[0]['batch']
-      row['fromInventoryStatus'] = val[0]['inventoryStatus']
-      row['toInventoryStatus'] = val[0]['inventoryStatus']
-      row['fromContainerNumber'] = val[0]['containerNumber']
-      row['toContainerNumber'] = val[0]['containerNumber']
-      row['fromQty'] = val[0]['qty']
-      row['toQty'] = val[0]['qty']
-      row['fromOwnerCode'] = val[0]['ownerCode']
-      row['toOwnerCode'] = val[0]['ownerCode']
-      row['fromAltBatch'] = val[0]['altBatch']
-      row['toAltBatch'] = val[0]['altBatch']
-      row['fromArriveDate'] = val[0]['arriveDate']
-      row['toArriveDate'] = val[0]['arriveDate']
-      row['fromProduceDate'] = val[0]['produceDate']
-      row['toProduceDate'] = val[0]['produceDate']
-      row['fromExpireDate'] = val[0]['expireDate']
-      row['toExpireDate'] = val[0]['expireDate']
-      row['itemCode'] = val[0]['itemCode']
-      row['locationCode'] = val[0]['locationCode']
-      row['uom'] = val[0]['uom']
+      if(formField=='toOwnerCode'){
+        //到货主代码
+        row['toOwnerCode'] = val[0]['code']
+      }else{
+        row[formField] = val[0][searchField]
+        row['fromPackingNumber'] = val[0]['packingNumber']
+        row['toPackingNumber'] = val[0]['packingNumber']
+        row['fromBatch'] = val[0]['batch']
+        row['toBatch'] = val[0]['batch']
+        row['fromInventoryStatus'] = val[0]['inventoryStatus']
+        row['toInventoryStatus'] = val[0]['inventoryStatus']
+        row['fromContainerNumber'] = val[0]['containerNumber']
+        row['toContainerNumber'] = val[0]['containerNumber']
+        row['fromQty'] = val[0]['qty']
+        row['toQty'] = val[0]['qty']
+        row['fromOwnerCode'] = val[0]['ownerCode']
+        row['fromAltBatch'] = val[0]['altBatch']
+        row['toAltBatch'] = val[0]['altBatch']
+        row['fromArriveDate'] = val[0]['arriveDate']
+        row['toArriveDate'] = val[0]['arriveDate']
+        row['fromProduceDate'] = val[0]['produceDate']
+        row['toProduceDate'] = val[0]['produceDate']
+        row['fromExpireDate'] = val[0]['expireDate']
+        row['toExpireDate'] = val[0]['expireDate']
+        row['itemCode'] = val[0]['itemCode']
+        row['locationCode'] = val[0]['locationCode']
+        row['uom'] = val[0]['uom']
+      }
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

From cf908fe4248f4c2242afbeb6a8f019dd680c0a35 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 24 May 2024 13:04:26 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E7=A7=91=E7=9B=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/subjectAccount/subjectAccount.data.ts            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
index 1b990aeeb..dd20a2146 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
@@ -9,13 +9,10 @@ import { QadProject } from '../qadProject/qadProject.data'
 export const SubjectAccountRules = reactive({
   code: [required],
   usageDescription: [required],
-  costecentreId: [required],
   costecentreCode: [required],
-  costecentreType: [required],
   projectId: [required],
   projectCode: [required],
   available: [required],
-  concurrencyStamp: [required],
 })
 
 export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
@@ -61,7 +58,7 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'costcentreCode', // 查询弹窗赋值字段
-        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchTitle: '成本中心信息', // 查询弹窗标题
         searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
         searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
         searchCondition: [{

From 0a828b2b38328563067da117fbd763f91b1afd68 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Fri, 24 May 2024 13:07:13 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../putawayJobMain/putawayJobMain.data.ts     | 98 +++++++++----------
 .../putawayRecordMain.data.ts                 | 14 +--
 .../supplierdeliverRequestMain.data.ts        | 12 ++-
 3 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index 15034e48b..7658c53e8 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -289,33 +289,33 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '从库区代码范围',
-    field: 'fromAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
-  {
-    label: '到库区代码范围',
-    field: 'toAreaCodes',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '到仓库代码',
+  //   field: 'toWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
+  // {
+  //   label: '从库区代码范围',
+  //   field: 'fromAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
+  // {
+  //   label: '到库区代码范围',
+  //   field: 'toAreaCodes',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '自动完成',
     field: 'autoComplete',
@@ -506,15 +506,15 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料号',
-    field: 'code',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '物料号',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '来源库位',
     field: 'fromLocationCode',
@@ -542,18 +542,18 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
-    label: '单位',
-    field: 'unit',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isSearch: false,
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
+  // {
+  //   label: '单位',
+  //   field: 'unit',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.PACK_UNIT,
+  //   dictClass: 'string',
+  //   isSearch: false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
   {
     label: '操作',
     field: 'action',
@@ -1265,4 +1265,4 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
       disabled: true,
     }
   },
-]))
\ No newline at end of file
+]))
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index a98fc71f9..de955104a 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -16,18 +16,6 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault:1,
     isSearch: true
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -1272,4 +1260,4 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
       disabled: true,
     }
   },
-]))
\ No newline at end of file
+]))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 25ead0c5e..af84254df 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -9,6 +9,7 @@ import { validateHanset, validateEmail } from '@/utils/validator'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
+import {validateInteger} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -1101,7 +1102,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
     { required: true, message: '请输入生产日期', trigger: 'blur' }
   ],
   packQty: [
-    { required: true, message: '请输入包装数量', trigger: 'blur' }
+    { required: true, message: '请输入包装数量', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
   ],
   poNumber: [
     { required: true, message: '请选择订单号', trigger: 'change' }
@@ -1121,6 +1123,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  
+  secondPackQty:[required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
 export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
@@ -1520,11 +1524,10 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     form: {
       componentProps: {
-        disabled: true
       }
     },
     tableForm: {
-      disabled: true,
+      // disabled: true,
     }
   },
   {
@@ -1590,11 +1593,10 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     form: {
       componentProps: {
-        disabled:true
       }
     },
     tableForm: {
-      disabled: true,
+      // disabled: true,
     }
   },
   {

From ace6293381c3e39930d87e2863a79d966e5142ce Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 24 May 2024 14:18:08 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant/index.ts                      | 10 +++++++++-
 .../mes/hrPersonAbility/hrPersonAbility.data.ts     |  5 +++--
 .../mes/ordermonthplan/mesOrderMonthMain.data.ts    | 13 +++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
index 176c37579..1e11e2dd1 100644
--- a/src/api/system/tenant/index.ts
+++ b/src/api/system/tenant/index.ts
@@ -33,7 +33,15 @@ export interface TenantExportReqVO {
 
 // 查询租户列表
 export const getTenantPage = (params: TenantPageReqVO) => {
-  return request.get({ url: '/system/tenant/page', params })
+  console.log(params)
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return request.post({ url: '/system/tenant/senior', data })
+  } else {
+    return request.get({ url: '/system/tenant/page', params })
+  }
+  // return request.get({ url: '/system/tenant/page', params })
 }
 
 // 查询租户详情
diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
index 614e2ef7f..8e7d12dd6 100644
--- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
+++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
@@ -123,10 +123,11 @@ export const HrPersonAbility = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '人员信息', // 查询弹窗标题
         searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类
         searchField: 'username', // 查询弹窗赋值字段
+        searchListPlaceholder: '请选择 人员工号', // 输入框占位文本
         searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          action: "==",
-          column: 'userType',
+          action: '==',
+          key: 'userType',
           value: 'WORKER'
         }]
       }
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
index 908906fb6..05d07d7d7 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -46,12 +46,13 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: FactoryList.allSchemas, // 查询弹窗所需类
         searchPage: TenantApi.getTenantPage, // 查询弹窗所需分页方法
         isHideFilterButton: true,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }
-        ]
+        // searchCondition: [{
+        //   key: 'available',
+        //   value: 'TRUE',
+        //   action: '==',
+        //   // isMainValue: false
+        // }
+        // ]
       }
     }
   },

From 03d929b01fda118ae3e3b48d471a869f413c96d3 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 14:20:49 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/Form.vue              | 20 ++++---------------
 .../Form/src/components/useRenderSelect.tsx   |  5 +----
 src/components/Form/src/helper.ts             |  7 +------
 src/components/Table/src/Table.vue            |  5 +----
 src/utils/disposition/defaultButtons.ts       |  4 ++--
 src/views/login/components/LoginForm.vue      |  2 +-
 6 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 9fbf4a233..f55aed8cc 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -175,10 +175,7 @@ export default defineComponent({
           const Com = componentMap['Divider'] as ReturnType<typeof defineComponent>
           let labelName = item?.label || '' 
           if(item?.label){
-            labelName = t(`ts.${item?.label}`)
-            if(labelName === 'ts.' + item?.label){
-              labelName = item?.label
-            }
+            labelName = t(`ts.${item?.label}`).replace('ts.','')
           }
           return isDivider ? (
             <Com {...{ contentPosition: 'left', ...item.componentProps }}>{labelName}</Com>
@@ -227,18 +224,12 @@ export default defineComponent({
       if (item?.labelMessage) {
         let labelName = item.label || '' 
         if(item.label){
-          labelName = t(`ts.${item.label}`)
-          if(labelName === 'ts.' + item.label){
-            labelName = item.label
-          }
+          labelName = t(`ts.${item.label}`).replace('ts.','')
         }
 
         let labelMessage = item.labelMessage || ''
         if(item.labelMessage){
-          labelMessage = t(`ts.${item.labelMessage}`)
-          if(labelMessage === 'ts.' + item.labelMessage){
-            labelMessage = item.labelMessage
-          }
+          labelMessage = t(`ts.${item.labelMessage}`).replace('ts.','')
         }
         formItemSlots.label = () => {
           return (
@@ -367,10 +358,7 @@ export default defineComponent({
       }
       let labelName = item.label || '' 
       if(item.label){
-        labelName = t(`ts.${item.label}`)
-        if(labelName === 'ts.' + item.label){
-          labelName = item.label
-        }
+        labelName = t(`ts.${item.label}`).replace('ts.','')
       }
       return (
         <ElFormItem {...(item.formItemProps || {})} prop={item.field} label={labelName}>
diff --git a/src/components/Form/src/components/useRenderSelect.tsx b/src/components/Form/src/components/useRenderSelect.tsx
index 4a8a18a79..30f6d73d6 100644
--- a/src/components/Form/src/components/useRenderSelect.tsx
+++ b/src/components/Form/src/components/useRenderSelect.tsx
@@ -35,10 +35,7 @@ export const useRenderSelect = (slots: Slots) => {
 
     const { label, value, ...other } = option
     const zhName = labelAlias ? option[labelAlias] : label;//中文名称
-    let labelName = t(`ts.${zhName}`)
-    if(labelName === 'ts.' + zhName){
-      labelName = zhName
-    }
+    let labelName = t(`ts.${zhName}`).replace('ts.','')
 
     return (
       <ElOption
diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts
index fa01be3fe..6f0ddafc5 100644
--- a/src/components/Form/src/helper.ts
+++ b/src/components/Form/src/helper.ts
@@ -17,12 +17,7 @@ export const setTextPlaceholder = (schema: FormSchema): PlaceholderModel => {
 
   let labelName = schema.label || '' 
   if(schema.label){
-    labelName = t(`ts.${schema.label}`)
-    if(labelName === 'ts.' + schema.label){
-      labelName = ' '+schema.label
-    }else{
-      labelName = ' ' + labelName
-    }
+    labelName = ' '+t(`ts.${schema.label}`).replace('ts.','')
   }
 
   if (textMap.includes(schema?.component as string)) {
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index af95f8b2d..5b785c699 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -283,10 +283,7 @@ export default defineComponent({
       return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
         (columnsChildren || columns).map((v) => {
           const zhName = v.label || '';//中文名称
-          let labelName = t(`ts.${v.label}`)
-          if(labelName === 'ts.' + zhName){
-            labelName = zhName
-          }
+          let labelName = t(`ts.${v.label}`).replace('ts.','')
           // 自定生成序号
           if (v.type === 'index') {
             return (
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 73101cc39..1a2ad0cca 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -289,7 +289,7 @@ export function mainListDisableBtn(option:any) {
 // 主列表-中止按钮1
 export function mainListSuspend1Btn(option:any) {
   return __defaultBtnOption(option,{
-    label: t(`ts.中止`),
+    label: t(`ts.中止`).replace('ts.',''),
     name: 'suspend',
     hide: false,
     type: 'danger',
@@ -624,7 +624,7 @@ export function mainListPurchasePlanModBtn(option:any) {
 // 主列表-要货计划流程-下架按钮
 export function mainListPurchasePlanWitBtn(option:any) {
   return __defaultBtnOption(option,{
-    label: t(`ts.下架`),
+    label: t(`ts.下架`).replace('ts.',''),
     name: 'mainPurPlanWit',
     hide: false,
     type: 'danger',
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 2c2c33fd7..a28e0101a 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -15,7 +15,7 @@
             <el-option
               v-for="item in tenantArray"
               :key="item"
-              :label="t(`ts.${item}`)"
+              :label="t(`ts.${item}`).replace('ts.','')"
               :value="item"
             />
           </el-select>

From b3028383fe5da3294c3a22fdb41ee0c8101d0603 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Fri, 24 May 2024 14:34:48 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/basicDataManage/labelManage/locationLabel/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index 04ec8d045..79d4d6b7d 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -187,17 +187,17 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&id='+row.id)
+  window.open(src.value+'&relateNumber='+row.id)
 }
 
-const srcPoint = ref(BASE_URL + '/jmreport/view/953469704945139712?token=' + getAccessToken())
+// const srcPoint = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken())
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
   })
   console.log('批量打印',rows.join(','))
-  window.open(srcPoint.value+'&relateNumber='+rows.join(','))
+  window.open(src.value+'&relateNumber='+rows.join(','))
 }
 
 // 筛选提交

From b2de7b84159354d7f871724e0501ca6bf509ae21 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 24 May 2024 15:00:44 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                  |  2 +-
 .../callmaterials/callmaterials.data.ts       | 46 +++++++++++++++++--
 .../labelManage/callmaterials/index.vue       |  1 +
 .../inventorychangeRecordMain.data.ts         |  2 +-
 .../inventorychangeRequestMain/index.vue      |  1 -
 .../inventorychangeRequestMain.data.ts        | 24 ++++++++--
 6 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 6ddf5473a..cb17a3200 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -83,7 +83,7 @@ export const getBalancePageByBusinessType = async (params) => {
 }
 
 
-// 查询库存余额列表根据业务类型
+// 查询库存余额列表根据业务类型的物料类型
 export const getBalancePageByBusinessTypeByItemType = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 216b92563..5c852da86 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -29,8 +29,13 @@ const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
 // 表单校验
 export const CallmaterialsRules = reactive({
   itemCode: [required],
-  itemName: [required],
-  barcodeString: [required]
+  packUnit: [required],
+  qty: [required],
+  productionLineCode: [required],
+  callmaterialQtySum: [required],
+  warehouseCode: [required],
+  workshopCode: [required],
+  workStationCode: [required],
 })
 
 export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
@@ -72,7 +77,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料包装信息', // 查询弹窗标题
         searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
@@ -91,12 +96,45 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '包装数量',
+    label: '叫料包装数量',
     field: 'qty',
     sort: 'custom',
     table: {
       width: 120
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        style: {width:'100%'},
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'callmaterialQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '叫料总数量',
+    field: 'callmaterialQtySum',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
     form: {
       component: 'InputNumber',
       componentProps: {
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index 620c91a76..1aa4b89a4 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -90,6 +90,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     } else  if (formField == 'packUnit') {
       setV['uom'] = val[0]['uom']
       setV['packUnit'] = val[0]['packUnit']
+      setV['callmaterialQty'] = val[0]['packQty']
     }else {
       setV[formField] = val[0][searchField]
     }
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
index bcb4a54d9..bd30dfe67 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@@ -615,7 +615,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '是否冻结',
-    field: 'available',
+    field: 'frozen',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 9da46ac24..56525c2a8 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -94,7 +94,6 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...InventorychangeRequestMain.allSchemas.tableColumns,...InventorychangeRequestDetail.allSchemas.tableMainColumns])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage // 分页接口
 })
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index d9bb40b13..b29734a9b 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -4,7 +4,7 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-
+import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'
 import * as OwnerApi from '@/api/wms/owner'
 import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
 
@@ -15,10 +15,16 @@ const queryParams = {
   pageSize:10,
   pageNo:1,
   code:'InventoryChangeRequest'
+}
+const businessTypeQueryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'Change'
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
-
+ const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
+ const businessTypeData =businessTypeValue?.list[0]||{}
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
@@ -374,7 +380,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+      searchCondition: [{
+        key: 'businessType',
+        value: businessTypeData.code,
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -384,7 +394,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
+        }]
       }
     }
   },
@@ -841,7 +855,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '是否冻结',
-    field: 'available',
+    field: 'frozen',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',

From e2ee396ee76f55e7b7bdbea64234be1faf07c54a Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 15:26:56 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceInvoiced.data.ts           | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
index 62db027ef..da35415d0 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts
@@ -68,57 +68,60 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
-    isSearch: true,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '物流单据号',
-    field: 'recvBillNum',
+    label: '订单号',
+    field: 'poNumber',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '发货单号',
-    field: 'asnBillNum',
+    label: '物流单据号',
+    field: 'recvBillNum',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '发货单号',
+    field: 'asnBillNum',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  
+  
   {
     label: '订单行',
     field: 'poLine',

From a69b589aa8657bc6b6a1a4cc503b2f7e7e2b2142 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 24 May 2024 15:29:05 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/factoryModeling/location/location.data.ts  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index d4662694f..507cd83f6 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -396,6 +396,9 @@ export const LocationRules = reactive({
   warehouseCode: [
     { required: true, message: '请输入仓库代码', trigger: 'change' }
   ],
+  qadLocationCode: [
+    { required: true, message: '请QAD库位代码', trigger: 'change' }
+  ],
   areaCode: [
     { required: true, message: '请输入库区代码', trigger: 'change' }
   ],

From 1c5a799200651b865de78da17f30246d37970732 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 24 May 2024 15:29:44 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedissueRequestMain.data.ts         | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 9192feb92..fa62e355b 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -5,6 +5,9 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -59,6 +62,35 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请科目账户信息',
+        searchField: 'usageDescription',
+        searchTitle: '科目账户信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage
+      }
+    }
+  },
   {
     label: '原因',
     field: 'reason',
@@ -490,6 +522,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
+    isDetail:false,
+    isTableForm:false,
     table: {
       width: 150
     },

From 9d2b8d6b03427344d095ab82e2fb27f82e64f554 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Fri, 24 May 2024 15:34:00 +0800
Subject: [PATCH 13/22] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81WMS?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerManage/saleprice/saleprice.data.ts              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
index 164257fd3..c94c25f57 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
@@ -215,10 +215,10 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const SalepriceRules = reactive({
-  customercode: [
+  customerCode: [
     { required: true, message: '请输入客户代码', trigger: 'blur' }
   ],
-  itemcode: [
+  itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
   currency: [
@@ -233,4 +233,4 @@ export const SalepriceRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})

From de25e9c14756a34d0618927319bfd2c9771347e8 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 24 May 2024 15:45:01 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
index 05d07d7d7..9461a665f 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -80,7 +80,7 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false
   },
   {
-    label: '创建者用户名',
+    label: '创建者ID',
     field: 'creator',
     sort: 'custom',
     isSearch: true,

From e90cabd83458b3ea33b67059ee931994e1dc3825 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 16:33:03 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=A0=87=E7=AD=BE=20?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=AB=E6=96=99=E6=80=BB=E6=95=B0=E9=87=8F=3D=20?=
 =?UTF-8?q?=E5=8F=AB=E6=96=99=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F*?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../labelManage/callmaterials/callmaterials.data.ts         | 5 +++--
 .../wms/basicDataManage/labelManage/callmaterials/index.vue | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 5c852da86..6c1e22092 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -97,7 +97,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '叫料包装数量',
-    field: 'qty',
+    field: 'callmaterialQty',
     sort: 'custom',
     table: {
       width: 120
@@ -114,7 +114,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '包装数量',
-    field: 'callmaterialQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 120
@@ -138,6 +138,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
+        disabled: true,
         style: {width:'100%'},
         min: 0,
         precision: 6
diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index 1aa4b89a4..ba361799f 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -49,6 +49,12 @@
     :apiCreate="CallmaterialsApi.createCallmaterials"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    :sumFormDataByForm ="(formRef,formModel)=>{
+      const {qty=0,callmaterialQty=0} = formModel
+      formRef.value.setValues({
+        callmaterialQtySum:qty*callmaterialQty,
+      })
+    }"
   />
 
   <!-- 详情 -->

From 50afcfcc1966fa6d1baedebc85b22169ee8db6d2 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Fri, 24 May 2024 16:59:51 +0800
Subject: [PATCH 16/22] =?UTF-8?q?2024-05-20=20=20=E8=8A=82=E5=81=87?=
 =?UTF-8?q?=E6=97=A5=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=9B=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=95=E5=85=A5=EF=BC=8C=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=BD=95=E5=85=A5=EF=BC=9B=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E5=BD=95=E5=85=A5=EF=BC=9B=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=AB=99=E7=9A=84=E4=BA=BA=E5=91=98=E8=83=BD=E5=8A=9B=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/holiday/holiday.data.ts         |  4 +-
 src/views/mes/item/index.vue                  |  4 ++
 src/views/mes/item/item.data.ts               | 57 ++++++++++++-------
 .../mes/qualityclass/qualityclass.data.ts     | 31 ++++++++--
 .../mes/qualitygroup/qualitygroup.data.ts     | 21 ++++---
 src/views/mes/workstation/workstation.data.ts |  4 +-
 6 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/src/views/mes/holiday/holiday.data.ts b/src/views/mes/holiday/holiday.data.ts
index 55096dbd7..cf0937d6b 100644
--- a/src/views/mes/holiday/holiday.data.ts
+++ b/src/views/mes/holiday/holiday.data.ts
@@ -89,7 +89,7 @@ export const Holiday = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    dictType: DICT_TYPE.QUALIFY_STATUS,
+    dictType: DICT_TYPE.COMMON_STATUS,
     dictClass: 'string',
     isForm: true,
     isSearch: false,
@@ -98,7 +98,7 @@ export const Holiday = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Switch',
       value: '1',
       componentProps: {
-        inactiveValue: '2',
+        inactiveValue: '0',
         activeValue: '1'
       }
     },
diff --git a/src/views/mes/item/index.vue b/src/views/mes/item/index.vue
index 81515d30d..3cb92bb40 100644
--- a/src/views/mes/item/index.vue
+++ b/src/views/mes/item/index.vue
@@ -81,7 +81,11 @@ const tableColumns = ref(Item.allSchemas.tableColumns)
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
+    console.log("item-search-success-84-val",val)
+    console.log("item-search-success-84-formField",formField)
     setV[formField] = val[0][searchField]
+    setV["itemType"] = val[0]["groupCode"]
+    //setV[] = val[0][searchField]
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/mes/item/item.data.ts b/src/views/mes/item/item.data.ts
index ef09018c2..146ed1730 100644
--- a/src/views/mes/item/item.data.ts
+++ b/src/views/mes/item/item.data.ts
@@ -1,14 +1,15 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import * as QualitygroupApi from '@/api/mes/qualitygroup'
-import { Qualitygroup } from '../qualitygroup/qualitygroup.data'
-
+import * as QualityclassApi from '@/api/mes/qualityclass'
+import { Qualityclass } from '@/views/mes/qualityclass/qualityclass.data'
+// import * as QualitygroupApi from '@/api/mes/qualitygroup'
+// import { Qualitygroup } from '@/views/mes/qualitygroup/qualitygroup.data'
 // 表单校验
 export const ItemRules = reactive({
-  concurrencyStamp: [required],
-  itemCode: [{ required: true, message: '请输入编码', trigger: 'blur' }],
-  itemType: [required],
-  dataType: [required]
+  itemCode: [{ required: true, message: '请输入项目编码', trigger: 'blur' }],
+  itemName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+  qmsClass: [{ required: true, message: '请选择一个质检类别', trigger: 'blur' }],
+  dataType:[{ required: true, message: '请选择一个数据类型！', trigger: 'blur' }],
 })
 
 export const Item = useCrudSchemas(reactive<CrudSchema[]>([
@@ -111,19 +112,40 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
+  // {
+  //   label: '分组编码',
+  //   field: 'itemType',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   // form: {
+  //   //   componentProps: {
+  //   //     isSearchList: true, // 开启查询弹窗
+  //   //     searchTitle: '质检分组', // 查询弹窗标题
+  //   //     searchListPlaceholder: '请选择质检分组', // 输入框占位文本
+  //   //     searchAllSchemas: Qualitygroup.allSchemas, // 查询弹窗所需类
+  //   //     searchField: 'code', // 查询弹窗赋值字段
+  //   //     searchPage: QualitygroupApi.getQualitygroupPage, // 查询弹窗所需分页方法
+  //   //     searchCondition: [{
+  //   //       key: 'status',
+  //   //       value: '1',
+  //   //       action: '=='
+  //   //     }]
+  //   //   }
+  //   // }
+  // },
   {
-    label: '类别编码',
-    field: 'itemType',
+    label: '质检科目编码',
+    field: 'qmsClass',
     sort: 'custom',
     isSearch: true,
     form: {
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchTitle: '质检科目信息', // 查询弹窗标题
-        searchListPlaceholder: '请选择 类别编码', // 输入框占位文本
-        searchAllSchemas: Qualitygroup.allSchemas, // 查询弹窗所需类
+        searchTitle: '质检分组', // 查询弹窗标题
+        searchListPlaceholder: '请选择质检分组', // 输入框占位文本
+        searchAllSchemas: Qualityclass.allSchemas, // 查询弹窗所需类
         searchField: 'code', // 查询弹窗赋值字段
-        searchPage: QualitygroupApi.getQualitygroupPage, // 查询弹窗所需分页方法
+        searchPage: QualityclassApi.getQualityclassPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'status',
           value: '1',
@@ -132,13 +154,6 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '质检科目编码',
-    field: 'qmsClass',
-    sort: 'custom',
-    isSearch: true,
-
-  },
   {
     label: '数据类型',
     field: 'dataType',
@@ -187,7 +202,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: true,
     form: {
       component: 'Switch',
-      value: '2',
+      value: '1',
       componentProps: {
         inactiveValue: '2',
         activeValue: '1'
diff --git a/src/views/mes/qualityclass/qualityclass.data.ts b/src/views/mes/qualityclass/qualityclass.data.ts
index ddc384661..8978ddcdd 100644
--- a/src/views/mes/qualityclass/qualityclass.data.ts
+++ b/src/views/mes/qualityclass/qualityclass.data.ts
@@ -1,11 +1,13 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-
+import * as QualitygroupApi  from '@/api/mes/qualitygroup'
+import { Qualitygroup } from '@/views/mes/qualitygroup/qualitygroup.data'
 // 表单校验
 export const QualityclassRules = reactive({
-  concurrencyStamp: [required],
-  code: [{ required: true, message: '请输入代码', trigger: 'blur' }],
-  name: [required],
+  
+  code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+  groupCode: [{ required: true, message: '请选择一个分组', trigger: 'blur' }],
 })
 
 export const Qualityclass = useCrudSchemas(reactive<CrudSchema[]>([
@@ -108,10 +110,27 @@ export const Qualityclass = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '分组类别',
+    label: '分组',
     field: 'groupCode',
     sort: 'custom',
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择一个分组', // 输入框占位文本
+        multiple:false,
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '分组编码', // 查询弹窗标题
+        searchAllSchemas: Qualitygroup.allSchemas, // 查询弹窗所需类
+        searchPage: QualitygroupApi.getQualitygroupPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'status',
+          value: '1',
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '状态',
@@ -124,7 +143,7 @@ export const Qualityclass = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     form: {
       component: 'Switch',
-      value: '2',
+      value: '1',
       componentProps: {
         inactiveValue: '2',
         activeValue: '1'
diff --git a/src/views/mes/qualitygroup/qualitygroup.data.ts b/src/views/mes/qualitygroup/qualitygroup.data.ts
index 7cf7a5bf9..9744622c9 100644
--- a/src/views/mes/qualitygroup/qualitygroup.data.ts
+++ b/src/views/mes/qualitygroup/qualitygroup.data.ts
@@ -3,9 +3,8 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const QualitygroupRules = reactive({
-  concurrencyStamp: [required],
-  code: [required],
-  name: [required],
+  code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
 })
 
 export const Qualitygroup = useCrudSchemas(reactive<CrudSchema[]>([
@@ -102,17 +101,17 @@ export const Qualitygroup = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '编码名称',
+    label: '分组名称',
     field: 'name',
     sort: 'custom',
     isSearch: true,
   },
-  {
-    label: '分组类别',
-    field: 'groupCode',
-    sort: 'custom',
-    isSearch: true,
-  },
+  // {
+  //   label: '分组类别',
+  //   field: 'groupCode',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
   {
     label: '状态',
     field: 'status',
@@ -124,7 +123,7 @@ export const Qualitygroup = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     form: {
       component: 'Switch',
-      value: '2',
+      value: '1',
       componentProps: {
         inactiveValue: '2',
         activeValue: '1'
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index 50c88e58b..8ef670d05 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -319,8 +319,8 @@ export const abilityPopList = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: AbilityInfo.allSchemas, // 查询弹窗所需类
         searchPage: AbilityInfoApi.getAbilityInfoPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
+          key: 'status',
+          value: '1',
           isMainValue: false
         }]
       }

From 8e2ee0826e5e8b6e80eb8e6d04151278a964877e Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 24 May 2024 17:00:40 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E7=AA=97=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E5=87=BA=E7=8E=B0undefined=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/hrPersonAbility/hrPersonAbility.data.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
index 8e7d12dd6..3ab45c4fc 100644
--- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
+++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
@@ -142,6 +142,7 @@ export const HrPersonAbility = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchTitle: '能力矩阵信息', // 查询弹窗标题
+        searchListPlaceholder: '请选择 能力编号', // 输入框占位文本
         searchAllSchemas: AbilityInfo.allSchemas, // 查询弹窗所需类
         searchField: 'ablityCode', // 查询弹窗赋值字段
         searchPage: AbilityInfoApi.getAbilityInfoPage, // 查询弹窗所需分页方法

From 168447807c5091118cbdb6eda5c884f617f82419 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 17:02:33 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplieDeliveryStrategy/AddForm.vue       | 118 +++++++++++-------
 .../strategy/upShelfStrategy/AddForm.vue      |  14 +--
 2 files changed, 78 insertions(+), 54 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index d0531a644..cdd2ee65a 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -16,7 +16,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="代码" prop="strategyCode">
-                <el-input
+                <el-input key="strategyCode"
                   v-model="formData.strategyCode"
                   placeholder="请输入代码"
                   clearable
@@ -26,38 +26,38 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input key="name" v-model="formData.name" placeholder="请输入名称" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="优先级" prop="priority">
-                <el-input-number v-model="formData.priority" :min="0" />
+                <el-input-number key="priority" v-model="formData.priority" :min="0" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch key="status" v-model="formData.status" />
               </el-form-item>
             </el-col>
           </el-row>
         </div>
         <!-- 规则条件 -->
-        <div class="item mt-20px">
-          <div class="title">规则条件</div>
-          <el-row>
-            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+        <div key="规则条件" class="item mt-20px">
+          <div key="规则条件title" class="title">规则条件</div>
+          <el-row key="规则条件row">
+            <el-col :span="24" v-for="(item, index) in formData.condition" :key="'规则条件row'+index">
               <!-- 供应商类型 -->
-              <el-form-item
+              <el-form-item key="供应商类型formItem"
                 v-if="item.ParamCode == 'SupplierType'"
                 label="供应商类型"
                 class="flex-top err-120"
               >
-                <el-select
+                <el-select key="供应商类型Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -66,10 +66,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.supplierTypeRangeOptions"
-                    :key="cur.value"
+                    :key="'供应商类型Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="供应商类型Value"
                   v-model="item.Value"
                   placeholder="请选择供应商类型"
                   style="flex: 1"
@@ -78,19 +78,19 @@
                 >
                   <el-option
                     v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
-                    :key="dict.value"
+                    :key="'供应商类型Value'+dict.value"
                     :label="dict.label"
                     :value="dict.value"
                   />
                 </el-select>
               </el-form-item>
               <!-- 供应商 -->
-              <el-form-item
+              <el-form-item key="供应商formItem"
                 v-else-if="item.ParamCode == 'SupplierCode'"
                 label="供应商"
                 class="err-120"
               >
-                <el-select
+                <el-select key="供应商Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -99,10 +99,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.supplierRangeOptions"
-                    :key="cur.value"
+                    :key="'供应商Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="供应商Value"
                   v-model="item.Value"
                   placeholder="请选择供应商"
                   style="flex: 1"
@@ -112,19 +112,19 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.code"
+                    :key="'供应商Value'+cur.code"
                     :label="cur.name"
                     :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
               <!-- 星期几 -->
-              <el-form-item
+              <el-form-item key="星期几formItem"
                 v-else-if="item.ParamCode == 'Weekday'"
                 label="星期几"
                 class="flex-top err-120"
               >
-                <el-select
+                <el-select key="星期几Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -133,7 +133,7 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.weekRangeOptions"
-                    :key="cur.value"
+                    :key="'星期几Operator'+cur.value"
                   />
                 </el-select>
                 <div class="checkbox">
@@ -141,7 +141,7 @@
                     <el-checkbox
                       :label="cur.label"
                       v-for="cur in options.weekOptions"
-                      :key="cur.value"
+                      :key="'星期几Value'+cur.value"
                     />
                   </el-checkbox-group>
                 </div>
@@ -150,14 +150,14 @@
           </el-row>
         </div>
         <!-- 规则配置 -->
-        <div class="item mt-20px">
-          <div class="title">规则配置</div>
-          <el-row>
+        <div class="item mt-20px" key="规则配置">
+          <div class="title" key="规则配置title">规则配置</div>
+          <el-row key="规则配置Row">
             <!-- 开始时间 -->
-            <el-col :span="24">
+            <el-col :span="24" key="规则配置Col">
               <!-- 开始时间 -->
-              <el-form-item label="开始时间" prop="BeginTime">
-                <el-time-select
+              <el-form-item key="开始时间formItem" label="开始时间" prop="BeginTime">
+                <el-time-select key="开始时间time"
                   v-model="formData.configuration.BeginTime"
                   start="00:00"
                   end="23:59"
@@ -167,8 +167,8 @@
                 />
               </el-form-item>
               <!-- 结束时间 -->
-              <el-form-item label="结束时间" prop="EndTime">
-                <el-time-select
+              <el-form-item key="结束时间formItem" label="结束时间" prop="EndTime">
+                <el-time-select key="结束时间time"
                   v-model="formData.configuration.EndTime"
                   start="00:00"
                   end="23:59"
@@ -178,8 +178,8 @@
                 />
               </el-form-item>
               <!-- 仓库 -->
-              <el-form-item label="仓库" prop="WarehouseCode">
-                <el-select
+              <el-form-item key="仓库formItem" label="仓库" prop="WarehouseCode">
+                <el-select key="仓库"
                   v-model="formData.configuration.WarehouseCode"
                   :placeholder="`请选择${
                     formData.configuration.WarehouseCode == 'WarehouseCode'
@@ -196,49 +196,51 @@
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'仓库'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
               <!-- 月台 -->
-              <el-form-item label="月台" prop="DockCode">
-                <el-select
+              <el-form-item key="月台formItem" label="月台" prop="DockCode">
+                <el-select key="月台"
                   v-model="formData.configuration.DockCode"
                   placeholder="请选择月台"
                   clearable
                 >
                   <el-option
                     v-for="cur in options.dockList"
-                    :key="cur.code"
+                    :key="'月台'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
               <!-- 在途库位 -->
-              <el-form-item label="在途库位" prop="OnTheWayLocationCode">
-                <el-select
+              <el-form-item key="在途库位formItem" label="在途库位" prop="OnTheWayLocationCode">
+                <el-select key="在途库位"
                   v-model="formData.configuration.OnTheWayLocationCode"
                   placeholder="请选择在途库位"
                   clearable
+                  filterable
+                  :filter-method="filterMethodFromLocation"
                 >
                   <el-option
                     v-for="cur in options.locationList"
-                    :key="cur.code"
+                    :key="'在途库位'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
               <!-- 收货人 -->
-              <el-form-item label="收货人" prop="Receiver">
-                <el-input v-model="formData.configuration.Receiver" placeholder="请输入收货人名称" clearable />
+              <el-form-item key="收货人formItem" label="收货人" prop="Receiver">
+                <el-input key="收货人" v-model="formData.configuration.Receiver" placeholder="请输入收货人名称" clearable />
               </el-form-item>
               <!-- 在途库位 -->
-              <el-form-item label="联系电话" prop="configuration.PhoneNumber">
-                <el-input v-model="formData.configuration.PhoneNumber" placeholder="请输入联系电话" clearable />
+              <el-form-item key="联系电话formItem" label="联系电话" prop="configuration.PhoneNumber">
+                <el-input key="联系电话" v-model="formData.configuration.PhoneNumber" placeholder="请输入联系电话" clearable />
               </el-form-item>
             </el-col>
           </el-row>
@@ -363,7 +365,8 @@ const options = reactive({
   //月台列表
   dockList: [],
   //在途库位列表
-  locationList: []
+  locationList: [],
+  originLocationList: []
 })
 // 弹窗按钮
 const Butttondata = ref([
@@ -407,15 +410,35 @@ const getFormWarehouseList = async () => {
 const getFormDockList = async () => {
   options.dockList = await getDockList()
 }
+const filterMethodFromLocation = (query: string) => {
+  if (query) {
+    options.locationList = options.originLocationList.filter((item) => {
+      return item?.code.includes(query)
+    })
+  } else {
+    options.locationList = options.originLocationList
+  }
+}
 // 获取库位列表
 const getFormLocationList = async () => {
-  options.locationList = await getLocationList({ type: 'TRANSPORT' })
+  if(!options.locationList || options.locationList.length==0){
+    options.locationList = await getLocationList({ type: 'TRANSPORT' })
+    options.originLocationList = [...options.locationList]
+  }else{
+    options.locationList = []
+    let timer = setTimeout(()=>{
+      options.locationList = options.originLocationList
+      if(timer){
+        clearTimeout(timer)
+      }
+    },2000)
+  }
 }
 
 getFormSupplierList()
 getFormWarehouseList()
 getFormDockList()
-getFormLocationList()
+
 
 /** 打开弹窗 */
 const open = async (type: string, strategyCode: string, id?: number) => {
@@ -469,6 +492,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       defaultButtons.formCloseBtn(null) // 关闭
     ]
   }
+  getFormLocationList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 69b2ddad1..4ef5568ae 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -628,7 +628,7 @@ const options = reactive({
   ],
   //供应商列表
   supplierList: [],
-  orignSupplierList: [],
+  originSupplierList: [],
   // 物料类型列表
   itemTypeOptions: [
     { value: 'ItemType', label: '物料类型' },
@@ -673,21 +673,21 @@ const buttonBaseClick = (val, item) => {
 }
 // 获取供应商列表
 const getFormSupplierList = async () => {
-  options.orignSupplierList = await getSupplierList()
-  options.supplierList = [...options.orignSupplierList]
+  options.originSupplierList = await getSupplierList()
+  options.supplierList = [...options.originSupplierList]
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
   options.supplierList = await getCustomerList()
-  options.supplierList = [...options.orignSupplierList]
+  options.supplierList = [...options.originSupplierList]
 }
 const filterMethod = (query: string) => {
   if (query) {
-    options.supplierList = options.orignSupplierList.filter((item) => {
+    options.supplierList = options.originSupplierList.filter((item) => {
       return item.name.includes(query)
     })
   } else {
-    options.supplierList = [...options.orignSupplierList]
+    options.supplierList = [...options.originSupplierList]
   }
 }
 
@@ -744,7 +744,7 @@ const filterMethodWarehouseList = (query: string) => {
       return item.code.includes(query)
     })
   } else {
-    options.warehouseList = []
+    options.warehouseList = options.originWarehouseList
   }
 }
 // 选择仓库/库位/库位组/库区

From e79175adfaeb8472c937e5bca6481dde6a39a4d8 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Fri, 24 May 2024 17:02:50 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/item/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/item/index.vue b/src/views/mes/item/index.vue
index 3cb92bb40..b274a01cc 100644
--- a/src/views/mes/item/index.vue
+++ b/src/views/mes/item/index.vue
@@ -81,8 +81,8 @@ const tableColumns = ref(Item.allSchemas.tableColumns)
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
-    console.log("item-search-success-84-val",val)
-    console.log("item-search-success-84-formField",formField)
+    //console.log("item-search-success-84-val",val)
+    //console.log("item-search-success-84-formField",formField)
     setV[formField] = val[0][searchField]
     setV["itemType"] = val[0]["groupCode"]
     //setV[] = val[0][searchField]

From 9422fe5c1e5c3825c7cd6abe54a6e6f8c45e3db6 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 17:07:21 +0800
Subject: [PATCH 20/22] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategySetting/strategy/upShelfStrategy/AddForm.vue      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 4ef5568ae..c1c28fdab 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -673,12 +673,14 @@ const buttonBaseClick = (val, item) => {
 }
 // 获取供应商列表
 const getFormSupplierList = async () => {
+
   options.originSupplierList = await getSupplierList()
   options.supplierList = [...options.originSupplierList]
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
-  options.supplierList = await getCustomerList()
+
+  options.originSupplierList = await getCustomerList()
   options.supplierList = [...options.originSupplierList]
 }
 const filterMethod = (query: string) => {

From fb21b9b9b7ed84e92399f12b65298297a5df1e33 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 24 May 2024 17:29:46 +0800
Subject: [PATCH 21/22] bug

---
 .../strategy/supplieDeliveryStrategy/AddForm.vue          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index cdd2ee65a..53b7e8806 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -416,18 +416,18 @@ const filterMethodFromLocation = (query: string) => {
       return item?.code.includes(query)
     })
   } else {
-    options.locationList = options.originLocationList
+    options.locationList = [...options.originLocationList]
   }
 }
 // 获取库位列表
 const getFormLocationList = async () => {
   if(!options.locationList || options.locationList.length==0){
-    options.locationList = await getLocationList({ type: 'TRANSPORT' })
-    options.originLocationList = [...options.locationList]
+    options.originLocationList = await getLocationList({ type: 'TRANSPORT' })
+    options.locationList = [...options.originLocationList]
   }else{
     options.locationList = []
     let timer = setTimeout(()=>{
-      options.locationList = options.originLocationList
+      options.locationList = [...options.originLocationList]
       if(timer){
         clearTimeout(timer)
       }

From 4079fe29367eba5957056423ba8dd7ba33efe771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 24 May 2024 17:34:36 +0800
Subject: [PATCH 22/22] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissueplan/preparetoissueMain/index.vue   |  7 +------
 .../preparetoissueMain/preparetoissueMain.data.ts     | 11 +++++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 8ee8ae898..e6af1619a 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -111,6 +111,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       if (formField == 'itemCode') {
         row['itemCode'] = val[0]['componentItemCode']
+        row['uom'] = val[0]['componentUom']
       } else {
         row[formField] = val[0][searchField]
         row['toLocationCode'] = val[0]['rawLocationCode']
@@ -151,9 +152,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             if(item.field == 'planQty') {
               item.tableForm.disabled = true
             }
-            if(item.field == 'uom') {
-              item.tableForm.disabled = true
-            }
             if(item.field == 'available') {
               item.tableForm.disabled = true
             }
@@ -498,9 +496,6 @@ const resetShow = async () => {
     if(item.field == 'planQty') {
       item.tableForm.disabled = false
     }
-    if(item.field == 'uom') {
-      item.tableForm.disabled = false
-    }
     if(item.field == 'available') {
       item.tableForm.disabled = false
     }
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 36dd09bfa..ac6799084 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -580,11 +580,18 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTable: true,
     sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true
+      }
+    },
     table: {
       width: 150
     },
     tableForm:{
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     },
   },
   {
@@ -791,4 +798,4 @@ export const PreparetoissueDetailRules = reactive({
   dueTime:  [
     { required: true, message: '请选择截止时间', trigger: 'change' }
   ]
-})
\ No newline at end of file
+})