From 0a16e1e64ce85e49fd7985f66639989e5a76c10a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sat, 25 May 2024 09:21:10 +0800
Subject: [PATCH 01/32] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/subjectAccount/index.vue          |   4 +-
 .../subjectAccount/subjectAccount.data.ts     |   6 +-
 .../unplannedissueRequestMain/index.vue       |  52 ++++++---
 .../unplannedissueRequestMain.data.ts         | 101 +++++++++++++++++-
 4 files changed, 141 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
index 9a239983f..1ea1e02e2 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue
@@ -81,9 +81,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     if (formField === 'costecentreCode') {
-      setV['costecentreId'] = val[0]['costcentreId']
+      setV['costcentreId'] = val[0]['costcentreId']
       setV['costcentreCode'] = val[0]['costcentreCode']
-      setV['costecentreType'] = val[0]['costcentreType']
+      setV['costcentreType'] = val[0]['costcentreType']
     }
     if( formField === 'projectCode'){
       setV['projectId'] = val[0]['projectId']
diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
index dd20a2146..ecbea2fd0 100644
--- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
+++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
@@ -37,7 +37,7 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '成本中心ID',
-    field: 'costecentreId',
+    field: 'costcentreId',
     sort: 'custom',
     isSearch: false,
     isTable:false,
@@ -49,7 +49,7 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '成本中心代码',
-    field: 'costecentreCode',
+    field: 'costcentreCode',
     sort: 'custom',
     isSearch: false,
     form: {
@@ -71,7 +71,7 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '成本中心类型',
-    field: 'costecentreType',
+    field: 'costcentreType',
     sort: 'custom',
     isSearch: false,
     form:{
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 16eb68241..a91464f67 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -111,16 +111,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['packingNumber'] = val[0]['packingNumber']
-      row['containerNumber'] = val[0]['containerNumber']
-      row['batch'] = val[0]['batch']
-      row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['fromLocationCode'] = val[0]['locationCode']
-      row['itemCode'] = val[0]['itemCode']
-      row['uom'] = val[0]['uom']
+      if(formField === 'itemCode'){
+        row[formField] = val[0][searchField]
+        row['packingNumber'] = val[0]['packingNumber']
+        row['containerNumber'] = val[0]['containerNumber']
+        row['batch'] = val[0]['batch']
+        row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+      }
+      if(formField === 'costcentreCode'){
+        row['costcentreCode'] = val[0]['costcentreCode']
+      }
+      if(formField === 'qadProjectCode'){
+        row['qadProjectCode'] = val[0]['projectCode']
+      }
     } else {
       const setV = {}
+      if(formField === 'usageDescription'){
+        setV['usageDescription'] = val[0]['usageDescription']
+        setV['usageCode'] = val[0]['code']
+      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
@@ -130,14 +142,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    setV[formField] = val[0][searchField]
-    setV['packingNumber'] = val[0]['packingNumber']
-    setV['containerNumber'] = val[0]['containerNumber']
-    setV['batch'] = val[0]['batch']
-    setV['inventoryStatus'] = val[0]['inventoryStatus']
-    setV['fromLocationCode'] = val[0]['locationCode']
-    setV['itemCode'] = val[0]['itemCode']
-    row['uom'] = val[0]['uom']
+    if(formField === 'itemCode'){
+      setV[formField] = val[0][searchField]
+      setV['packingNumber'] = val[0]['packingNumber']
+      setV['containerNumber'] = val[0]['containerNumber']
+      setV['batch'] = val[0]['batch']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fromLocationCode'] = val[0]['locationCode']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['uom'] = val[0]['uom']
+    }
+    if(formField === 'costcentreCode'){
+      setV['costcentreCode'] = val[0]['costcentreCode']
+    }
+    if(formField === 'qadProjectCode'){
+      setV['qadProjectCode'] = val[0]['projectCode']
+    }
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index fa62e355b..0a397834e 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -424,6 +424,9 @@ export const UnplannedissueRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  usageDescription:[
+    { required: true, message: '请选择领用描述', trigger: 'blur' }
+  ],
 })
 
 /**
@@ -585,6 +588,94 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择成本中心',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择领用描述！1111', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择成本中心',
+        searchField: 'costcentreCode',
+        searchTitle: '成本中心信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择科目代码',
+      searchField: 'projectCode',
+      searchTitle: '科目代码信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      },{
+        key: 'costcentreCode', // 查询列表中字段
+        value: 'costcentreCode', // 指查询具体值
+        message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择成本中心',
+        searchField: 'projectCode',
+        searchTitle: '成本中心信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        },{
+          key: 'costcentreCode', // 查询列表中字段
+          value: 'costecentreCode', // 指查询具体值
+          message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+          isMainValue: false // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
   {
     label: '项目代码',
     field: 'projectCode',
@@ -594,6 +685,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isForm: false,
+    isTable:false,
   },
   {
     label: '从货主代码',
@@ -603,7 +695,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isForm: false,
-    isTableForm: false
+    isTableForm: false,
+    isTable:false,
   },
   {
     label: '备注',
@@ -724,4 +817,10 @@ export const UnplannedissueRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  costcentreCode:[
+    { required: true, message: '请选择成本中心代码', trigger: 'change' }
+  ],
+  qadProjectCode:[
+    { required: true, message: '请选择科目代码', trigger: 'change' }
+  ]
 })
\ No newline at end of file

From a1fc7da56f5139720aa720c308aed8e82ad1082d Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sat, 25 May 2024 10:07:42 +0800
Subject: [PATCH 02/32] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=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

---
 .../putaway/putawayJobMain/index.vue          | 53 ++++++++++++++++++-
 .../putawayJobMain/putawayJobMain.data.ts     |  2 +-
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index f08755651..620c58274 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -17,7 +17,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef" v-clientTable
+      :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,6 +28,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -54,6 +56,7 @@
     @searchTableSuccess="searchTableSuccess"
   />
 
+
   <!-- 详情 -->
   <Detail
     ref="detailRef"
@@ -161,6 +164,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-job-main:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -186,12 +190,51 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
+  } else if (val=='selection_point'){// 批量打印
+    handleSelectionPoint()
   } else if (val == 'filtrate') { // 筛选
   } 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(','))
+  
+  // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
+}
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
   if (val.indexOf(row.status) > -1) {
@@ -208,6 +251,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
+    defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
     // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
@@ -225,9 +269,14 @@ const buttonTableClick = async (val, row) => {
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+  } else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.masterId)
   }
 }
-
+const handleDocumentPrint = async (id) => {
+  alert('单据打印')
+}
 // 子包装数据
 const detailParenPackingRef = ref()
 const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index 7658c53e8..9f1d7c72f 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -560,7 +560,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 120,
+      width: 180,
       fixed: 'right'
     },
   }

From 0c5df44f46271dbb795d741532d88b3658f9569f Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sat, 25 May 2024 10:10:13 +0800
Subject: [PATCH 03/32] =?UTF-8?q?=E5=A4=9A=E9=80=89fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/Table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 10f19206b..811321e7d 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -200,7 +200,7 @@ export default defineComponent({
       const { selection, reserveSelection, align, headerAlign,border } = unref(getProps)
       // 渲染多选
       return selection ? (
-        <ElTableColumn
+        <ElTableColumn fixed="left"
           type="selection"
           reserveSelection={reserveSelection}
           align={align}

From 4234d0cb5a993473146eaf3bafb9c8f5d4ef24ec Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sat, 25 May 2024 10:18:37 +0800
Subject: [PATCH 04/32] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedissueJobMain.data.ts             | 70 ++++++++++++++++---
 .../unplannedissueRecordMain.data.ts          | 34 +++++++++
 2 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
index 1f74cfd45..865b0b2a8 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -28,6 +28,24 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -172,6 +190,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
     }
@@ -183,6 +202,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
     }
@@ -194,6 +214,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '部门',
@@ -202,11 +223,13 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -216,7 +239,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -235,7 +258,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,7 +277,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -273,7 +296,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -292,7 +315,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -311,7 +334,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -330,7 +353,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -349,7 +372,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -368,7 +391,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -387,7 +410,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -404,6 +427,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接时间',
     field: 'acceptTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -425,6 +449,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '承接人',
     field: 'acceptUserId',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -437,6 +462,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -453,6 +479,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完成人',
     field: 'completeUserId',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -468,6 +495,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -481,6 +509,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -493,6 +522,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -509,6 +539,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -585,6 +616,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -686,10 +718,27 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -698,6 +747,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index a88a5c412..89167df18 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -171,6 +171,24 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
@@ -460,6 +478,22 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '货主代码',
     field: 'ownerCode',

From 1509f3e92bf848344baab20ae5ade0f5fc225c00 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Sat, 25 May 2024 11:49:15 +0800
Subject: [PATCH 05/32] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=B0=E5=8C=85=E8=A3=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegateRecord/relegateRecordMain.data.ts |  8 +++
 .../relegate/relegateRequest/index.vue        | 24 ++++----
 .../relegateRequestMain.data.ts               | 59 +++++++++++++++++++
 3 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
index 8dd1b54a5..bce38edda 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
@@ -257,6 +257,14 @@ export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '到包装号',
     field: 'toPackingNumber',
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 5a6e71b0a..a78524fba 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -141,12 +141,12 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
-          message: '请选择从仓库代码！',
-          key: 'warehouseCode',
-          value: 'fromWarehouseCode',
-          isMainValue: true
-        }
+      },{
+        message: '请选择从仓库代码！',
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        isMainValue: true
+      }
     ]
     item.form.componentProps.searchCondition = [
       {
@@ -255,12 +255,12 @@ const butttondata = (row, $index) => {
     return []
   }
   return [
-  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理
     defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // 编辑
     // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // 删除
   ]
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 8c6bda653..31dbe345f 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -13,6 +13,10 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 import * as LocationApi  from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as ItempackageApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
 import * as confgiApi  from '@/api/infra/config'
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -293,6 +297,7 @@ export const RelegateRequestDetailRules = reactive({
   available: [required],
   departmentCode: [required],
   concurrencyStamp: [required],
+  packUnit: [required],
 })
 
 export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
@@ -531,6 +536,60 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     },
   },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+      }
+    },
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格',
+      searchField: 'packUnit',
+      searchTitle: '包装规格',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItempackageApi.getItempackagingPage,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格',
+        searchField: 'packUnit',
+        searchTitle: '包装规格',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItempackageApi.getItempackagingPage,
+      }
+    },
+    table: {
+      width: 120
+    },
+  },
   {
     label: '到库区类型',
     field: 'toAreaTypes',

From aefe16e606d191d997daac848e2d58ce04de5be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Sat, 25 May 2024 11:49:46 +0800
Subject: [PATCH 06/32] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
index 79863758b..03cf1a684 100644
--- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
+++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
@@ -4,6 +4,8 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const MesBarCodeRules = reactive({
   available: [required],
+  lowerLim: [required],
+  partNumber: [required],
 })
 
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([

From 8079c4f25af7f5259192b6df7a63763edf7684f5 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sat, 25 May 2024 11:51:42 +0800
Subject: [PATCH 07/32] =?UTF-8?q?=E5=8E=BB=E9=99=A4debugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchTable/src/SearchTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 5e10c4025..9acc52faf 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -93,7 +93,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   HeadButttondata.value = [
     defaultButtons.defaultFilterBtn(null), // 筛选
   ] 
-debugger
+
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField

From 24a8874df73fb3c6f9911e1d22a708bf76b5eddf Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sat, 25 May 2024 11:53:21 +0800
Subject: [PATCH 08/32] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=80=80=E8=B4=A7=E6=95=B0=E9=87=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnJobMain.data.ts             | 26 ++++++++---------
 .../purchasereturnRecordMain.data.ts          | 28 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index 14699c0c1..8cad3f9ab 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -837,21 +837,21 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault: 18,
     hiddenInMain:true,
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault: 12,
-  },
+  // {
+  //   label: '数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //   },
+  //   sortTableDefault: 12,
+  // },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index 9b8147bd6..23eae21a2 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -484,7 +484,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -733,19 +733,19 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 7,
     hiddenInMain: true
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    sortTableDefault: 1005,
-    form: {
-      component: 'InputNumber',
-    }
-  },
+  // {
+  //   label: '数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:true,
+  //   sortTableDefault: 1005,
+  //   form: {
+  //     component: 'InputNumber',
+  //   }
+  // },
   {
     label: '计量单位',
     field: 'uom',

From b0fd164fd5c7c8eb3064bc8c366392cd5883ca1b Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Sat, 25 May 2024 14:06:34 +0800
Subject: [PATCH 09/32] =?UTF-8?q?WMS=20=E5=BA=93=E5=86=85=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E7=AE=A1=E7=90=86->=E8=B0=83=E6=8B=A8=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93->=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transferissueRequestMain/transferissueRequestMain.data.ts  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index 5fa888a32..5ad9b5c71 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -534,6 +534,9 @@ export const TransferissueRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
 })
 
 /**

From 3e995e60a6a8936cc9c16c2acdde4cc4f1b25397 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sat, 25 May 2024 15:17:13 +0800
Subject: [PATCH 10/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/factoryModeling/workshop/workshop.data.ts    | 1 +
 .../factoryModeling/workstation/workstation.data.ts              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
index 9290a46a0..ac2dccee5 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
@@ -139,6 +139,7 @@ export const WorkshopRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 4e3b6a855..7dae0132b 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -291,6 +291,7 @@ export const WorkstationRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
+    { required: true, message: '请输入名称', trigger: 'change' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [

From cde1dcaec654d83fed8464fe4e552aad02919bd0 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Sat, 25 May 2024 15:41:52 +0800
Subject: [PATCH 11/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E4=B8=BA=E6=BB=91=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/buttMesManage/mesBarCode/mesBarCode.data.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
index 03cf1a684..8c2c419f0 100644
--- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
+++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
@@ -6,6 +6,7 @@ export const MesBarCodeRules = reactive({
   available: [required],
   lowerLim: [required],
   partNumber: [required],
+  available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
 })
 
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
@@ -166,9 +167,19 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-  table: {
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    table: {
       width: 120
     },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '创建时间',

From e5117b9b90f10314ded7c0d3ed109fd68852b4e0 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Sat, 25 May 2024 16:24:43 +0800
Subject: [PATCH 12/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/sampleCode/sampleCode.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index 5466941fb..4d1228a15 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -19,7 +19,7 @@ export const SampleCodeRules = reactive({
 const samplingSchemeList = await getSamplingScheme()
 export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采样方案编码',
+    label: '采样方案',
     field: 'code',
     sort: 'custom',
     isSearch: true,

From f788a48a77a612dc29ac818c515e035c5c8072a0 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Sat, 25 May 2024 16:58:08 +0800
Subject: [PATCH 13/32] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../putaway/putawayJobMain/index.vue               | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 620c58274..7a4700efd 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -99,6 +99,7 @@ import * as PutawayJobMainApi from '@/api/wms/putawayJobMain'
 import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {getAccessToken} from "@/utils/auth";
 // 上架任务主
 defineOptions({ name: 'PutawayJobMain' })
 
@@ -229,10 +230,10 @@ const getSelectionRows = (currentPage,currentPageSelectionRows) => {
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{
-    rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
+    rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
   })
   console.log('批量打印',rows.join(','))
-  
+  window.open(src.value+'&id='+rows.join(','))
   // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
 }
 // 根据状态返回该按钮是否显示
@@ -271,11 +272,14 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   } else if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.masterId)
+    handleDocumentPrint(row)
   }
 }
-const handleDocumentPrint = async (id) => {
-  alert('单据打印')
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/954234424010665984?token=' + getAccessToken())
+const handleDocumentPrint = async (row) => {
+  window.open(src.value+'&id='+row.masterId)
 }
 // 子包装数据
 const detailParenPackingRef = ref()

From 28ef4c422333899fe0a2eaedd96d8cb2aabe856d Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Sat, 25 May 2024 17:06:57 +0800
Subject: [PATCH 14/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9qms=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionMethod/index.vue | 12 ++++++------
 src/views/qms/sampleCode/index.vue       | 12 ++++++------
 src/views/qms/samplingProcess/index.vue  | 12 ++++++------
 src/views/qms/samplingScheme/index.vue   | 12 ++++++------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/qms/inspectionMethod/index.vue b/src/views/qms/inspectionMethod/index.vue
index 08024617f..72ee843f2 100644
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@@ -105,9 +105,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:inspectionMethod:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:inspectionMethod:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:inspectionMethod:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-method:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-method:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-method:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -147,9 +147,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:inspectionMethod:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspectionMethod:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspectionMethod:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-method:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-method:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-method:disable'}),
   ]
 }
 
diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue
index 8e9696b80..119f8551a 100644
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@@ -100,9 +100,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:sampleCode:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:sampleCode:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:sampleCode:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:sample-code:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:sample-code:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:sample-code:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -148,9 +148,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampleCode:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampleCode:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampleCode:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:sample-code:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sample-code:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sample-code:disable'}),
   ]
 }
 
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index 5d1dcbeb6..53b7a0b2e 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -101,9 +101,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:samplingProcess:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:samplingProcess:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:samplingProcess:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-process:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-process:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-process:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -143,9 +143,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:samplingProcess:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:samplingProcess:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:samplingProcess:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-process:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-process:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-process:disable'}),
   ]
 }
 
diff --git a/src/views/qms/samplingScheme/index.vue b/src/views/qms/samplingScheme/index.vue
index 741e48b1a..21cc5649a 100644
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:samplingScheme:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:samplingScheme:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:samplingScheme:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-scheme:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-scheme:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-scheme:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -141,9 +141,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:samplingScheme:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:samplingScheme:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:samplingScheme:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-scheme:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-scheme:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-scheme:disable'}),
   ]
 }
 

From becff594cdcd9aa497413dd5b811150189e9afec Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Sat, 25 May 2024 17:16:32 +0800
Subject: [PATCH 15/32] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demandforecastingMain/demandforecastingMain.data.ts          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index dce2986d2..2b473703b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -564,4 +564,5 @@ export const DemandforecastingDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  poLine: [{required:true, message: '请选择订单行', trigger: 'blur'}]
 })

From 6b137f12e92356784df74a5de0b72bbdbd11007b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Sat, 25 May 2024 17:30:31 +0800
Subject: [PATCH 16/32] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts | 2 +-
 .../factoryModeling/productionline/productionline.data.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index cbd6b2916..3e4336b4b 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -251,7 +251,7 @@ export const DockRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true,max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   city: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
index 3ff8f8bd0..9892ad75b 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
@@ -243,7 +243,7 @@ export const ProductionlineRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true,max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   workshopCode: [
     { required: true, message: '请输入车间代码', trigger: 'change' }

From 9692867882e9e58c38fe6a82551879ecb3611050 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Sat, 25 May 2024 17:31:29 +0800
Subject: [PATCH 17/32] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=88=97=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index af84254df..4bac09e28 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -505,7 +505,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 330,
+      width: 480,
       fixed: 'right'
     },
   }

From f558aa67ecb32f36e1b25c33f2a05d29cab7839a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 27 May 2024 08:46:21 +0800
Subject: [PATCH 18/32] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../labelManage/callmaterials/callmaterials.data.ts             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 6c1e22092..52045b242 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -36,6 +36,8 @@ export const CallmaterialsRules = reactive({
   warehouseCode: [required],
   workshopCode: [required],
   workStationCode: [required],
+  uom: [required],
+  callmaterialQty: [required]
 })
 
 export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([

From b08ea0496fec748bbbf5f8b4bd9344c383b1043a Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 27 May 2024 09:07:24 +0800
Subject: [PATCH 19/32] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/labelManage/callmaterials/index.vue    | 7 +++++--
 .../basicDataManage/labelManage/locationLabel/index.vue    | 7 +++++--
 src/views/wms/inventoryManage/balance/index.vue            | 6 +++++-
 .../purchasereceiptManage/putaway/putawayJobMain/index.vue | 7 +++++--
 .../supplierdeliver/purchaseMain/index.vue                 | 4 +++-
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
index ba361799f..d6f628ede 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Callmaterials.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Callmaterials.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -291,7 +291,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
     () => tableObject.tableList,
     () => {
diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
index 79d4d6b7d..8f68f72a9 100644
--- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Package.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -209,7 +209,10 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 93e3a6943..bc9a950bc 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Balance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Balance.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -135,6 +135,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 7a4700efd..6caba9818 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -198,7 +198,10 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
 watch(
   () => tableObject.tableList,
   () => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 700b9eeca..4d2d3fbf3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -155,7 +155,9 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
             setV['contactName']=val[0]['contacts']
             setV['contactPhone']=val[0]['phone']
             setV['contactEmail']=val[0]['email']
-            setV['taxRate']=val[0]['taxRate']
+            if(formRef.formModel.taxRate==0){
+              setV['taxRate']=val[0]['taxRate']
+            }
             formRef.setValues(setV)
             //明细
             val.forEach(item=>{

From f2fa1275d99ee4f038fd465f1f9777be89ac6d5e Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 27 May 2024 10:06:34 +0800
Subject: [PATCH 20/32] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/purchasereceiptManage/putaway/putawayJobMain/index.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 7a4700efd..a61fa9acc 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -277,7 +277,7 @@ const buttonTableClick = async (val, row) => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/954234424010665984?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/954878108028801024?token=' + getAccessToken())
 const handleDocumentPrint = async (row) => {
   window.open(src.value+'&id='+row.masterId)
 }

From ce3d78e606d7df2dd8375f18b8fecaefa3f8024b Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Mon, 27 May 2024 10:09:54 +0800
Subject: [PATCH 21/32] =?UTF-8?q?EAM=20=20=E2=80=94=E2=80=94>=20TS?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=A4=A7=E5=B0=8F=E5=86=99=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/maintenance/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/eam/maintenance/index.vue b/src/views/eam/maintenance/index.vue
index fc14f5b21..59006e42f 100644
--- a/src/views/eam/maintenance/index.vue
+++ b/src/views/eam/maintenance/index.vue
@@ -66,10 +66,9 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import * as BasicInspectionOptionApi from "@/api/eam/basicInspectionOption";
 import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
 import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
-import { ToolAccounts } from "@/views/eam/toolAccounts/ToolAccounts.data";
+import { ToolAccounts } from "@/views/eam/toolAccounts/toolAccounts.data";
 import * as ToolItemApi from "@/api/eam/toolAccounts";
 
 defineOptions({ name: 'Maintenance' })

From 6502b79dc022f3edb3697f5e132b9810646c7726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 27 May 2024 10:18:55 +0800
Subject: [PATCH 22/32]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1bb4abe15..e5f4b9509 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## dev发布2024-05-23-001
+## dev发布2024-05-23-002
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {

From ecb767e30ad5d6f9e7a7dc3e605997c3bc4b8d80 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Mon, 27 May 2024 10:20:57 +0800
Subject: [PATCH 23/32] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=B8=AD=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F2=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue     | 1 -
 .../supplierdeliverRequestMain.data.ts                       | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 27f787357..c4108c63c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -408,7 +408,6 @@ const isShowMainButton = (row, val) => {
   }
 }
 
-
 // 根据状态返回该按钮是否显示
 const isShowMainButtonLabel = (row, val) => {
   if (val.indexOf(row.status) > -1) {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 4bac09e28..fd000436c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -505,7 +505,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 480,
+      width: 350,
       fixed: 'right'
     },
   }
@@ -1123,8 +1123,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  
-  secondPackQty:[required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
+  secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
 export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([

From 2cdace83c2bf482f5e9a0313a5ef42d046e45963 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 27 May 2024 10:59:24 +0800
Subject: [PATCH 24/32] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecord/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue
index 5a8f664d4..857ac62bd 100644
--- a/src/views/qms/inspectionRecord/detail.vue
+++ b/src/views/qms/inspectionRecord/detail.vue
@@ -35,7 +35,7 @@
           <el-tab-pane
             v-for="item in data.subList"
             :key="item.name"
-            :label="item.processCode"
+            :label="item.processDescribe"
             :name="item.name"
           >
             <div class="small-title">检验工序</div>

From 730ee47de54f9a3cbc9bde122fc956a4eadd41c0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 27 May 2024 11:06:28 +0800
Subject: [PATCH 25/32] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=88=B0=E8=BE=BE=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                                |  3 ++-
 src/locales/zh-CN.ts                                |  3 ++-
 .../productputawayAssembleJobMain.data.ts           |  2 +-
 .../productputawayAssembleRecordMain.data.ts        |  2 +-
 .../productputawayAssembleRequestMain.data.ts       |  2 +-
 .../supplierdeliverRequestMain/index.vue            |  2 +-
 .../supplierdeliverBasicForm.vue                    | 13 ++++++++-----
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 628ea1968..55a96a516 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1009,7 +1009,8 @@ export default {
     请先选择要打印的数据:'Please first select the data you want to print',
     创建标签失败:'Failed to create label',
     生产日期不可以大于过期日期:'The production date cannot be longer than the expiration date',
-    '计划到货时间大于要货计划送达日期是否继续？':'The planned arrival time is greater than the planned delivery date. Do you want to continue?',
+    '计划到货时间大于':'The planned arrival time is greater than ',
+    '是否继续？':'. Do you want to continue?',
     '子表明细不能为空!':'Subindicates that the detail cannot be empty!',
     采购申请生成成功:'The purchase request was successfully generated',
     '确认生成采购申请吗？':'Confirm to generate purchase application?',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 6bb427ae3..6c12136b6 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1009,7 +1009,8 @@ export default {
     请先选择要打印的数据:'请先选择要打印的数据',
     创建标签失败:'创建标签失败',
     生产日期不可以大于过期日期:'生产日期不可以大于过期日期',
-    '计划到货时间大于要货计划送达日期是否继续？':'计划到货时间大于要货计划送达日期是否继续？',
+    '计划到货时间大于':'计划到货时间大于',
+    '是否继续？':'是否继续？',
     '子表明细不能为空!':'子表明细不能为空!',
     采购申请生成成功:'采购申请生成成功',
     '确认生成采购申请吗？':'确认生成采购申请吗？',
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
index 57e1fa192..8d4cfb33f 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -611,7 +611,7 @@ export const ProductputawayJobMainRules = reactive({
  */
 export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采购订单号',
+    label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
index 6a9a85fce..d16012baf 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
@@ -390,7 +390,7 @@ export const ProductputawayRecordMainRules = reactive({
  */
 export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采购订单号',
+    label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index 9b28457f2..ec330ec7e 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -420,7 +420,7 @@ export const ProductputawayRequestMainRules = reactive({
  */
 export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采购订单号',
+    label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index c4108c63c..8f3c8d6bc 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -899,7 +899,7 @@ const submitForm = async (formType, data) => {
       let planArriveStr = formatDate(data.planArriveTime);
       if(planArriveStr > planArriveTimeStr.value){
         let confirmFlag = false;
-        await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续？')).then(() => {
+        await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`).then(() => {
           console.log("选择了OK")
           //选择OK
         }).catch(() => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index d65152011..d5c97bbfb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -205,10 +205,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         getSearchTableData(val[0]['number'],formField,searchField)
 
         // 设置计划到货时间
-        let beginTime =  val[0]['endTime']
-        let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
-        planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
-        setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+        
+        if(val[0]['deliveryDate']){
+          let beginTime =  val[0]['endTime'] || '00:00'
+          let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
+          planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+          setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
+        }
         // 清空子表数据
         tableData.value = []
       }
@@ -280,7 +283,7 @@ const submitForm = async (formType, data) => {
       let planArriveStr = formatDate(data.planArriveTime);
       if(planArriveStr > planArriveTimeStr.value){
         let confirmFlag = false;
-        await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续？')).then(() => {
+        await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续？')}`).then(() => {
           console.log("选择了OK")
           //选择OK
         }).catch(() => {

From 5171e5adac2b83ceb4d4948e51e422c414bf0b80 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 27 May 2024 11:34:36 +0800
Subject: [PATCH 26/32] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedissueRequestMain.data.ts         |   2 +-
 .../unplannedreceiptRequestMain/index.vue     |  16 ++-
 .../unplannedreceiptRequestMain.data.ts       | 130 +++++++++++++++++-
 3 files changed, 144 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 0a397834e..73bda1c1a 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -605,7 +605,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchCondition: [{
         key: 'code', // 查询列表中字段
         value: 'usageCode', // 指查询具体值
-        message: '请选择领用描述！1111', // 当前置条件为空时 弹出信息提示
+        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件不是主表的字段的值
       }]
     },
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 7986b0870..4de91f7c6 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -191,11 +191,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           row['itemCode'] = val[0]['code']
           row['uom'] = val[0]['uom']
         }
-      } else {
+      } else if(formField === 'costcentreCode'){
+        row['costcentreCode'] = val[0]['costcentreCode']
+      } else if(formField === 'qadProjectCode'){
+        row['qadProjectCode'] = val[0]['projectCode']
+      }else {
         row[formField] = val[0][searchField]
       }
     } else {
       const setV = {}
+      if(formField === 'usageDescription'){
+        setV['usageDescription'] = val[0]['usageDescription']
+        setV['usageCode'] = val[0]['code']
+      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
@@ -213,6 +221,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['itemCode'] = val[0]['code']
       setV['uom'] = val[0]['uom']
     }
+    if(formField === 'costcentreCode'){
+      setV['costcentreCode'] = val[0]['costcentreCode']
+    }
+    if(formField === 'qadProjectCode'){
+      setV['qadProjectCode'] = val[0]['projectCode']
+    }
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index aa618a17e..db47c288f 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 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'
 
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
@@ -150,6 +150,35 @@ export const UnplannedreceiptRequestMain = 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: 'toAreaTypes',
@@ -401,6 +430,9 @@ export const UnplannedreceiptRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  usageDescription:[
+    { required: true, message: '请选择领用描述', trigger: 'blur' }
+  ],
 })
 
 /**
@@ -749,6 +781,94 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择成本中心',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择领用描述！', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择成本中心',
+        searchField: 'costcentreCode',
+        searchTitle: '成本中心信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '选择科目代码',
+      searchField: 'projectCode',
+      searchTitle: '科目代码信息',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'code', // 查询列表中字段
+        value: 'usageCode', // 指查询具体值
+        message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      },{
+        key: 'costcentreCode', // 查询列表中字段
+        value: 'costcentreCode', // 指查询具体值
+        message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+        isMainValue: true // 表示查询条件不是主表的字段的值
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '选择成本中心',
+        searchField: 'projectCode',
+        searchTitle: '成本中心信息',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'code', // 查询列表中字段
+          value: 'usageCode', // 指查询具体值
+          message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
+          isMainValue: true // 表示查询条件不是主表的字段的值
+        },{
+          key: 'costcentreCode', // 查询列表中字段
+          value: 'costecentreCode', // 指查询具体值
+          message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
+          isMainValue: false // 表示查询条件不是主表的字段的值
+        }]
+      }
+    }
+  },
   {
     label: '原因',
     field: 'reason',
@@ -890,6 +1010,12 @@ export const UnplannedreceiptRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  costcentreCode:[
+    { required: true, message: '请选择成本中心代码', trigger: 'change' }
+  ],
+  qadProjectCode:[
+    { required: true, message: '请选择科目代码', trigger: 'change' }
+  ]
 })
 
 

From 1aa32587035f5304e3782930cd049ed34527c238 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Mon, 27 May 2024 13:28:06 +0800
Subject: [PATCH 27/32] =?UTF-8?q?2024-05-57=20=20=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=94=99=E8=AF=AFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/orderDay/components/schedule.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 31d39754a..d94c5f7c6 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -515,7 +515,7 @@ const doPublishPlan=  ()=>{
   tempBom: detailData.value.tempBom,
   workMode: detailData.value.workMode,
   planDate: detailData.value.planDate,
-  startTime: detailData.value.planDate,
+  startTime: detailData.value.startTime,
   endTime: detailData.value.endTime,
   taskMode: detailData.value.taskMode,
   batchCode:detailData.value.batchCode,

From a5e143dbd966b54f01d707b21777326f5a38f967 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 27 May 2024 13:35:35 +0800
Subject: [PATCH 28/32] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceiptJobMain.data.ts           |  35 +++
 .../unplannedreceiptRequestMain/index.vue     |  21 +-
 .../unplannedreceiptRequestMain.data.ts       | 235 ++++++------------
 3 files changed, 136 insertions(+), 155 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index 1525201c3..56ad57950 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -121,6 +121,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+  
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
@@ -144,6 +145,24 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '优先级',
     field: 'priority',
@@ -695,6 +714,22 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '原因',
     field: 'reason',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 4de91f7c6..20a7dce2a 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -90,9 +90,9 @@
     :isShowButton="false"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
+    @searchTableSuccess="searchTableLabelSuccess"
+    :isShowReduceButton="false"
     @submitForm="submitFormLabel"
-    
   />
 
   <!-- 导入 -->
@@ -231,6 +231,23 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
+
+// 查询标签表格页面返回
+const searchTableLabelSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      if(formField === 'packUnit'){
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
 const Echo =  []
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index db47c288f..0df221d91 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -12,14 +12,8 @@ import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/w
 import * as WarehouseApi from "@/api/wms/warehouse";
 import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
 import * as LocationApi from "@/api/wms/location";
-import {
-  Productionlineitem
-} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
-import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
-import {
-  Supplieritem
-} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
-import * as SupplieritemApi from "@/api/wms/supplieritem";
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
 const { t } = useI18n() // 国际化
 
@@ -1024,64 +1018,50 @@ export const UnplannedreceiptRequestDetailRules = reactive({
  */
 export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCodePackage',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'productionLineCode', // 查询弹窗赋值字段
-      searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
-    label: '供应商代码',
-    field: 'supplierItemCode',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-      searchField: 'supplierCode', // 查询弹窗赋值字段
-      searchTitle: '供应商信息', // 查询弹窗标题
-      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
-      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '物料描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '批次',
@@ -1239,24 +1219,8 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -1271,115 +1235,80 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     }
   },
   {
-    label: '来源工位代码',
-    field: 'workStationCode',
+    label: '包装规格',
+    field: 'packUnit',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
+      width: 150,
       componentProps: {
-        disabled: true
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择物料代码',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
       }
-    }
-  },
-  {
-    label: '来源库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
     tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择物料代码',
+          isTableRowValue: true, 
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
     }
   },
   {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物料描述1',
-    field: 'itemDesc1',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '物料描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
     form: {
       componentProps: {
-        disabled: true
+        disabled: true,
       }
-    }
-  },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
     tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
+      disabled: true,
     }
-  }
+  },
 ]))
 
 //表单校验
 export const UnplannedreceiptRequestDetailLabelRules = reactive({
-  supplierItemCode: [
-    { required: true, message: '请选择供应商', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
-  productionLineCodePackage: [
-    { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
 })

From ca74e0e0c36eee6e8696c62f2351d37f1be71d0d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 27 May 2024 13:46:04 +0800
Subject: [PATCH 29/32] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceiptRecordMain.data.ts        | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index c875677b4..dc184fb84 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -142,6 +142,24 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
@@ -510,6 +528,22 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '原因',
     field: 'reason',

From 7ebe57db56f4b1a45fd5ec73bc3253760abb95c4 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 27 May 2024 14:04:27 +0800
Subject: [PATCH 30/32] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=99=8D=E7=BA=A7=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

---
 .../relegateRequestMain.data.ts               | 43 +++++++------------
 .../wms/inventoryManage/balance/index.vue     | 22 +++++-----
 2 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index 31dbe345f..edbb02d2a 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -536,33 +536,6 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     },
   },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择到库位代码',
-      searchField: 'code',
-      searchTitle: '库位信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.selectBusinessTypeToLocation,
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码',
-        searchField: 'code',
-        searchTitle: '库位信息',
-        searchAllSchemas: Location.allSchemas,
-        searchPage: LocationApi.selectBusinessTypeToLocation,
-      }
-    },
-    table: {
-      width: 120
-    },
-  },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -574,6 +547,14 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchTitle: '包装规格',
       searchAllSchemas: Itempackaging.allSchemas,
       searchPage: ItempackageApi.getItempackagingPage,
+      searchCondition:[
+        {
+          key: 'itemCode',
+          value: 'downItemCode',
+          message: "请选择降级物料代码",
+          isMainValue: true
+        }
+      ]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -584,6 +565,14 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '包装规格',
         searchAllSchemas: Itempackaging.allSchemas,
         searchPage: ItempackageApi.getItempackagingPage,
+        searchCondition:[
+          {
+            key: 'itemCode',
+            value: 'downItemCode',
+            message: "请选择降级物料代码",
+            isMainValue: true
+          }
+        ]
       }
     },
     table: {
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 93e3a6943..ea82cd331 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -189,17 +189,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  // {
-  //   label: '标签信息',
-  //   name: 'bqxx',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: '',
-  //   color: '',
-  //   link: true,
-  //   float:'right',
-  //   hasPermi: ''
-  // },
+  {
+    label: '标签信息',
+    name: 'bqxx',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    link: true,
+    float:'right',
+    hasPermi: ''
+  },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除

From 6177e946b48da7beb0ab05f3180964b55a70b550 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Mon, 27 May 2024 14:20:29 +0800
Subject: [PATCH 31/32] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81WMS?=
 =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E8=AE=B0=E5=BD=95=E4=B8=AD?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E5=92=8C=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=B2=A1=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayJobMain.data.ts             | 32 +++++++-------
 .../productputawayRecordMain.data.ts          | 38 ++++++++---------
 .../productputawayRequestMain.data.ts         | 42 +++++++++----------
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index de2de7d95..c91d1ed51 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -608,22 +608,22 @@ export const ProductputawayJobMainRules = reactive({
  * @returns {Array} 制品上架任务子表
  */
 export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '采购订单号',
+  //   field: 'poNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'poLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
index b5dea8cb8..ea24d7871 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -389,24 +389,24 @@ export const ProductputawayRecordMainRules = reactive({
  * @returns {Array} 制品上架记录子表
  */
 export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-  },
+  // {
+  //   label: '采购订单号',
+  //   field: 'poNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:2,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'poLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:2,
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -753,4 +753,4 @@ export const ProductputawayRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index f03928c9f..fe9c56858 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -427,26 +427,26 @@ export const ProductputawayRequestMainRules = reactive({
  * @returns {Array} 制品上架申请子表
  */
 export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '采购订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTableForm: false,
-  },
+  // {
+  //   label: '采购订单号',
+  //   field: 'poNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  //   isTableForm: false,
+  // },
+  // {
+  //   label: '订单行',
+  //   field: 'poLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  //   isTableForm: false,
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -824,4 +824,4 @@ export const ProductputawayRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-})
\ No newline at end of file
+})

From 14adb8a04e51ee23c2d64775f0d5c9b143488c99 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 27 May 2024 14:37:33 +0800
Subject: [PATCH 32/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedreceiptRecordMain.data.ts                 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index dc184fb84..7bd1bce39 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -529,16 +529,16 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     },
   },
   {
-    label: '科目代码',
-    field: 'qadProjectCode',
+    label: '成本中心代码',
+    field: 'costcentreCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '货主代码',
-    field: 'ownerCode',
+    label: '科目代码',
+    field: 'qadProjectCode',
     sort: 'custom',
     table: {
       width: 150
@@ -569,6 +569,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -577,6 +578,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },