From 08940753d5afde32279a6f359b7c4b1ef8601adc Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 28 Oct 2024 17:29:59 +0800
Subject: [PATCH 001/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7HL-6340?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balanceChangeHistory/index.ts     |  62 +++++
 .../balanceChangeHistory.data.ts              | 149 +++++++++++
 .../balanceChangeHistory/index.vue            | 244 ++++++++++++++++++
 3 files changed, 455 insertions(+)
 create mode 100644 src/api/wms/balanceChangeHistory/index.ts
 create mode 100644 src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
 create mode 100644 src/views/wms/inventoryManage/balanceChangeHistory/index.vue

diff --git a/src/api/wms/balanceChangeHistory/index.ts b/src/api/wms/balanceChangeHistory/index.ts
new file mode 100644
index 000000000..0d66d2c2d
--- /dev/null
+++ b/src/api/wms/balanceChangeHistory/index.ts
@@ -0,0 +1,62 @@
+import request from '@/config/axios'
+
+export interface BalanceChangeHistoryVO {
+  beforeItemCode: string
+  beforeBatch: string
+  beforePackingNumber: string
+  beforeInventoryStatus: string
+  beforeLocationCode: string
+  beforeQty: number
+  beforeTransNumber: string
+  beforeId: number
+  afterItemCode: string
+  afterBatch: string
+  afterPackingNumber: string
+  afterInventoryStatus: string
+  afterLocationCode: string
+  afterQty: number
+  afterTransNumber: string
+  afterId: number
+  remark: string
+}
+
+// 查询库存余额变更记录列表
+export const getBalanceChangeHistoryPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance-change-history/senior', data })
+  } else {
+    return await request.get({ url: `/wms/balance-change-history/page`, params })
+  }
+}
+
+// 查询库存余额变更记录详情
+export const getBalanceChangeHistory = async (id: number) => {
+  return await request.get({ url: `/wms/balance-change-history/get?id=` + id })
+}
+
+// 新增库存余额变更记录
+export const createBalanceChangeHistory = async (data: BalanceChangeHistoryVO) => {
+  return await request.post({ url: `/wms/balance-change-history/create`, data })
+}
+
+// 修改库存余额变更记录
+export const updateBalanceChangeHistory = async (data: BalanceChangeHistoryVO) => {
+  return await request.put({ url: `/wms/balance-change-history/update`, data })
+}
+
+// 删除库存余额变更记录
+export const deleteBalanceChangeHistory = async (id: number) => {
+  return await request.delete({ url: `/wms/balance-change-history/delete?id=` + id })
+}
+
+// 导出库存余额变更记录 Excel
+export const exportBalanceChangeHistory = async (params) => {
+  return await request.download({ url: `/wms/balance-change-history/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/balance-change-history/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
new file mode 100644
index 000000000..fd59cecba
--- /dev/null
+++ b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
@@ -0,0 +1,149 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const BalanceChangeHistoryRules = reactive({
+})
+
+export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '变更前_物料代码',
+    field: 'beforeItemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前_批次',
+    field: 'beforeBatch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前_包装号',
+    field: 'beforePackingNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前_库存状态',
+    field: 'beforeInventoryStatus',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '变更前_库位代码',
+    field: 'beforeLocationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前_数量',
+    field: 'beforeQty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前_事务号',
+    field: 'beforeTransNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前_id',
+    field: 'beforeId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '变更后_物料代码',
+    field: 'afterItemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更后_批次',
+    field: 'afterBatch',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更后_包装号',
+    field: 'afterPackingNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更后_库存状态',
+    field: 'afterInventoryStatus',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '变更后_库位代码',
+    field: 'afterLocationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更后_数量',
+    field: 'afterQty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更后_事务号',
+    field: 'afterTransNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '变更前_id',
+    field: 'afterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))
diff --git a/src/views/wms/inventoryManage/balanceChangeHistory/index.vue b/src/views/wms/inventoryManage/balanceChangeHistory/index.vue
new file mode 100644
index 000000000..baa9aec20
--- /dev/null
+++ b/src/views/wms/inventoryManage/balanceChangeHistory/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="BalanceChangeHistory.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="BalanceChangeHistory.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="BalanceChangeHistoryRules"
+    :formAllSchemas="BalanceChangeHistory.allSchemas"
+    :apiUpdate="BalanceChangeHistoryApi.updateBalanceChangeHistory"
+    :apiCreate="BalanceChangeHistoryApi.createBalanceChangeHistory"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="BalanceChangeHistory.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/balance-change-history/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { BalanceChangeHistory,BalanceChangeHistoryRules } from './balanceChangeHistory.data'
+import * as BalanceChangeHistoryApi from '@/api/wms/balanceChangeHistory'
+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'
+
+defineOptions({ name: 'BalanceChangeHistory' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(BalanceChangeHistory.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BalanceChangeHistoryApi.getBalanceChangeHistoryPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  //defaultButtons.defaultAddBtn({hasPermi:'wms:balanceChangeHistory:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'wms:balanceChangeHistory:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:balance-change-history:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:balanceChangeHistory:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:balanceChangeHistory:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =BalanceChangeHistory.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await BalanceChangeHistoryApi.createBalanceChangeHistory(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await BalanceChangeHistoryApi.updateBalanceChangeHistory(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicBalanceChangeHistory')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await BalanceChangeHistoryApi.deleteBalanceChangeHistory(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await BalanceChangeHistoryApi.exportBalanceChangeHistory(tableObject.params)
+    download.excel(data, '库存余额变更记录.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '库存余额变更记录导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await BalanceChangeHistoryApi.importTemplate()
+})
+
+</script>

From 611fe3c4fdfd340ea247b5b26cf9778d06cd996b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 29 Oct 2024 09:16:55 +0800
Subject: [PATCH 002/225] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../balanceChangeHistory.data.ts              | 95 ++++++++++++++-----
 1 file changed, 70 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
index fd59cecba..e159e18ab 100644
--- a/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
+++ b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
@@ -7,109 +7,157 @@ export const BalanceChangeHistoryRules = reactive({
 
 export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '变更前_物料代码',
+    label: '前-物料代码',
     field: 'beforeItemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
   },
   {
-    label: '变更前_批次',
+    label: '前-批次',
     field: 'beforeBatch',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
   },
   {
-    label: '变更前_包装号',
+    label: '前-包装号',
     field: 'beforePackingNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 220
+    },
   },
   {
-    label: '变更前_库存状态',
+    label: '前-库存状态',
     field: 'beforeInventoryStatus',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
     form: {
       component: 'Radio'
     },
   },
   {
-    label: '变更前_库位代码',
+    label: '前-库位代码',
     field: 'beforeLocationCode',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
   },
   {
-    label: '变更前_数量',
+    label: '前-数量',
     field: 'beforeQty',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
   },
   {
-    label: '变更前_事务号',
+    label: '前-事务号',
     field: 'beforeTransNumber',
     sort: 'custom',
+    table: {
+      width: 220
+    },
     isSearch: true,
   },
   {
-    label: '变更前_id',
+    label: '前-ID',
     field: 'beforeId',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180
+    },
     form: {
       component: 'InputNumber',
       value: 0
     },
   },
   {
-    label: '变更后_物料代码',
+    label: '后-物料代码',
     field: 'afterItemCode',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
   },
   {
-    label: '变更后_批次',
+    label: '后-批次',
     field: 'afterBatch',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
   },
   {
-    label: '变更后_包装号',
+    label: '后-包装号',
     field: 'afterPackingNumber',
     sort: 'custom',
+    table: {
+      width: 220
+    },
     isSearch: true,
   },
   {
-    label: '变更后_库存状态',
+    label: '后-库存状态',
     field: 'afterInventoryStatus',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
     form: {
       component: 'Radio'
     },
   },
   {
-    label: '变更后_库位代码',
+    label: '后-库位代码',
     field: 'afterLocationCode',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
   },
   {
-    label: '变更后_数量',
+    label: '后-数量',
     field: 'afterQty',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
   },
   {
-    label: '变更后_事务号',
+    label: '后-事务号',
     field: 'afterTransNumber',
     sort: 'custom',
+    table: {
+      width: 220
+    },
     isSearch: true,
   },
   {
-    label: '变更前_id',
+    label: '后-ID',
     field: 'afterId',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isSearch: true,
     form: {
       component: 'InputNumber',
@@ -119,12 +167,18 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '备注',
     field: 'remark',
+    table: {
+      width: 180
+    },
     sort: 'custom',
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     formatter: dateFormatter,
     isSearch: true,
     search: {
@@ -137,13 +191,4 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isForm: false,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   }
-  // }
 ]))

From 6b3b2589663a9c94cd7a0aa8ccb380286aa88504 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 29 Oct 2024 10:06:54 +0800
Subject: [PATCH 003/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7HL-6340?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../balanceChangeHistory.data.ts              | 60 ++++++++++++++-----
 .../balanceChangeHistory/index.vue            |  2 +-
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
index e159e18ab..a4cdaeafd 100644
--- a/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
+++ b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
@@ -63,6 +63,19 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '前-ID',
+    field: 'beforeId',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
   {
     label: '前-事务号',
     field: 'beforeTransNumber',
@@ -73,16 +86,19 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '前-ID',
-    field: 'beforeId',
+    label: '前-业务类型',
+    field: 'beforeBusinessType',
     sort: 'custom',
-    isSearch: true,
     table: {
-      width: 180
+      width: 220
     },
-    form: {
-      component: 'InputNumber',
-      value: 0
+  },
+  {
+    label: '前-动作',
+    field: 'beforeInventoryAction',
+    sort: 'custom',
+    table: {
+      width: 220
     },
   },
   {
@@ -142,6 +158,19 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '后-ID',
+    field: 'afterId',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
   {
     label: '后-事务号',
     field: 'afterTransNumber',
@@ -152,16 +181,19 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '后-ID',
-    field: 'afterId',
+    label: '后-业务类型',
+    field: 'afterBusinessType',
     sort: 'custom',
     table: {
-      width: 180
+      width: 220
     },
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
+  },
+  {
+    label: '后-动作',
+    field: 'afterInventoryAction',
+    sort: 'custom',
+    table: {
+      width: 220
     },
   },
   {
diff --git a/src/views/wms/inventoryManage/balanceChangeHistory/index.vue b/src/views/wms/inventoryManage/balanceChangeHistory/index.vue
index baa9aec20..72f7eaf22 100644
--- a/src/views/wms/inventoryManage/balanceChangeHistory/index.vue
+++ b/src/views/wms/inventoryManage/balanceChangeHistory/index.vue
@@ -103,7 +103,7 @@ const HeadButttondata = [
   //defaultButtons.defaultImportBtn({hasPermi:'wms:balanceChangeHistory:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:balance-change-history:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',

From e78da4cb873917249ce13c20f5fc49086a443f89 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 29 Oct 2024 13:17:59 +0800
Subject: [PATCH 004/225] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../balanceChangeHistory/balanceChangeHistory.data.ts           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
index a4cdaeafd..e5b94e6b1 100644
--- a/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
+++ b/src/views/wms/inventoryManage/balanceChangeHistory/balanceChangeHistory.data.ts
@@ -61,7 +61,6 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
   },
   {
     label: '前-ID',
@@ -156,7 +155,6 @@ export const BalanceChangeHistory = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
   },
   {
     label: '后-ID',

From e22250deed5eada86f7349954cdf87fc9c3ce606 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 29 Oct 2024 13:49:37 +0800
Subject: [PATCH 005/225] =?UTF-8?q?HL-6339WMS=20=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E5=AD=90=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=EF=BC=8C=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=94=9F=E4=BA=A7=E7=BA=BF=EF=BC=8C=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=EF=BC=8C=E6=AD=A4?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E5=B8=A6=E5=87=BA=E4=BA=A7=E7=BA=BF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=90=8E=E9=9D=A2=E9=80=89=E6=8B=A9=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E5=BA=93=E4=BD=8D=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E4=B8=8D=E6=98=AF=E5=89=8D=E9=9D=A2?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain/index.vue         |  2 +-
 .../productscrapRequestMain.data.ts           | 29 ++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index f5557cfc9..8324adae6 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -476,7 +476,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['childList'] = []
           newRow['singlePrice'] = item['singlePrice']
           newRow['amount'] = newRow['qty']*item['singlePrice']
-
+          newRow['productionLineCode'] = item['productionLineCode']
           if(item['bomList'].length>0){
             newRow['bomVersionInitOptions'] = item['bomList'].map(item1=>({
               label:item1,
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 165bf069c..90b04c253 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -981,8 +981,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key:'productionLineCode',
         value:'productionLineCode',
         message: '请填写生产线代码！',
-        isMainValue: true,
-        isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+        isMainValue: false,
+        // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
       },
       // {
       //   key: 'itemCode',
@@ -1025,8 +1026,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           key:'productionLineCode',
           value:'productionLineCode',
           message: '请填写生产线代码！',
-          isMainValue: true,
-          isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+          isMainValue: false,
+          // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
         },
         // {
         //   key: 'itemCode',
@@ -1103,6 +1105,13 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         value: 'workshopCode',
         message: '请填写车间代码！',
         isMainValue: true
+      },{
+        key:'productionLineCode',
+        value:'productionLineCode',
+        message: '请填写生产线代码！',
+        isMainValue: false,
+        // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+        isTableRowValue: true, //查询当前searchTable表中行数据的值
       }],
       verificationParams: [{
         key: 'code',
@@ -1127,6 +1136,18 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        }, {
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key:'productionLineCode',
+          value:'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: false,
+          // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
         }],
         verificationParams: [{
           key: 'code',

From 2e31a9d0b13feaf3a4472667138f5050a7b4898d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 29 Oct 2024 14:42:30 +0800
Subject: [PATCH 006/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7HL-6326?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain.data.ts             | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 90b04c253..cdca664aa 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -570,15 +570,14 @@ export const ProductscrapRequestMain = useCrudSchemas(
     //     }
     //   },
     // },
-    // {
-    //   label: '备注',
-    //   field: 'remark',
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   isTable: false,
-    // },
+    {
+      label: '主备注',
+      field: 'mainRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '部门',
       field: 'departmentCode',

From 1abc8e9f62ce35502f5b66e0d27a61fd96c4d97d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 29 Oct 2024 16:15:25 +0800
Subject: [PATCH 007/225] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itembasic/itembasic.data.ts                | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 502cf1efc..eab07f83c 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -544,7 +544,6 @@ export const ItembasicCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 180,
       fixed: 'left'
     },
   },
@@ -554,7 +553,6 @@ export const ItembasicCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
     },
   },
   {
@@ -566,7 +564,6 @@ export const ItembasicCopy = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTable: true,
     table: {
-      width: 120
     }
   },
   {
@@ -575,9 +572,6 @@ export const ItembasicCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_TYPE,
     dictClass: 'string',
-    isTable: true,
-    table: {
-      width: 100
-    } ,
+    isTable: true
   }
 ]))
\ No newline at end of file

From 92a5a05ba48b49e8f5123c799f0c667ef0612696 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 30 Oct 2024 08:57:46 +0800
Subject: [PATCH 008/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6326=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRecordMain.data.ts            | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index d3963d5d0..486bafab0 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -286,15 +286,14 @@ export const ProductscrapRecordMain = useCrudSchemas(
       },
       isTable: false
     },
-    // {
-    //   label: '备注',
-    //   field: 'remark',
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   isTable: false
-    // },
+    {
+      label: '主备注',
+      field: 'mainRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '是否已撤销',
       field: 'revokeFlag',
@@ -746,22 +745,14 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isSearch: true,
-  //   search: {
-  //     component: 'Input',
-  //     componentProps: {
-  //       placeholder: '请输入备注'
-  //     }
-  //   },
-  //   isTable: true,
-  // },
+  {
+    label: '明细备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',

From e696d742629d66fbe6be4a3bfdcc4d77f72e07fd Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 30 Oct 2024 09:51:46 +0800
Subject: [PATCH 009/225] =?UTF-8?q?HL-6335SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=82=B9=E5=87=BB=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=90=8E=EF=BC=8C=E8=B4=A2=E5=8A=A1=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=EF=BC=9A=E6=94=B6+=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=89=8D6=E4=B8=AA=E6=B1=89=E5=AD=97+=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8+=E5=8F=91=E7=A5=A8=E5=8F=B7=E5=90=8E5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index da7d1e0fe..58e404fdd 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1138,7 +1138,7 @@ const submitPurchasePass = async (id, submitData) => {
 const formFinanceRef = ref()
 const handleFinanceApp = async (row) => {
   row.postingDate = dayjs().valueOf()
-  row.voucherNumberRemark = '收到' + row.supplierName + '发票' + row.goldenTaxInvoiceNumber
+  row.voucherNumberRemark = `收到${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>5?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-5):row.goldenTaxInvoiceNumber:''}`
   formFinanceRef.value.open('update', row, null, '财务通过', '财务通过')
 }
 

From 4825f11b443241becd2695c030215ca319bfb190 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Wed, 30 Oct 2024 15:53:02 +0800
Subject: [PATCH 010/225] =?UTF-8?q?HL-6311=20=E6=8C=89=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9=E3=80=8A=E5=99=A8=E5=85=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/containerMainRequest/index.ts     | 28 ++++++++---
 .../createContainerMainRequest.data.ts        | 46 +++++++++----------
 .../createContainerMainRequest/index.vue      |  2 +-
 .../initialContainerMainRequest/index.vue     |  2 +-
 .../moveContainerMainRequest/index.vue        |  7 ++-
 .../returnContainerMainRequest/index.vue      |  2 +-
 .../scrapContainerMainRequest/index.vue       |  2 +-
 .../scrapContainerMainRequest.data.ts         | 32 ++++++-------
 8 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/src/api/wms/containerMainRequest/index.ts b/src/api/wms/containerMainRequest/index.ts
index 681b93c3e..3544598de 100644
--- a/src/api/wms/containerMainRequest/index.ts
+++ b/src/api/wms/containerMainRequest/index.ts
@@ -113,14 +113,30 @@ export const exportDeliverContainerMainRequest = async (params) => {
   }
 }
 
-// 下载用户导入模板(器具初始化/新增)
-export const importTemplate = () => {
-  return request.download({ url: '/wms/container-main-request/get-import-template' })
+
+// 下载用户导入模板(器具初始化)
+export const importTemplateInitial = () => {
+  return request.download({ url: '/wms/container-main-request/get-import-template-initial' })
+}
+// 下载用户导入模板(器具新增)
+export const importTemplateCreate = () => {
+  return request.download({ url: '/wms/container-main-request/get-import-template-create' })
+}
+
+// 下载用户导入模板(器具报废)
+export const importTemplateScrap = () => {
+  return request.download({ url: '/wms/container-main-request/get-import-template-scrap' })
 }
 
-// 下载用户导入模板(器具返回/移动/报废)
-export const importTemplateReturnAndMove = () => {
-  return request.download({ url: '/wms/container-main-request/get-import-template-returnAndMove' })
+// 下载用户导入模板(器具移动)
+export const importTemplateMove = () => {
+  return request.download({ url: '/wms/container-main-request/get-import-template-move' })
+}
+
+
+// 下载用户导入模板(器具返回)
+export const importTemplateReturn = () => {
+  return request.download({ url: '/wms/container-main-request/get-import-template-return' })
 }
 
 // 关闭
diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/createContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/createContainerMainRequest.data.ts
index dc83cbc1d..b01f5420e 100644
--- a/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/createContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/createContainerMainRequest.data.ts
@@ -79,7 +79,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '初始化库位代码',
+    label: '到库位代码',
     field: 'toLocationCode',
     sort: 'custom',
     table: {
@@ -87,7 +87,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择初始化库位代码',
+      searchListPlaceholder: '请选择到库位代码',
       searchField: 'code',
       searchTitle: '库位信息',
       searchAllSchemas: Location.allSchemas,
@@ -105,7 +105,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择初始化库位代码',
+        searchListPlaceholder: '请选择到库位代码',
         searchField: 'code',
         searchTitle: '库位信息',
         searchAllSchemas: Location.allSchemas,
@@ -465,6 +465,26 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '数量',
     field: 'toQty',
@@ -503,26 +523,6 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '库存状态',
-    field: 'toInventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '子备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue
index 109951619..de6baf2ea 100644
--- a/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerMainRequest/index.vue
@@ -534,7 +534,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplate()
+  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateCreate()
 })
 
 </script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 4889d5dcb..9f883e7bf 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@@ -534,7 +534,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplate()
+  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateInitial()
 })
 
 </script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue
index 89f39d8a3..d70759d59 100644
--- a/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/index.vue
@@ -433,6 +433,11 @@ const submitForm = async (formType,submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  let findLocation = tableData.value.find(item=>item.fromLocationCode==item.toLocationCode&&item.fromInventoryStatus==item.toInventoryStatus)
+  if(findLocation){
+    message.warning('从库位和到库位不能相同')
+    return
+  }
   data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(item => {
     if(item.qty == 0){
@@ -535,7 +540,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateReturnAndMove()
+  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateMove()
 })
 
 </script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue
index 835adfc5f..6aefd24e0 100644
--- a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/index.vue
@@ -535,7 +535,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateReturnAndMove()
+  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateReturn()
 })
 
 </script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index c8c79b8b8..ce2b89d73 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -557,7 +557,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateReturnAndMove()
+  importTemplateData.templateUrl = await ContainerMainRequestApi.importTemplateScrap()
 })
 
 </script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index 5d2c76d4b..fa9c45a11 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -533,6 +533,21 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
   //     disabled: true,
   //   },
   // },
+  {
+    label: '库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+  },
   {
     label: '数量',
     field: 'toQty',
@@ -566,23 +581,6 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
-  {
-    label: '到库存状态',
-    field: 'toInventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isForm: false,
-    isTableForm: false,
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-  },
   {
     label: '子备注',
     field: 'remark',

From 491617e36230f4b7331919e8ba66dd662c571396 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Wed, 30 Oct 2024 16:24:50 +0800
Subject: [PATCH 011/225] =?UTF-8?q?HL-6311=20=E5=99=A8=E5=85=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=BF=9B=E8=A1=8C=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../createContainerRecordMain.data.ts         | 357 ++++++++++++++++++
 .../createContainerRecordMain/index.vue       | 267 +++++++++++++
 .../deliverContainerRecordMain.data.ts        | 357 ++++++++++++++++++
 .../deliverContainerRecordMain/index.vue      | 267 +++++++++++++
 .../initialContainerRecordMain/index.vue      | 299 +++++++++++++++
 .../initialContainerRecordMain.data.ts        | 357 ++++++++++++++++++
 .../moveContainerRecordMain/index.vue         | 299 +++++++++++++++
 .../moveContainerRecordMain.data.ts           | 357 ++++++++++++++++++
 .../returnContainerRecordMain/index.vue       | 299 +++++++++++++++
 .../moveContainerRecordMain.data.ts           | 357 ++++++++++++++++++
 .../scrapContainerRecordMain/index.vue        | 299 +++++++++++++++
 .../scrapContainerRecordMain.data.ts          | 357 ++++++++++++++++++
 12 files changed, 3872 insertions(+)
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/moveContainerRecordMain.data.ts
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
 create mode 100644 src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts

diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
new file mode 100644
index 000000000..8b65a711b
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
@@ -0,0 +1,357 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerRecordMainRules = reactive({
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+  // 获取当前操作人的部门
+  import { useUserStore } from '@/store/modules/user'
+  const userStore = useUserStore()
+  const userDept = userStore.userSelfInfo.dept
+   // id 转str 否则form回显匹配不到
+   userDept.id = userDept.id.toString()
+  const userDeptArray:any = [userDept]
+
+export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerRecordDetailRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom'
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: true,
+    isForm: false,
+    isTableForm: false,
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
+    isTable: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
new file mode 100644
index 000000000..0b2f50e14
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerRecordMain.allSchemas"
+      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerRecordMainRules"
+    :formAllSchemas="ContainerRecordMain.allSchemas"
+    :tableAllSchemas="ContainerRecordDetail.allSchemas"
+    :tableFormRules="ContainerRecordDetailRules"
+    :isBusiness="true"
+  />
+
+   <!-- 详情 -->
+   <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRecordDetail.allSchemas"
+    :detailAllSchemasRules="ContainerRecordDetailRules"
+    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowUpdate="false"
+  />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './createContainerRecordMain.data'
+
+console.log(3444,ContainerRecordDetail)
+import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
+import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { json } from 'stream/consumers'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'ContainerRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
+// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
+const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
+console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
+const searchType = ref()
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ *
+ */
+// if ( routeName.value == 'InitialContainerManageRecord') {
+//   tableObject.params = {
+//     type:'INITIAL',
+//   }
+//    searchType.value = 'INITIAL'
+//   businessType.value = 'InitialContainerManage'
+//   importFileName.value = '器具初始化记录'
+// }
+//  if ( routeName.value == 'InitialContainerManageRecord') {
+//   const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
+//   ContainerRecordDetailAllSchemas.value.tableMainColumns = array
+//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
+//  }
+//  else {
+//    ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
+//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
+// }
+
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerRecordMainApi.deleteContainerRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    if(businessType.value = 'InitialContainerManage'){
+      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else {
+      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value': 'CREATE'
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
new file mode 100644
index 000000000..8b65a711b
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
@@ -0,0 +1,357 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerRecordMainRules = reactive({
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+  // 获取当前操作人的部门
+  import { useUserStore } from '@/store/modules/user'
+  const userStore = useUserStore()
+  const userDept = userStore.userSelfInfo.dept
+   // id 转str 否则form回显匹配不到
+   userDept.id = userDept.id.toString()
+  const userDeptArray:any = [userDept]
+
+export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerRecordDetailRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom'
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: true,
+    isForm: false,
+    isTableForm: false,
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
+    isTable: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue
new file mode 100644
index 000000000..75f0171f2
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerRecordMain.allSchemas"
+      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerRecordMainRules"
+    :formAllSchemas="ContainerRecordMain.allSchemas"
+    :tableAllSchemas="ContainerRecordDetail.allSchemas"
+    :tableFormRules="ContainerRecordDetailRules"
+    :isBusiness="true"
+  />
+
+   <!-- 详情 -->
+   <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRecordDetail.allSchemas"
+    :detailAllSchemasRules="ContainerRecordDetailRules"
+    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowUpdate="false"
+  />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './deliverContainerRecordMain.data'
+
+console.log(3444,ContainerRecordDetail)
+import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
+import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { json } from 'stream/consumers'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'ContainerRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
+// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
+const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
+console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
+const searchType = ref()
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ *
+ */
+// if ( routeName.value == 'InitialContainerManageRecord') {
+//   tableObject.params = {
+//     type:'INITIAL',
+//   }
+//    searchType.value = 'INITIAL'
+//   businessType.value = 'InitialContainerManage'
+//   importFileName.value = '器具初始化记录'
+// }
+//  if ( routeName.value == 'InitialContainerManageRecord') {
+//   const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
+//   ContainerRecordDetailAllSchemas.value.tableMainColumns = array
+//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
+//  }
+//  else {
+//    ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
+//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
+// }
+
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerRecordMainApi.deleteContainerRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    if(businessType.value = 'InitialContainerManage'){
+      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else {
+      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value': 'CREATE'
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
new file mode 100644
index 000000000..5ae19ffb2
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
@@ -0,0 +1,299 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerRecordMain.allSchemas"
+      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerRecordMainRules"
+    :formAllSchemas="ContainerRecordMain.allSchemas"
+    :tableAllSchemas="ContainerRecordDetail.allSchemas"
+    :tableFormRules="ContainerRecordDetailRules"
+    :isBusiness="true"
+  />
+
+   <!-- 详情 -->
+   <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRecordDetail.allSchemas"
+    :detailAllSchemasRules="ContainerRecordDetailRules"
+    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowUpdate="false"
+  />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './initialContainerRecordMain.data'
+
+console.log(3444,ContainerRecordDetail)
+import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
+import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { json } from 'stream/consumers'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'ContainerRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
+// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
+const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
+console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
+const searchType = ref()
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
+})
+
+// // 判断 路由名称 进行条件过滤
+// /**
+//  *
+//  */
+//  if ( routeName.value == 'ReturnContainerManageRecord') {
+//   tableObject.params = {
+//     type:'RETURN'
+//   }
+//    searchType.value = 'RETURN'
+//   businessType.value = 'ReturnContainerManage'
+//   importFileName.value = '器具返回记录'
+// } else if ( routeName.value == 'MoveContainerManageRecord') {
+//   tableObject.params = {
+//     type:'MOVE'
+//   }
+//    searchType.value = 'MOVE'
+//   businessType.value = 'MoveContainerManage'
+//   importFileName.value = '器具转移记录'
+// } else if ( routeName.value == 'InitialContainerManageRecord') {
+//   tableObject.params = {
+//     type:'INITIAL',
+//   }
+//    searchType.value = 'INITIAL'
+//   businessType.value = 'InitialContainerManage'
+//   importFileName.value = '器具初始化记录'
+// }
+// else if ( routeName.value == 'ScrapContainerManageRecord') {
+//   tableObject.params = {
+//     type:'SCRAP'
+//   }
+//    searchType.value = 'SCRAP'
+//   businessType.value = 'ScrapContainerManage'
+//   importFileName.value = '器具报废记录'
+// } else if ( routeName.value == 'DeliverContainerManageRecord') {
+//   tableObject.params = {
+//     type: 'DELIVER',
+//   }
+//    searchType.value = 'DELIVER'
+//   businessType.value = 'DeliverContainerManage'
+//   importFileName.value = '器具发运记录'
+// } else if( routeName.value == 'ContainerManageRecord'){
+//   businessType.value = 'ContainerManage'
+//   importFileName.value = '器具管理记录'
+// }
+//  if ( routeName.value == 'InitialContainerManageRecord') {
+//   const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
+//   ContainerRecordDetailAllSchemas.value.tableMainColumns = array
+//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
+//  }
+//  else {
+//    ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
+//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
+// }
+
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerRecordMainApi.deleteContainerRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    if(businessType.value = 'InitialContainerManage'){
+      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else {
+      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':searchType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
new file mode 100644
index 000000000..8b65a711b
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
@@ -0,0 +1,357 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerRecordMainRules = reactive({
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+  // 获取当前操作人的部门
+  import { useUserStore } from '@/store/modules/user'
+  const userStore = useUserStore()
+  const userDept = userStore.userSelfInfo.dept
+   // id 转str 否则form回显匹配不到
+   userDept.id = userDept.id.toString()
+  const userDeptArray:any = [userDept]
+
+export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerRecordDetailRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom'
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: true,
+    isForm: false,
+    isTableForm: false,
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
+    isTable: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
new file mode 100644
index 000000000..0d04831a3
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
@@ -0,0 +1,299 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerRecordMain.allSchemas"
+      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerRecordMainRules"
+    :formAllSchemas="ContainerRecordMain.allSchemas"
+    :tableAllSchemas="ContainerRecordDetail.allSchemas"
+    :tableFormRules="ContainerRecordDetailRules"
+    :isBusiness="true"
+  />
+
+   <!-- 详情 -->
+   <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRecordDetail.allSchemas"
+    :detailAllSchemasRules="ContainerRecordDetailRules"
+    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowUpdate="false"
+  />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './moveContainerRecordMain.data'
+
+console.log(3444,ContainerRecordDetail)
+import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
+import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { json } from 'stream/consumers'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'ContainerRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
+// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
+const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
+console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
+const searchType = ref()
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ *
+ */
+ if ( routeName.value == 'ReturnContainerManageRecord') {
+  tableObject.params = {
+    type:'RETURN'
+  }
+   searchType.value = 'RETURN'
+  businessType.value = 'ReturnContainerManage'
+  importFileName.value = '器具返回记录'
+} else if ( routeName.value == 'MoveContainerManageRecord') {
+  tableObject.params = {
+    type:'MOVE'
+  }
+   searchType.value = 'MOVE'
+  businessType.value = 'MoveContainerManage'
+  importFileName.value = '器具转移记录'
+} else if ( routeName.value == 'InitialContainerManageRecord') {
+  tableObject.params = {
+    type:'INITIAL',
+  }
+   searchType.value = 'INITIAL'
+  businessType.value = 'InitialContainerManage'
+  importFileName.value = '器具初始化记录'
+}
+else if ( routeName.value == 'ScrapContainerManageRecord') {
+  tableObject.params = {
+    type:'SCRAP'
+  }
+   searchType.value = 'SCRAP'
+  businessType.value = 'ScrapContainerManage'
+  importFileName.value = '器具报废记录'
+} else if ( routeName.value == 'DeliverContainerManageRecord') {
+  tableObject.params = {
+    type: 'DELIVER',
+  }
+   searchType.value = 'DELIVER'
+  businessType.value = 'DeliverContainerManage'
+  importFileName.value = '器具发运记录'
+} else if( routeName.value == 'ContainerManageRecord'){
+  businessType.value = 'ContainerManage'
+  importFileName.value = '器具管理记录'
+}
+ if ( routeName.value == 'InitialContainerManageRecord') {
+  const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
+  ContainerRecordDetailAllSchemas.value.tableMainColumns = array
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
+ }
+ else {
+   ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
+}
+
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerRecordMainApi.deleteContainerRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    if(businessType.value = 'InitialContainerManage'){
+      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else {
+      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':searchType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts
new file mode 100644
index 000000000..8b65a711b
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts
@@ -0,0 +1,357 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerRecordMainRules = reactive({
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+  // 获取当前操作人的部门
+  import { useUserStore } from '@/store/modules/user'
+  const userStore = useUserStore()
+  const userDept = userStore.userSelfInfo.dept
+   // id 转str 否则form回显匹配不到
+   userDept.id = userDept.id.toString()
+  const userDeptArray:any = [userDept]
+
+export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerRecordDetailRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom'
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: true,
+    isForm: false,
+    isTableForm: false,
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
+    isTable: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
new file mode 100644
index 000000000..0d04831a3
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
@@ -0,0 +1,299 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerRecordMain.allSchemas"
+      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerRecordMainRules"
+    :formAllSchemas="ContainerRecordMain.allSchemas"
+    :tableAllSchemas="ContainerRecordDetail.allSchemas"
+    :tableFormRules="ContainerRecordDetailRules"
+    :isBusiness="true"
+  />
+
+   <!-- 详情 -->
+   <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRecordDetail.allSchemas"
+    :detailAllSchemasRules="ContainerRecordDetailRules"
+    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowUpdate="false"
+  />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './moveContainerRecordMain.data'
+
+console.log(3444,ContainerRecordDetail)
+import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
+import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { json } from 'stream/consumers'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'ContainerRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
+// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
+const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
+console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
+const searchType = ref()
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ *
+ */
+ if ( routeName.value == 'ReturnContainerManageRecord') {
+  tableObject.params = {
+    type:'RETURN'
+  }
+   searchType.value = 'RETURN'
+  businessType.value = 'ReturnContainerManage'
+  importFileName.value = '器具返回记录'
+} else if ( routeName.value == 'MoveContainerManageRecord') {
+  tableObject.params = {
+    type:'MOVE'
+  }
+   searchType.value = 'MOVE'
+  businessType.value = 'MoveContainerManage'
+  importFileName.value = '器具转移记录'
+} else if ( routeName.value == 'InitialContainerManageRecord') {
+  tableObject.params = {
+    type:'INITIAL',
+  }
+   searchType.value = 'INITIAL'
+  businessType.value = 'InitialContainerManage'
+  importFileName.value = '器具初始化记录'
+}
+else if ( routeName.value == 'ScrapContainerManageRecord') {
+  tableObject.params = {
+    type:'SCRAP'
+  }
+   searchType.value = 'SCRAP'
+  businessType.value = 'ScrapContainerManage'
+  importFileName.value = '器具报废记录'
+} else if ( routeName.value == 'DeliverContainerManageRecord') {
+  tableObject.params = {
+    type: 'DELIVER',
+  }
+   searchType.value = 'DELIVER'
+  businessType.value = 'DeliverContainerManage'
+  importFileName.value = '器具发运记录'
+} else if( routeName.value == 'ContainerManageRecord'){
+  businessType.value = 'ContainerManage'
+  importFileName.value = '器具管理记录'
+}
+ if ( routeName.value == 'InitialContainerManageRecord') {
+  const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
+  ContainerRecordDetailAllSchemas.value.tableMainColumns = array
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
+ }
+ else {
+   ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
+}
+
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerRecordMainApi.deleteContainerRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    if(businessType.value = 'InitialContainerManage'){
+      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else {
+      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':searchType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/moveContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/moveContainerRecordMain.data.ts
new file mode 100644
index 000000000..8b65a711b
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/moveContainerRecordMain.data.ts
@@ -0,0 +1,357 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerRecordMainRules = reactive({
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+  // 获取当前操作人的部门
+  import { useUserStore } from '@/store/modules/user'
+  const userStore = useUserStore()
+  const userDept = userStore.userSelfInfo.dept
+   // id 转str 否则form回显匹配不到
+   userDept.id = userDept.id.toString()
+  const userDeptArray:any = [userDept]
+
+export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerRecordDetailRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom'
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: true,
+    isForm: false,
+    isTableForm: false,
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
+    isTable: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
new file mode 100644
index 000000000..91abaf844
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
@@ -0,0 +1,299 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ContainerRecordMain.allSchemas"
+      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ContainerRecordMainRules"
+    :formAllSchemas="ContainerRecordMain.allSchemas"
+    :tableAllSchemas="ContainerRecordDetail.allSchemas"
+    :tableFormRules="ContainerRecordDetailRules"
+    :isBusiness="true"
+  />
+
+   <!-- 详情 -->
+   <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ContainerRecordMain.allSchemas"
+    :detailAllSchemas="ContainerRecordDetail.allSchemas"
+    :detailAllSchemasRules="ContainerRecordDetailRules"
+    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowUpdate="false"
+  />
+
+  </template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './initialContainerRecordMain.data'
+
+console.log(3444,ContainerRecordDetail)
+import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
+import * as ContainerRecordDetailApi from '@/api/wms/containerRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { json } from 'stream/consumers'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'ContainerRecordMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
+// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
+const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
+console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
+const searchType = ref()
+const { tableObject, tableMethods } = useTable({
+  getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ *
+ */
+ if ( routeName.value == 'ReturnContainerManageRecord') {
+  tableObject.params = {
+    type:'RETURN'
+  }
+   searchType.value = 'RETURN'
+  businessType.value = 'ReturnContainerManage'
+  importFileName.value = '器具返回记录'
+} else if ( routeName.value == 'MoveContainerManageRecord') {
+  tableObject.params = {
+    type:'MOVE'
+  }
+   searchType.value = 'MOVE'
+  businessType.value = 'MoveContainerManage'
+  importFileName.value = '器具转移记录'
+} else if ( routeName.value == 'InitialContainerManageRecord') {
+  tableObject.params = {
+    type:'INITIAL',
+  }
+   searchType.value = 'INITIAL'
+  businessType.value = 'InitialContainerManage'
+  importFileName.value = '器具初始化记录'
+}
+else if ( routeName.value == 'ScrapContainerManageRecord') {
+  tableObject.params = {
+    type:'SCRAP'
+  }
+   searchType.value = 'SCRAP'
+  businessType.value = 'ScrapContainerManage'
+  importFileName.value = '器具报废记录'
+} else if ( routeName.value == 'DeliverContainerManageRecord') {
+  tableObject.params = {
+    type: 'DELIVER',
+  }
+   searchType.value = 'DELIVER'
+  businessType.value = 'DeliverContainerManage'
+  importFileName.value = '器具发运记录'
+} else if( routeName.value == 'ContainerManageRecord'){
+  businessType.value = 'ContainerManage'
+  importFileName.value = '器具管理记录'
+}
+ if ( routeName.value == 'InitialContainerManageRecord') {
+  const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
+  ContainerRecordDetailAllSchemas.value.tableMainColumns = array
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
+ }
+ else {
+   ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
+   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
+}
+
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+const searchList = (model)=>{
+  model.type = searchType.value
+  setSearchParams(model)
+}
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>-1&&findIndex<$index){
+    return []
+  }
+    return [
+        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
+    ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ContainerRecordMainApi.deleteContainerRecordMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    buttonBaseClick('refresh',null)
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    if(businessType.value = 'InitialContainerManage'){
+      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else {
+      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':searchType.value
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
new file mode 100644
index 000000000..8b65a711b
--- /dev/null
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
@@ -0,0 +1,357 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { TableColumn } from '@/types/table'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ContainerRecordMainRules = reactive({
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+  // 获取当前操作人的部门
+  import { useUserStore } from '@/store/modules/user'
+  const userStore = useUserStore()
+  const userDept = userStore.userSelfInfo.dept
+   // id 转str 否则form回显匹配不到
+   userDept.id = userDept.id.toString()
+  const userDeptArray:any = [userDept]
+
+export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isForm: false,
+    isTable:false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
+    isTable:false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: false,
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ContainerRecordDetailRules = reactive({
+  fromLocationCode: [required],
+  toLocationCode: [required],
+  concurrencyStamp: [required],
+})
+
+export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom'
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '目标库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+  },
+  {
+    label: '到数量',
+    field: 'toQty',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isTable: true,
+    isForm: false,
+    isTableForm: false,
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    isForm: false,
+    isTableForm: false,
+    isTable: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    hiddenInMain:true,
+    isTableForm: false,
+    isTable: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 682734bf56bb4be0fa3c52ec62a9f14889a53369 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 30 Oct 2024 17:07:45 +0800
Subject: [PATCH 012/225] =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../initialContainerRecordMain/index.vue      | 156 ++----------------
 .../initialContainerRecordMain.data.ts        |  11 +-
 2 files changed, 17 insertions(+), 150 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
index 5ae19ffb2..4c4d90738 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+    <Search
+      :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +16,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
-      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+      :detailAllSchemas="ContainerRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,23 +37,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
     </Table>
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="getList"
-    :rules="ContainerRecordMainRules"
-    :formAllSchemas="ContainerRecordMain.allSchemas"
-    :tableAllSchemas="ContainerRecordDetail.allSchemas"
-    :tableFormRules="ContainerRecordDetailRules"
-    :isBusiness="true"
-  />
-
    <!-- 详情 -->
    <Detail
     ref="detailRef"
@@ -86,71 +75,16 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
-// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
-const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
-console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
-const searchType = ref()
+const tableColumns = 
+ref([ ...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
 })
-
-// // 判断 路由名称 进行条件过滤
-// /**
-//  *
-//  */
-//  if ( routeName.value == 'ReturnContainerManageRecord') {
-//   tableObject.params = {
-//     type:'RETURN'
-//   }
-//    searchType.value = 'RETURN'
-//   businessType.value = 'ReturnContainerManage'
-//   importFileName.value = '器具返回记录'
-// } else if ( routeName.value == 'MoveContainerManageRecord') {
-//   tableObject.params = {
-//     type:'MOVE'
-//   }
-//    searchType.value = 'MOVE'
-//   businessType.value = 'MoveContainerManage'
-//   importFileName.value = '器具转移记录'
-// } else if ( routeName.value == 'InitialContainerManageRecord') {
-//   tableObject.params = {
-//     type:'INITIAL',
-//   }
-//    searchType.value = 'INITIAL'
-//   businessType.value = 'InitialContainerManage'
-//   importFileName.value = '器具初始化记录'
-// }
-// else if ( routeName.value == 'ScrapContainerManageRecord') {
-//   tableObject.params = {
-//     type:'SCRAP'
-//   }
-//    searchType.value = 'SCRAP'
-//   businessType.value = 'ScrapContainerManage'
-//   importFileName.value = '器具报废记录'
-// } else if ( routeName.value == 'DeliverContainerManageRecord') {
-//   tableObject.params = {
-//     type: 'DELIVER',
-//   }
-//    searchType.value = 'DELIVER'
-//   businessType.value = 'DeliverContainerManage'
-//   importFileName.value = '器具发运记录'
-// } else if( routeName.value == 'ContainerManageRecord'){
-//   businessType.value = 'ContainerManage'
-//   importFileName.value = '器具管理记录'
-// }
-//  if ( routeName.value == 'InitialContainerManageRecord') {
-//   const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
-//   ContainerRecordDetailAllSchemas.value.tableMainColumns = array
-//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
-//  }
-//  else {
-//    ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
-//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
-// }
-
+tableObject.params = {
+    type:'INITIAL'
+}
+importFileName.value = '器具初始化记录'
 
 
 // 字段设置 更新主列表字段
@@ -167,26 +101,11 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
-const searchList = (model)=>{
-  model.type = searchType.value
-  setSearchParams(model)
-}
-
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -201,28 +120,6 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
-    ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -233,24 +130,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
 }
 
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ContainerRecordMainApi.deleteContainerRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}
-}
+
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -260,13 +141,8 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if(businessType.value = 'InitialContainerManage'){
-      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }else {
-      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }
   } catch {
   } finally {
     loadDone()
@@ -278,7 +154,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value':searchType.value
+    'value':'INITIAL'
   }
   if (!Array.isArray(searchData.filters)) {
     searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
index 8b65a711b..3cdb48b7e 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
@@ -39,7 +39,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     table: {
       width: 120
@@ -180,15 +180,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
   }
 ]))
 

From 0e4a4f3497172a35365fb758b93bf0f60158ddb5 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Wed, 30 Oct 2024 17:09:56 +0800
Subject: [PATCH 013/225] =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containermanage/createContainerRecordMain/index.vue  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
index 0b2f50e14..c3885d7de 100644
--- a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
@@ -228,13 +228,8 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if(businessType.value = 'InitialContainerManage'){
-      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }else {
-      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }
+    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     loadDone()

From ccd93519233fc67562b76649faef98b0ff76dcc1 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 30 Oct 2024 17:29:01 +0800
Subject: [PATCH 014/225] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../createContainerRecordMain.data.ts         |   1 -
 .../createContainerRecordMain/index.vue       | 119 ++-----------
 .../initialContainerRecordMain/index.vue      |   2 +-
 .../moveContainerRecordMain/index.vue         | 154 ++---------------
 .../moveContainerRecordMain.data.ts           |  10 --
 .../returnContainerRecordMain/index.vue       | 156 ++---------------
 ...a.ts => returnContainerRecordMain.data.ts} |  10 --
 .../scrapContainerRecordMain/index.vue        | 159 ++----------------
 .../scrapContainerRecordMain.data.ts          |  10 --
 9 files changed, 65 insertions(+), 556 deletions(-)
 rename src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/{moveContainerRecordMain.data.ts => returnContainerRecordMain.data.ts} (97%)

diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
index 8b65a711b..fced84e20 100644
--- a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
@@ -39,7 +39,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 120
diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
index c3885d7de..571136246 100644
--- a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+    <Search
+      :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +16,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
-      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+      :detailAllSchemas="ContainerRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,23 +37,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
     </Table>
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="getList"
-    :rules="ContainerRecordMainRules"
-    :formAllSchemas="ContainerRecordMain.allSchemas"
-    :tableAllSchemas="ContainerRecordDetail.allSchemas"
-    :tableFormRules="ContainerRecordDetailRules"
-    :isBusiness="true"
-  />
-
    <!-- 详情 -->
    <Detail
     ref="detailRef"
@@ -80,45 +69,22 @@ import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { json } from 'stream/consumers'
 const { loadStart, loadDone } = usePageLoading()
-defineOptions({ name: 'ContainerRecordMain' })
+defineOptions({ name: 'createContainerRecordMain' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
-// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
-const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
-console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
-const searchType = ref()
+const tableColumns = 
+ref([ ...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
 })
-
-// 判断 路由名称 进行条件过滤
-/**
- *
- */
-// if ( routeName.value == 'InitialContainerManageRecord') {
-//   tableObject.params = {
-//     type:'INITIAL',
-//   }
-//    searchType.value = 'INITIAL'
-//   businessType.value = 'InitialContainerManage'
-//   importFileName.value = '器具初始化记录'
-// }
-//  if ( routeName.value == 'InitialContainerManageRecord') {
-//   const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
-//   ContainerRecordDetailAllSchemas.value.tableMainColumns = array
-//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
-//  }
-//  else {
-//    ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
-//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
-// }
-
+tableObject.params = {
+    type:'CREATE'
+}
+importFileName.value = '器具新增记录'
 
 
 // 字段设置 更新主列表字段
@@ -135,26 +101,11 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
-const searchList = (model)=>{
-  model.type = searchType.value
-  setSearchParams(model)
-}
-
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -169,28 +120,6 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
-    ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -201,24 +130,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
 }
 
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ContainerRecordMainApi.deleteContainerRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}
-}
+
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -241,7 +154,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value': 'CREATE'
+    'value':'CREATE'
   }
   if (!Array.isArray(searchData.filters)) {
     searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
index 4c4d90738..c8a01b99a 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
@@ -142,7 +142,7 @@ const handleExport = async () => {
     loadStart()
     const excelTitle = ref(route.meta.title)
     const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     loadDone()
diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
index 0d04831a3..922e87f07 100644
--- a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+    <Search
+      :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +16,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
-      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+      :detailAllSchemas="ContainerRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,23 +37,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
     </Table>
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="getList"
-    :rules="ContainerRecordMainRules"
-    :formAllSchemas="ContainerRecordMain.allSchemas"
-    :tableAllSchemas="ContainerRecordDetail.allSchemas"
-    :tableFormRules="ContainerRecordDetailRules"
-    :isBusiness="true"
-  />
-
    <!-- 详情 -->
    <Detail
     ref="detailRef"
@@ -86,71 +75,16 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
-// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
-const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
-console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
-const searchType = ref()
+const tableColumns = 
+ref([ ...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
 })
-
-// 判断 路由名称 进行条件过滤
-/**
- *
- */
- if ( routeName.value == 'ReturnContainerManageRecord') {
-  tableObject.params = {
-    type:'RETURN'
-  }
-   searchType.value = 'RETURN'
-  businessType.value = 'ReturnContainerManage'
-  importFileName.value = '器具返回记录'
-} else if ( routeName.value == 'MoveContainerManageRecord') {
-  tableObject.params = {
+tableObject.params = {
     type:'MOVE'
-  }
-   searchType.value = 'MOVE'
-  businessType.value = 'MoveContainerManage'
-  importFileName.value = '器具转移记录'
-} else if ( routeName.value == 'InitialContainerManageRecord') {
-  tableObject.params = {
-    type:'INITIAL',
-  }
-   searchType.value = 'INITIAL'
-  businessType.value = 'InitialContainerManage'
-  importFileName.value = '器具初始化记录'
-}
-else if ( routeName.value == 'ScrapContainerManageRecord') {
-  tableObject.params = {
-    type:'SCRAP'
-  }
-   searchType.value = 'SCRAP'
-  businessType.value = 'ScrapContainerManage'
-  importFileName.value = '器具报废记录'
-} else if ( routeName.value == 'DeliverContainerManageRecord') {
-  tableObject.params = {
-    type: 'DELIVER',
-  }
-   searchType.value = 'DELIVER'
-  businessType.value = 'DeliverContainerManage'
-  importFileName.value = '器具发运记录'
-} else if( routeName.value == 'ContainerManageRecord'){
-  businessType.value = 'ContainerManage'
-  importFileName.value = '器具管理记录'
 }
- if ( routeName.value == 'InitialContainerManageRecord') {
-  const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
-  ContainerRecordDetailAllSchemas.value.tableMainColumns = array
-   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
- }
- else {
-   ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
-   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
-}
-
+importFileName.value = '器具移动记录'
 
 
 // 字段设置 更新主列表字段
@@ -167,26 +101,11 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
-const searchList = (model)=>{
-  model.type = searchType.value
-  setSearchParams(model)
-}
-
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -201,28 +120,6 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
-    ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -233,24 +130,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
 }
 
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ContainerRecordMainApi.deleteContainerRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}
-}
+
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -260,13 +141,8 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if(businessType.value = 'InitialContainerManage'){
-      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }else {
-      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }
+    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     loadDone()
@@ -278,7 +154,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value':searchType.value
+    'value':'MOVE'
   }
   if (!Array.isArray(searchData.filters)) {
     searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts
index 8b65a711b..b1c978291 100644
--- a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/moveContainerRecordMain.data.ts
@@ -39,7 +39,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 120
@@ -180,15 +179,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
   }
 ]))
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
index 0d04831a3..8513b0510 100644
--- a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+    <Search
+      :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +16,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
-      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+      :detailAllSchemas="ContainerRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,23 +37,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
     </Table>
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="getList"
-    :rules="ContainerRecordMainRules"
-    :formAllSchemas="ContainerRecordMain.allSchemas"
-    :tableAllSchemas="ContainerRecordDetail.allSchemas"
-    :tableFormRules="ContainerRecordDetailRules"
-    :isBusiness="true"
-  />
-
    <!-- 详情 -->
    <Detail
     ref="detailRef"
@@ -67,7 +56,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './moveContainerRecordMain.data'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './returnContainerRecordMain.data'
 
 console.log(3444,ContainerRecordDetail)
 import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
@@ -86,71 +75,16 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
-// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
-const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
-console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
-const searchType = ref()
+const tableColumns = 
+ref([ ...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
 })
-
-// 判断 路由名称 进行条件过滤
-/**
- *
- */
- if ( routeName.value == 'ReturnContainerManageRecord') {
-  tableObject.params = {
+tableObject.params = {
     type:'RETURN'
-  }
-   searchType.value = 'RETURN'
-  businessType.value = 'ReturnContainerManage'
-  importFileName.value = '器具返回记录'
-} else if ( routeName.value == 'MoveContainerManageRecord') {
-  tableObject.params = {
-    type:'MOVE'
-  }
-   searchType.value = 'MOVE'
-  businessType.value = 'MoveContainerManage'
-  importFileName.value = '器具转移记录'
-} else if ( routeName.value == 'InitialContainerManageRecord') {
-  tableObject.params = {
-    type:'INITIAL',
-  }
-   searchType.value = 'INITIAL'
-  businessType.value = 'InitialContainerManage'
-  importFileName.value = '器具初始化记录'
-}
-else if ( routeName.value == 'ScrapContainerManageRecord') {
-  tableObject.params = {
-    type:'SCRAP'
-  }
-   searchType.value = 'SCRAP'
-  businessType.value = 'ScrapContainerManage'
-  importFileName.value = '器具报废记录'
-} else if ( routeName.value == 'DeliverContainerManageRecord') {
-  tableObject.params = {
-    type: 'DELIVER',
-  }
-   searchType.value = 'DELIVER'
-  businessType.value = 'DeliverContainerManage'
-  importFileName.value = '器具发运记录'
-} else if( routeName.value == 'ContainerManageRecord'){
-  businessType.value = 'ContainerManage'
-  importFileName.value = '器具管理记录'
 }
- if ( routeName.value == 'InitialContainerManageRecord') {
-  const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
-  ContainerRecordDetailAllSchemas.value.tableMainColumns = array
-   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
- }
- else {
-   ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
-   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
-}
-
+importFileName.value = '器具返回记录'
 
 
 // 字段设置 更新主列表字段
@@ -167,26 +101,11 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
-const searchList = (model)=>{
-  model.type = searchType.value
-  setSearchParams(model)
-}
-
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -201,28 +120,6 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
-    ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -233,24 +130,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
 }
 
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ContainerRecordMainApi.deleteContainerRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}
-}
+
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -260,13 +141,8 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if(businessType.value = 'InitialContainerManage'){
-      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }else {
-      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }
+    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     loadDone()
@@ -278,7 +154,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value':searchType.value
+    'value':'RETURN'
   }
   if (!Array.isArray(searchData.filters)) {
     searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/moveContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/returnContainerRecordMain.data.ts
similarity index 97%
rename from src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/moveContainerRecordMain.data.ts
rename to src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/returnContainerRecordMain.data.ts
index 8b65a711b..b1c978291 100644
--- a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/moveContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/returnContainerRecordMain.data.ts
@@ -39,7 +39,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 120
@@ -180,15 +179,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
   }
 ]))
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
index 91abaf844..8602f94c8 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+    <Search
+      :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +16,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
-      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+      :detailAllSchemas="ContainerRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,23 +37,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
     </Table>
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="getList"
-    :rules="ContainerRecordMainRules"
-    :formAllSchemas="ContainerRecordMain.allSchemas"
-    :tableAllSchemas="ContainerRecordDetail.allSchemas"
-    :tableFormRules="ContainerRecordDetailRules"
-    :isBusiness="true"
-  />
-
    <!-- 详情 -->
    <Detail
     ref="detailRef"
@@ -67,7 +56,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './initialContainerRecordMain.data'
+import { ContainerRecordMain, ContainerRecordMainRules, ContainerRecordDetail, ContainerRecordDetailRules } from './scrapContainerRecordMain.data'
 
 console.log(3444,ContainerRecordDetail)
 import * as ContainerRecordMainApi from '@/api/wms/containerRecordMain'
@@ -80,77 +69,22 @@ import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { json } from 'stream/consumers'
 const { loadStart, loadDone } = usePageLoading()
-defineOptions({ name: 'ContainerRecordMain' })
+defineOptions({ name: 'ScrapContainerManageRecord' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
-// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
-const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
-console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
-const searchType = ref()
+const tableColumns = 
+ref([ ...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
 })
-
-// 判断 路由名称 进行条件过滤
-/**
- *
- */
- if ( routeName.value == 'ReturnContainerManageRecord') {
-  tableObject.params = {
-    type:'RETURN'
-  }
-   searchType.value = 'RETURN'
-  businessType.value = 'ReturnContainerManage'
-  importFileName.value = '器具返回记录'
-} else if ( routeName.value == 'MoveContainerManageRecord') {
-  tableObject.params = {
-    type:'MOVE'
-  }
-   searchType.value = 'MOVE'
-  businessType.value = 'MoveContainerManage'
-  importFileName.value = '器具转移记录'
-} else if ( routeName.value == 'InitialContainerManageRecord') {
-  tableObject.params = {
-    type:'INITIAL',
-  }
-   searchType.value = 'INITIAL'
-  businessType.value = 'InitialContainerManage'
-  importFileName.value = '器具初始化记录'
-}
-else if ( routeName.value == 'ScrapContainerManageRecord') {
-  tableObject.params = {
+tableObject.params = {
     type:'SCRAP'
-  }
-   searchType.value = 'SCRAP'
-  businessType.value = 'ScrapContainerManage'
-  importFileName.value = '器具报废记录'
-} else if ( routeName.value == 'DeliverContainerManageRecord') {
-  tableObject.params = {
-    type: 'DELIVER',
-  }
-   searchType.value = 'DELIVER'
-  businessType.value = 'DeliverContainerManage'
-  importFileName.value = '器具发运记录'
-} else if( routeName.value == 'ContainerManageRecord'){
-  businessType.value = 'ContainerManage'
-  importFileName.value = '器具管理记录'
 }
- if ( routeName.value == 'InitialContainerManageRecord') {
-  const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
-  ContainerRecordDetailAllSchemas.value.tableMainColumns = array
-   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
- }
- else {
-   ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
-   tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
-}
-
+importFileName.value = '器具报废记录'
 
 
 // 字段设置 更新主列表字段
@@ -162,31 +96,15 @@ const updataTableColumns = (val) => {
 const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
   defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
-const searchList = (model)=>{
-  model.type = searchType.value
-  setSearchParams(model)
-}
-
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -201,28 +119,6 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
-    ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -233,24 +129,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
 }
 
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ContainerRecordMainApi.deleteContainerRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}
-}
+
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -260,13 +140,8 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if(businessType.value = 'InitialContainerManage'){
-      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }else {
-      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }
+    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     loadDone()
@@ -278,7 +153,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value':searchType.value
+    'value':'SCRAP'
   }
   if (!Array.isArray(searchData.filters)) {
     searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
index 8b65a711b..b1c978291 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
@@ -39,7 +39,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 120
@@ -180,15 +179,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     }
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
   }
 ]))
 

From 7e06d4c5dfd0f8c9ad50527d00bfd6a90b02f978 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Thu, 31 Oct 2024 10:01:03 +0800
Subject: [PATCH 015/225] =?UTF-8?q?HL-6311=20=E5=99=A8=E5=85=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/containerRecordMain/index.ts      |  63 ++++++++-
 .../createContainerRecordMain.data.ts         |  10 +-
 .../createContainerRecordMain/index.vue       |   2 +-
 .../deliverContainerRecordMain.data.ts        |   2 +-
 .../deliverContainerRecordMain/index.vue      | 126 +++---------------
 .../initialContainerRecordMain/index.vue      |   2 +-
 .../initialContainerRecordMain.data.ts        |  10 +-
 .../moveContainerRecordMain/index.vue         |   2 +-
 .../returnContainerRecordMain/index.vue       |   2 +-
 .../scrapContainerRecordMain/index.vue        |   2 +-
 .../scrapContainerRecordMain.data.ts          |  12 +-
 11 files changed, 101 insertions(+), 132 deletions(-)

diff --git a/src/api/wms/containerRecordMain/index.ts b/src/api/wms/containerRecordMain/index.ts
index 044e9d8ba..3fe4f2c53 100644
--- a/src/api/wms/containerRecordMain/index.ts
+++ b/src/api/wms/containerRecordMain/index.ts
@@ -58,7 +58,8 @@ export const exportContainerRecordMain = async (params) => {
 }
 
 // 导出器具管理初始化记录主 Excel
-export const exportContainerInitRecordMain = async (params) => {
+export const exportContainerInitialRecordMain = async (params) => {
+      params.businessType = 'InitialContainerManage'
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
@@ -68,6 +69,66 @@ export const exportContainerInitRecordMain = async (params) => {
   }
 }
 
+// 导出器具管理创建记录主 Excel
+export const exportContainerCreateRecordMain = async (params) => {
+    params.businessType = 'CreateContainerManage'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.downloadPost({ url: '/wms/container-record-main/export-excel-init-senior', data })
+  } else {
+    return await request.download({ url: `/wms/container-record-main/export-excel-init`, params })
+  }
+}
+
+// 导出器具管理返回记录主 Excel
+export const exportContainerReturnRecordMain = async (params) => {
+  params.businessType = 'CreateContainerManage'
+if (params.isSearch) {
+delete params.isSearch
+const data = { ...params }
+return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data })
+} else {
+return await request.download({ url: `/wms/container-record-main/export-excel`, params })
+}
+}
+
+// 导出器具管理移动记录主 Excel
+export const exportContainerMoveRecordMain = async (params) => {
+  params.businessType = 'MoveContainerManage'
+if (params.isSearch) {
+delete params.isSearch
+const data = { ...params }
+return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data })
+} else {
+return await request.download({ url: `/wms/container-record-main/export-excel`, params })
+}
+}
+
+// 导出器具管理报废记录主 Excel
+export const exportContainerScrapRecordMain = async (params) => {
+  params.businessType = 'ScrapContainerManage'
+if (params.isSearch) {
+delete params.isSearch
+const data = { ...params }
+return await request.downloadPost({ url: '/wms/container-record-main/export-excel-scrap-senior', data })
+} else {
+return await request.download({ url: `/wms/container-record-main/export-excel-scrap`, params })
+}
+}
+
+// 导出器具管理发运记录主 Excel
+export const exportContainerDeliverRecordMain = async (params) => {
+  params.businessType = 'DeliverContainerManage'
+if (params.isSearch) {
+delete params.isSearch
+const data = { ...params }
+return await request.downloadPost({ url: '/wms/container-record-main/export-excel-init-senior', data })
+} else {
+return await request.download({ url: `/wms/container-record-main/export-excel-init`, params })
+}
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/container-record-main/get-import-template' })
diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
index fced84e20..8c168ccb5 100644
--- a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
@@ -232,11 +232,11 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'containerNumber',
     sort: 'custom'
   },
-  {
-    label: '来源库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-  },
+  // {
+  //   label: '来源库位代码',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  // },
   {
     label: '目标库位代码',
     field: 'toLocationCode',
diff --git a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
index 571136246..5d482ed10 100644
--- a/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
@@ -141,7 +141,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    const data = await ContainerRecordMainApi.exportContainerCreateRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
diff --git a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
index 8b65a711b..ab4b00f7d 100644
--- a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
@@ -39,7 +39,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     table: {
       width: 120
diff --git a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue
index 75f0171f2..96e5efbe4 100644
--- a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue
@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
+    <Search
+      :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,7 +16,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
-      :detailAllSchemas="ContainerRecordDetailAllSchemas"
+      :detailAllSchemas="ContainerRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,23 +37,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template>
     </Table>
   </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="getList"
-    :rules="ContainerRecordMainRules"
-    :formAllSchemas="ContainerRecordMain.allSchemas"
-    :tableAllSchemas="ContainerRecordDetail.allSchemas"
-    :tableFormRules="ContainerRecordDetailRules"
-    :isBusiness="true"
-  />
-
    <!-- 详情 -->
    <Detail
     ref="detailRef"
@@ -86,39 +75,16 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
-// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
-const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
-console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
-const searchType = ref()
+const tableColumns = 
+ref([ ...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口
 })
-
-// 判断 路由名称 进行条件过滤
-/**
- *
- */
-// if ( routeName.value == 'InitialContainerManageRecord') {
-//   tableObject.params = {
-//     type:'INITIAL',
-//   }
-//    searchType.value = 'INITIAL'
-//   businessType.value = 'InitialContainerManage'
-//   importFileName.value = '器具初始化记录'
-// }
-//  if ( routeName.value == 'InitialContainerManageRecord') {
-//   const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
-//   ContainerRecordDetailAllSchemas.value.tableMainColumns = array
-//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
-//  }
-//  else {
-//    ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
-//    tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
-// }
-
+tableObject.params = {
+    type:'DELIVER'
+}
+importFileName.value = '器具发运记录'
 
 
 // 字段设置 更新主列表字段
@@ -135,26 +101,11 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
-const searchList = (model)=>{
-  model.type = searchType.value
-  setSearchParams(model)
-}
-
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -169,28 +120,6 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
-// 列表-操作按钮
-const butttondata = (row,$index) => {
-const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-        // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除
-    ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -201,24 +130,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
 }
 
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ContainerRecordMainApi.deleteContainerRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}
-}
+
 
 /** 导出按钮操作 */
 const handleExport = async () => {
@@ -228,13 +141,8 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if(businessType.value = 'InitialContainerManage'){
-      const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }else {
-      const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }
+    const data = await ContainerRecordMainApi.exportContainerDeliverRecordMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     loadDone()
@@ -246,7 +154,7 @@ const searchFormClick = (searchData) => {
   const cmd = {
     'column':'type',
     'action':'==',
-    'value': 'CREATE'
+    'value':'DELIVER'
   }
   if (!Array.isArray(searchData.filters)) {
     searchData.filters = [];
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
index c8a01b99a..d4250529d 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
@@ -141,7 +141,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    const data = await ContainerRecordMainApi.exportContainerInitialRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
index 3cdb48b7e..2e7b5acec 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
@@ -224,11 +224,11 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'containerNumber',
     sort: 'custom'
   },
-  {
-    label: '来源库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-  },
+  // {
+  //   label: '来源库位代码',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  // },
   {
     label: '目标库位代码',
     field: 'toLocationCode',
diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
index 922e87f07..8148eb19d 100644
--- a/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
@@ -141,7 +141,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    const data = await ContainerRecordMainApi.exportContainerMoveRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
index 8513b0510..ab0bb9633 100644
--- a/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
@@ -141,7 +141,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    const data = await ContainerRecordMainApi.exportContainerReturnRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
index 8602f94c8..f890fbc6a 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
@@ -140,7 +140,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
+    const data = await ContainerRecordMainApi.exportContainerScrapRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
index b1c978291..581cb1d1f 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts
@@ -228,13 +228,13 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromLocationCode',
     sort: 'custom',
   },
+  // {
+  //   label: '目标库位代码',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  // },
   {
-    label: '目标库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-  },
-  {
-    label: '到数量',
+    label: '数量',
     field: 'toQty',
     sort: 'custom',
   },

From 32f91571e467d8fce7992b1660e1037d1d81e94d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 31 Oct 2024 10:55:15 +0800
Subject: [PATCH 016/225] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                                |  1 +
 src/locales/zh-CN.ts                                |  1 +
 src/utils/disposition/defaultButtons.ts             | 13 ++++++++++++-
 .../purchasereceiptJobMain/index.vue                |  6 +++++-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 9d4a6b2c2..3d295d2cb 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -871,6 +871,7 @@ export default {
     新增:'Add',
     导入:'Import',
     导出:'Export',
+    更新任务设置:'UpdatingTaskSettings',
     刷新:'Refresh',
     筛选:'Filter',
     选择当页:'As Page',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index dc482ff9c..5e531dc5f 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -873,6 +873,7 @@ export default {
     新增:'新增',
     导入:'导入',
     导出:'导出',
+    更新任务设置:'更新任务设置',
     刷新:'刷新',
     筛选:'筛选',
     选择当页:'选择当页',
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 73b968041..e693de83d 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -68,7 +68,18 @@ export function defaultExportTableBtn(option: any) {
     hasPermi: ''
   })
 }
-
+// 导出按钮
+export function defaultUpdateTaskSettingBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.更新任务设置`).replace('ts.', ''),
+    name: 'updateTaskSetting',
+    hide: false,
+    type: 'warning',
+    icon: 'ep:refresh',
+    color: '',
+    hasPermi: ''
+  })
+}
 
 // 字段设置
 // export function defaultFieldSettingBtn(option:any) {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 82a8384bd..7e379b968 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -176,7 +176,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
+defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
+defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -186,6 +187,9 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 20ee40b2a6a8643c59a978f0fde5036ea4c0dd47 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 31 Oct 2024 11:43:08 +0800
Subject: [PATCH 017/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereceiptJobMain/index.ts           |  5 +++++
 .../purchasereceipt/purchasereceiptJobMain/index.vue  | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts
index 79e546090..0a7b2fcf8 100644
--- a/src/api/wms/purchasereceiptJobMain/index.ts
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@@ -139,3 +139,8 @@ export const acceptPurchasereceiptJobMain = (id: number) => {
 export const refusalPurchasereceiptJobMain = (data) => {
   return request.post({ url: '/wms/purchasereceipt-job-main/refusal',data})
 }
+
+// 更新任务配置
+export const updatePurchasereceiptJobConfig = () => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/updatePurchasereceiptJobConfig'})
+}
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 7e379b968..a8136d188 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -189,7 +189,16 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   }else if(val == 'updateTaskSetting'){
     // 更新任务设置
-
+      try {
+      // loading开始
+      loadStart()
+      PurchasereceiptJobMainApi.updatePurchasereceiptJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 3f02b74432459a9aec303304c3a8095fb62c8433 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 31 Oct 2024 13:31:48 +0800
Subject: [PATCH 018/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereceiptJobMain/index.ts       |  5 +++++
 .../purchasereceiptJobMain/index.vue              |  4 ++--
 .../sparereceipt/sparereceiptJobMain/index.vue    | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts
index 0a7b2fcf8..f024ded64 100644
--- a/src/api/wms/purchasereceiptJobMain/index.ts
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@@ -143,4 +143,9 @@ export const refusalPurchasereceiptJobMain = (data) => {
 // 更新任务配置
 export const updatePurchasereceiptJobConfig = () => {
   return request.put({ url: '/wms/purchasereceipt-job-main/updatePurchasereceiptJobConfig'})
+}
+
+// 维修备件更新任务配置
+export const updatePurchasereceiptJobConfigSpare = () => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/updatePurchasereceiptJobConfigSpare'})
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index a8136d188..16b901b6a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -176,8 +176,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
-defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index ae96d00d7..52732514f 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -142,6 +142,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -151,7 +152,19 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      PurchasereceiptJobMainApi.updatePurchasereceiptJobConfigSpare()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
+  }else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
         filters: tableObject.params.filters

From 4ba18d2770bd4a0c93488e3391e2858564c3989c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 31 Oct 2024 14:13:29 +0800
Subject: [PATCH 019/225] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0=E6=83=85=E5=86=B5=EF=BC=8C=E5=88=B0=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=BA0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorychange/inventorychangeRequestMain/index.vue  | 8 ++++----
 .../inventorychangeRequestMain.data.ts                    | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 22977da05..b180eb5ec 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -453,10 +453,10 @@ const submitForm = async (formType, submitData) => {
     message.warning('请选择到库存状态')
     return
   }
-  if(tableData.value.find(item=>!item.toQty||item.toQty==0)){
-    message.warning('请填写到数量')
-    return
-  }
+  // if(tableData.value.find(item=>!item.toQty||item.toQty==0)){
+  //   message.warning('请填写到数量')
+  //   return
+  // }
   if(tableData.value.find(item=>!item.toExpireDate)){
     message.warning('请选择到过期日期')
     return
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 3de351704..cf4f0901c 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -565,14 +565,12 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       component: 'InputNumber',
       componentProps: {
         disabled:true,
-        min:0,
         precision: 6
       }
     },
     tableForm: {
       disabled:true,
       type: 'InputNumber',
-      min:0,
       precision: 6
     },
   },

From 87c4678421b87e94717e9a5397e44acba2aebc48 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 31 Oct 2024 15:44:18 +0800
Subject: [PATCH 020/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereturnJobMain/index.ts          |  5 +++++
 .../purchasereturn/purchasereturnJobMain/index.vue  | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts
index d452888a3..1e5a4a5ce 100644
--- a/src/api/wms/purchasereturnJobMain/index.ts
+++ b/src/api/wms/purchasereturnJobMain/index.ts
@@ -106,3 +106,8 @@ export const acceptPurchasereturnJobMain = (id: number) => {
 export const abandonPurchasereturnJobMain = (id: number) => {
   return request.put({ url: '/wms/purchasereturn-job-main/abandon?id=' + id })
 }
+
+// 更新任务配置
+export const updatePurchasereturnJobConfig = () => {
+  return request.put({ url: '/wms/purchasereceipt-job-main/updatePurchasereturnJobConfig'})
+}
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 8facc3d1b..6a2e19a37 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -141,6 +141,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -158,6 +159,18 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      PurchasereturnJobMainApi.updatePurchasereturnJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 5e2137918d087f8c97bb01565b8d37d383543530 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 31 Oct 2024 16:04:36 +0800
Subject: [PATCH 021/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/putawayJobMain/index.ts                 |  5 +++++
 .../putaway/putawayJobMain/index.vue                | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts
index b6fb266d8..3b3c1a496 100644
--- a/src/api/wms/putawayJobMain/index.ts
+++ b/src/api/wms/putawayJobMain/index.ts
@@ -101,3 +101,8 @@ export const acceptPutawayJobMain = (id: number) => {
 export const abandonPutawayJobMain = (id: number) => {
   return request.put({ url: '/wms/putaway-job-main/abandon?id=' + id })
 }
+
+// 更新任务配置
+export const updatePutawayJobMConfig = () => {
+  return request.put({ url: '/wms/putaway-job-main/updatePutawayJobConfig'})
+}
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index bfaaf2038..fdde89c6b 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -170,6 +170,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-job-main:export'}), // 导出
   defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -197,6 +198,18 @@ const buttonBaseClick = (val, item) => {
     }
   } else if (val=='selection_point'){// 批量打印
     handleSelectionPoint()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      PutawayJobMainApi.updatePutawayJobMConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)

From 80b1d34eb59f8bc389a284dc552195554096edf2 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 31 Oct 2024 16:59:38 +0800
Subject: [PATCH 022/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/repleinshJobMain/index.ts               |  5 +++++
 .../repleinsh/repleinshJobMain/index.vue            | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/repleinshJobMain/index.ts b/src/api/wms/repleinshJobMain/index.ts
index 2869a7745..0485bb27b 100644
--- a/src/api/wms/repleinshJobMain/index.ts
+++ b/src/api/wms/repleinshJobMain/index.ts
@@ -103,4 +103,9 @@ export const closeRepleinshMain = async (id) => {
 // 执行发料任务
 export const executeRepleinshMain = async (data) => {
   return await request.put({ url: `/wms/repleinsh-job-main/execute`, data})
+}
+
+// 更新任务配置
+export const updateRepleinshJobConfig = () => {
+  return request.put({ url: '/wms/repleinsh-job-main/updateRepleinshJobConfig'})
 }
\ No newline at end of file
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
index 021c4b9f2..464eeb495 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@@ -126,6 +126,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:repleinsh-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -143,6 +144,18 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      RepleinshJobMainApi.updateRepleinshJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 82f7bf3e762a590c669c3226f813b6064bf7a8ba Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 31 Oct 2024 17:28:58 +0800
Subject: [PATCH 023/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/issueJobMain/index.ts                   |  5 ++++-
 .../wms/issueManage/issue/issueJobMain/index.vue    | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts
index 0ae3e11c7..a8b182862 100644
--- a/src/api/wms/issueJobMain/index.ts
+++ b/src/api/wms/issueJobMain/index.ts
@@ -107,4 +107,7 @@ export const executeIssueMain = async (data) => {
   return await request.put({ url: `/wms/issue-job-main/execute`, data})
 }
 
-
+// 更新任务配置
+export const updateIssueJobConfig = () => {
+  return request.put({ url: '/wms/issue-job-main/updateIssueJobConfig'})
+}
\ No newline at end of file
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 722dce117..ea9b0e4d0 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -126,6 +126,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:issue-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -143,6 +144,18 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      IssueJobMainApi.updateIssueJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 7a39ebaaa6ebf4a49eb84c040b66b54329f50ee1 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 1 Nov 2024 08:48:40 +0800
Subject: [PATCH 024/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productionreceiptJobMain/index.ts       |  5 +++++
 .../productionreceiptJobMain/index.vue              | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/productionreceiptJobMain/index.ts b/src/api/wms/productionreceiptJobMain/index.ts
index 34c3e07bf..38c5fad1e 100644
--- a/src/api/wms/productionreceiptJobMain/index.ts
+++ b/src/api/wms/productionreceiptJobMain/index.ts
@@ -105,4 +105,9 @@ export const closeIssueMain = async (id) => {
 // 执行发料任务
 export const executeIssueMain = async (data) => {
   return await request.put({ url: `/wms/productionreceipt-job-main/execute`, data})
+}
+
+// 更新任务配置
+export const updateProductionreceiptJobConfig = () => {
+  return request.put({ url: '/wms/productionreceipt-job-main/updateProductionreceiptJobConfig'})
 }
\ No newline at end of file
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index d505694c4..81e8a6603 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -118,6 +118,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -127,6 +128,18 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductionreceiptJobMainApi.updateProductionreceiptJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 0e8ff119367e392e2f96f8c800677fb0dfe66912 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 1 Nov 2024 11:02:33 +0800
Subject: [PATCH 025/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-4998=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productionreturnJobMain/index.ts  | 10 +++++++++
 .../productionreturnJobMain/index.vue         | 22 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/api/wms/productionreturnJobMain/index.ts b/src/api/wms/productionreturnJobMain/index.ts
index 74bd69d6f..f4e9e2c43 100644
--- a/src/api/wms/productionreturnJobMain/index.ts
+++ b/src/api/wms/productionreturnJobMain/index.ts
@@ -125,4 +125,14 @@ export const closeProductionreturnMain = async (id) => {
 // 执行发料任务
 export const executeProductionreturnMain = async (data) => {
   return await request.put({ url: `/wms/productionreturn-job-main/execute`, data})
+}
+
+// 更新任务配置
+export const updateProductionreturnJobConfig = () => {
+  return request.put({ url: '/wms/productionreturn-job-main/updateProductionreturnJobConfig'})
+}
+
+// 更新任务配置-隔离收货任务
+export const updateProductionreturnJobHoldConfig = () => {
+  return request.put({ url: '/wms/productionreturn-job-main/updateProductionreturnJobHoldConfig'})
 }
\ No newline at end of file
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 3296a5f13..88cbd7310 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -129,6 +129,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -138,6 +139,27 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      console.log(routeName.value)
+      if('ProductionreturnJobMain'==routeName.value){
+        // 生产退料任务更新配置
+        ProductionreturnJobMainApi.updateProductionreturnJobConfig()
+        buttonBaseClick('refresh',null)
+        message.success(t('更新成功'))
+      }else{
+        // 隔离退料任务更新配置
+        ProductionreturnJobMainApi.updateProductionreturnJobHoldConfig()
+        buttonBaseClick('refresh',null)
+        message.success(t('更新成功'))
+      }
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 32fc3b016cd84ef52b09133741d968852c49a886 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 1 Nov 2024 11:54:33 +0800
Subject: [PATCH 026/225] =?UTF-8?q?HL-6348=E5=88=B0=E5=BA=93=E5=8C=BA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index 65c83c25e..4f22e1155 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -836,7 +836,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   // },
   {
     label: '到库区',
-    field: 'toAreaCodes',
+    field: 'toAreaCode',
     sort: 'custom',
     table: {
       width: 150

From 256017712803e9af95f68b0e890ced9bb085f037 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 1 Nov 2024 13:15:37 +0800
Subject: [PATCH 027/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6349=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRecordMOrderTypeMain.data.ts            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
index ed6c01452..eb8575ff4 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts
@@ -638,6 +638,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
       width: 150
     },
     sortTableDefault: 1009,
+    isTable:false,
     hiddenInMain: true
   },
   // {
@@ -658,6 +659,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
       width: 150
     },
     sortTableDefault: 1010,
+    isTable:false,
     hiddenInMain: true
   },
   // {
@@ -678,6 +680,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
       width: 150
     },
     sortTableDefault: 1010,
+    isTable:false,
     hiddenInMain: true
   },
   // {
@@ -698,6 +701,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
       width: 150
     },
     sortTableDefault: 1010,
+    isTable:false,
     hiddenInMain: true
   },
   {
@@ -708,6 +712,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
       width: 150
     },
     sortTableDefault: 1010,
+    isTable:false,
     hiddenInMain: true
   },
   {
@@ -825,6 +830,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
     sortTableDefault: 1006,
     form: {
@@ -838,6 +844,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain:true,
     sortTableDefault: 1006,
     form: {
@@ -851,6 +858,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive<Crud
     table: {
       width: 150
     },
+    isTable:false,
     sortTableDefault: 1011,
     hiddenInMain: true
   },

From 3e15e46d5741d8bed50b07ce2808a9457daf3777 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 1 Nov 2024 13:54:39 +0800
Subject: [PATCH 028/225] =?UTF-8?q?HL-6334SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E8=B4=A6=E5=8F=B7=E5=BF=98=E8=AE=B0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=9B=B4=E6=94=B9=E5=AF=B9=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=9A=84=E6=A0=B7=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/forgetPassword.vue | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/views/login/forgetPassword.vue b/src/views/login/forgetPassword.vue
index 8655c75fa..1e01aa8bf 100644
--- a/src/views/login/forgetPassword.vue
+++ b/src/views/login/forgetPassword.vue
@@ -10,6 +10,20 @@
     >
       <div class="title">{{ t('ts.忘记密码') }}</div>
       <el-row type="flex" justify="center" align="middle">
+        <el-col>
+          <el-form-item v-if="tenantEnable === 'true'" prop="tenantName">
+          <!-- <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
+            :prefix-icon="iconHouse" link type="primary" /> -->
+          <el-select v-model="loginData.tenantName" :placeholder="t('login.tenantNamePlaceholder')"  :prefix-icon="iconHouse">
+            <el-option
+              v-for="item in tenantArray"
+              :key="item"
+              :label="t(`ts.${item.aliasName}`).replace('ts.','')"
+              :value="item.name"
+            />
+          </el-select>
+        </el-form-item>
+        </el-col>
         <el-col>
           <el-form-item :label="t('ts.用户名')" prop="username" align="center">
             <el-input v-model="loginData.username" :placeholder="t('ts.请输入用户名')" />
@@ -39,6 +53,10 @@ import { setTenantId, setToken } from '@/utils/auth'
 import { usePermissionStore } from '@/store/modules/permission'
 import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login'
 import * as UserApi from '@/api/system/user'
+import { getTenant } from '@/utils/systemParam'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
+const language = wsCache.get('lang')
 
 const { t } = useI18n()
 const message = useMessage()
@@ -53,7 +71,21 @@ const rules = {
   email: [{ required: true, message: '请输入邮箱', trigger: 'blur' }]
 }
 
+const tenantEnable = import.meta.env.VITE_APP_TENANT_ENABLE
+const tenantArray = ref(JSON.parse(getTenant()))
+if('en-US'==language){
+  tenantArray.value = tenantArray.value.map(item => ({
+    name: item,
+    aliasName:item.replace('长春','ChangChun').replace('成都','ChengDu')
+  }));
+}else{
+  tenantArray.value = tenantArray.value.map(item => ({
+    name: item,
+    aliasName:item
+  }));
+}
 const loginData = reactive({
+  tenantName: tenantArray.value[0].name,
   username: '',
   email: ''
 })

From 22413fd3fc345265544d4a08d71660f8ce456204 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 1 Nov 2024 15:39:24 +0800
Subject: [PATCH 029/225] =?UTF-8?q?index=E5=88=86=E6=94=AF=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.wyf | 78 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 69 insertions(+), 9 deletions(-)

diff --git a/.env.wyf b/.env.wyf
index b6100e378..2fa7437f1 100644
--- a/.env.wyf
+++ b/.env.wyf
@@ -3,19 +3,70 @@ NODE_ENV=test
 
 VITE_DEV=false
 
+# # 达明
+# # # 请求路径
+# VITE_BASE_URL='http://192.168.0.105:12080'
+# # 上传路径
+# VITE_UPLOAD_URL='http://192.168.0.105:12080/admin-api/infra/file/upload'
+
+# 大哥
 # # 请求路径
-# VITE_BASE_URL='http://192.168.0.113:12080'
+# VITE_BASE_URL='http://192.168.1.252:12080'
+# # 上传路径
+# VITE_UPLOAD_URL='http://192.168.1.252:12080/admin-api/infra/file/upload'
+
+# # 雪冰
+# # # 请求路径
+# VITE_BASE_URL='http://192.168.1.68:12080'
 # # 上传路径
-# VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload'
+# VITE_UPLOAD_URL='http://192.168.1.68:12080/admin-api/infra/file/upload'
+# # 依然
+# # # 请求路径
+# VITE_BASE_URL='http://192.168.1.253:12080'
+# # 上传路径
+# VITE_UPLOAD_URL='http://192.168.1.253:12080/admin-api/infra/file/upload'
+
+# # 国强
 # # 请求路径
-# VITE_BASE_URL='https://scp.faway-hella.com/api'
+# VITE_BASE_URL='http://192.168.0.106:12080'
+# # 上传路径
+# VITE_UPLOAD_URL='http:// 192.168.0.106:12080/admin-api/infra/file/upload'
+
+
+
+
+# 佳兴
+# # # 请求路径
+# VITE_BASE_URL='http://192.168.1.254:12080'
+# # 上传路径
+# VITE_UPLOAD_URL='http://192.168.1.254:12080/admin-api/infra/file/upload'
+
+# # zb
+# VITE_BASE_URL='http://192.168.0.37:12080'
 # # 上传路径
-# VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload'
+# VITE_UPLOAD_URL='http://192.168.0.37:12080/admin-api/infra/file/upload'
 
-# 请求路径
-VITE_BASE_URL='http://172.21.32.13/api'
+# 81 WMS请求路径 82 SCP
+VITE_BASE_URL='http://172.22.32.9/api'
 # 上传路径
-VITE_UPLOAD_URL='http://172.21.32.13/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload'
+
+
+
+# # 81 WMS请求路径 82 SCP
+# VITE_BASE_URL='http://172.21.32.14/api'
+# # 上传路径
+# VITE_UPLOAD_URL='http://172.21.32.14/api/admin-api/infra/file/upload'
+
+# # 请求路径
+# VITE_BASE_URL='https://scptest.faway-hella.com/api'
+# # 上传路径
+# VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload'
+
+# # 请求路径
+# VITE_BASE_URL='http://172.21.32.13/api'
+# # 上传路径
+# VITE_UPLOAD_URL='http://172.21.32.13/api/admin-api/infra/file/upload'
 
 
 # # 请求路径
@@ -55,10 +106,19 @@ VITE_OUT_DIR=sfms3.0
 VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080'
+VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'
 
 # 租户配置
 VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
-VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
+VITE_REPORT_URL = 'http://localhost'
+
+# 登录系统升级的提示
+VITE_SYSTERM_UPDATE_ALERT = false
+
+# 是否需要验证码
+VITE_NEED_CODE = false
+
+# 是否需要下载PDA链接
+VITE_PDA_URL = true
\ No newline at end of file

From fe38fcd1dabb5fd5e5b06822613397c1cc39cede Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 1 Nov 2024 16:47:05 +0800
Subject: [PATCH 030/225] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/transactionBalancePackage/index.ts    |  55 ++++
 .../transactionBalancePackage/index.vue       | 244 ++++++++++++++++++
 .../transactionBalancePackage.data.ts         | 111 ++++++++
 3 files changed, 410 insertions(+)
 create mode 100644 src/api/wms/transactionBalancePackage/index.ts
 create mode 100644 src/views/wms/reconciliation/transactionBalancePackage/index.vue
 create mode 100644 src/views/wms/reconciliation/transactionBalancePackage/transactionBalancePackage.data.ts

diff --git a/src/api/wms/transactionBalancePackage/index.ts b/src/api/wms/transactionBalancePackage/index.ts
new file mode 100644
index 000000000..4711c9be1
--- /dev/null
+++ b/src/api/wms/transactionBalancePackage/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+export interface TransactionBalancePackageVO {
+  id: number
+  packingNumber: string
+  itemCode: string
+  batch: string
+  locationCode: string
+  inventoryStatusTransaction: string
+  inventoryStatusBalance: string
+  qtyTransaction: number
+  qtyBalance: number
+  qtyDiff: number
+}
+
+// 查询对账_包装号的事务汇总与余额的差异列表
+export const getTransactionBalancePackagePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transaction-balance-package/senior', data })
+  } else {
+    return await request.get({ url: `/wms/transaction-balance-package/page`, params })
+  }
+}
+
+// 查询对账_包装号的事务汇总与余额的差异详情
+export const getTransactionBalancePackage = async (id: number) => {
+  return await request.get({ url: `/wms/transaction-balance-package/get?id=` + id })
+}
+
+// 新增对账_包装号的事务汇总与余额的差异
+export const createTransactionBalancePackage = async (data: TransactionBalancePackageVO) => {
+  return await request.post({ url: `/wms/transaction-balance-package/create`, data })
+}
+
+// 修改对账_包装号的事务汇总与余额的差异
+export const updateTransactionBalancePackage = async (data: TransactionBalancePackageVO) => {
+  return await request.put({ url: `/wms/transaction-balance-package/update`, data })
+}
+
+// 删除对账_包装号的事务汇总与余额的差异
+export const deleteTransactionBalancePackage = async (id: number) => {
+  return await request.delete({ url: `/wms/transaction-balance-package/delete?id=` + id })
+}
+
+// 导出对账_包装号的事务汇总与余额的差异 Excel
+export const exportTransactionBalancePackage = async (params) => {
+  return await request.download({ url: `/wms/transaction-balance-package/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/transaction-balance-package/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/reconciliation/transactionBalancePackage/index.vue b/src/views/wms/reconciliation/transactionBalancePackage/index.vue
new file mode 100644
index 000000000..43f927dac
--- /dev/null
+++ b/src/views/wms/reconciliation/transactionBalancePackage/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TransactionBalancePackage.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TransactionBalancePackage.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="TransactionBalancePackageRules"
+    :formAllSchemas="TransactionBalancePackage.allSchemas"
+    :apiUpdate="TransactionBalancePackageApi.updateTransactionBalancePackage"
+    :apiCreate="TransactionBalancePackageApi.createTransactionBalancePackage"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="TransactionBalancePackage.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/transaction-balance-package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TransactionBalancePackage,TransactionBalancePackageRules } from './transactionBalancePackage.data'
+import * as TransactionBalancePackageApi from '@/api/wms/transactionBalancePackage'
+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'
+
+defineOptions({ name: 'TransactionBalancePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TransactionBalancePackage.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransactionBalancePackageApi.getTransactionBalancePackagePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:transactionBalancePackage:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:transactionBalancePackage:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:transactionBalancePackage:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:transactionBalancePackage:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:transactionBalancePackage:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =TransactionBalancePackage.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await TransactionBalancePackageApi.createTransactionBalancePackage(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await TransactionBalancePackageApi.updateTransactionBalancePackage(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicTransactionBalancePackage')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TransactionBalancePackageApi.deleteTransactionBalancePackage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TransactionBalancePackageApi.exportTransactionBalancePackage(tableObject.params)
+    download.excel(data, '对账_包装号的事务汇总与余额的差异.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '对账_包装号的事务汇总与余额的差异导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await TransactionBalancePackageApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/reconciliation/transactionBalancePackage/transactionBalancePackage.data.ts b/src/views/wms/reconciliation/transactionBalancePackage/transactionBalancePackage.data.ts
new file mode 100644
index 000000000..d452f749f
--- /dev/null
+++ b/src/views/wms/reconciliation/transactionBalancePackage/transactionBalancePackage.data.ts
@@ -0,0 +1,111 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const TransactionBalancePackageRules = reactive({
+  itemCode: [required],
+  batch: [required],
+  inventoryStatusTransaction: [required],
+  inventoryStatusBalance: [required],
+})
+
+export const TransactionBalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 220,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    }
+  },
+  {
+    label: '库存状态-库存事务',
+    field: 'inventoryStatusTransaction',
+    sort: 'custom',
+    table: {
+      width: 220,
+    }
+  },
+  {
+    label: '库存状态-库存余额',
+    field: 'inventoryStatusBalance',
+    sort: 'custom',
+    table: {
+      width: 220,
+    }
+  },
+  {
+    label: '数量-库存事务',
+    field: 'qtyTransaction',
+    sort: 'custom',
+    table: {
+      width: 220,
+    }
+  },
+  {
+    label: '数量-库存余额',
+    field: 'qtyBalance',
+    sort: 'custom',
+    table: {
+      width: 220,
+    }
+  },
+  {
+    label: '数量-差值(事务-余额)',
+    field: 'qtyDiff',
+    sort: 'custom',
+    table: {
+      width: 220,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    table: {
+      width: 220,
+    },
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  }
+]))

From 477f189d99fd5ae603d5f6d7c2ec71812df97322 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 3 Nov 2024 14:16:15 +0800
Subject: [PATCH 031/225] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=AF=B9=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/notPackageTransactionBalance/index.ts |  54 ++++
 .../notPackageTransactionBalance/index.vue    | 244 ++++++++++++++++++
 .../notPackageTransactionBalance.data.ts      |  81 ++++++
 3 files changed, 379 insertions(+)
 create mode 100644 src/api/wms/notPackageTransactionBalance/index.ts
 create mode 100644 src/views/wms/reconciliation/notPackageTransactionBalance/index.vue
 create mode 100644 src/views/wms/reconciliation/notPackageTransactionBalance/notPackageTransactionBalance.data.ts

diff --git a/src/api/wms/notPackageTransactionBalance/index.ts b/src/api/wms/notPackageTransactionBalance/index.ts
new file mode 100644
index 000000000..8cf84cfa6
--- /dev/null
+++ b/src/api/wms/notPackageTransactionBalance/index.ts
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface NotPackageTransactionBalanceVO {
+  id: number
+  itemCode: string
+  locationCode: string
+  batch: string
+  cnt: string
+  sumQtyTransaction: number
+  sumQtyBalance: number
+  differenceQty: number
+  remark: string
+}
+
+// 查询对账_无包装事务余额对数结果列表
+export const getNotPackageTransactionBalancePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/not-package-transaction-balance/senior', data })
+  } else {
+    return await request.get({ url: `/wms/not-package-transaction-balance/page`, params })
+  }
+}
+
+// 查询对账_无包装事务余额对数结果详情
+export const getNotPackageTransactionBalance = async (id: number) => {
+  return await request.get({ url: `/wms/not-package-transaction-balance/get?id=` + id })
+}
+
+// 新增对账_无包装事务余额对数结果
+export const createNotPackageTransactionBalance = async (data: NotPackageTransactionBalanceVO) => {
+  return await request.post({ url: `/wms/not-package-transaction-balance/create`, data })
+}
+
+// 修改对账_无包装事务余额对数结果
+export const updateNotPackageTransactionBalance = async (data: NotPackageTransactionBalanceVO) => {
+  return await request.put({ url: `/wms/not-package-transaction-balance/update`, data })
+}
+
+// 删除对账_无包装事务余额对数结果
+export const deleteNotPackageTransactionBalance = async (id: number) => {
+  return await request.delete({ url: `/wms/not-package-transaction-balance/delete?id=` + id })
+}
+
+// 导出对账_无包装事务余额对数结果 Excel
+export const exportNotPackageTransactionBalance = async (params) => {
+  return await request.download({ url: `/wms/not-package-transaction-balance/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/not-package-transaction-balance/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/reconciliation/notPackageTransactionBalance/index.vue b/src/views/wms/reconciliation/notPackageTransactionBalance/index.vue
new file mode 100644
index 000000000..abed9f225
--- /dev/null
+++ b/src/views/wms/reconciliation/notPackageTransactionBalance/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="NotPackageTransactionBalance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="NotPackageTransactionBalance.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="NotPackageTransactionBalanceRules"
+    :formAllSchemas="NotPackageTransactionBalance.allSchemas"
+    :apiUpdate="NotPackageTransactionBalanceApi.updateNotPackageTransactionBalance"
+    :apiCreate="NotPackageTransactionBalanceApi.createNotPackageTransactionBalance"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="NotPackageTransactionBalance.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/not-package-transaction-balance/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { NotPackageTransactionBalance,NotPackageTransactionBalanceRules } from './notPackageTransactionBalance.data'
+import * as NotPackageTransactionBalanceApi from '@/api/wms/notPackageTransactionBalance'
+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'
+
+defineOptions({ name: 'NotPackageTransactionBalance' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(NotPackageTransactionBalance.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: NotPackageTransactionBalanceApi.getNotPackageTransactionBalancePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  //defaultButtons.defaultAddBtn({hasPermi:'wms:notPackageTransactionBalance:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'wms:notPackageTransactionBalance:import'}), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:notPackageTransactionBalance:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:notPackageTransactionBalance:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =NotPackageTransactionBalance.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await NotPackageTransactionBalanceApi.createNotPackageTransactionBalance(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await NotPackageTransactionBalanceApi.updateNotPackageTransactionBalance(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicNotPackageTransactionBalance')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await NotPackageTransactionBalanceApi.deleteNotPackageTransactionBalance(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await NotPackageTransactionBalanceApi.exportNotPackageTransactionBalance(tableObject.params)
+    download.excel(data, '对账_无包装事务余额对数结果.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '对账_无包装事务余额对数结果导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await NotPackageTransactionBalanceApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/reconciliation/notPackageTransactionBalance/notPackageTransactionBalance.data.ts b/src/views/wms/reconciliation/notPackageTransactionBalance/notPackageTransactionBalance.data.ts
new file mode 100644
index 000000000..349165076
--- /dev/null
+++ b/src/views/wms/reconciliation/notPackageTransactionBalance/notPackageTransactionBalance.data.ts
@@ -0,0 +1,81 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const NotPackageTransactionBalanceRules = reactive({
+})
+
+export const NotPackageTransactionBalance = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: 'id',
+  //   field: 'id',
+  //   sort: 'custom',
+  //   isTable: false,
+  //   isForm: false,
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+  },
+  {
+    label: '数量',
+    field: 'cnt',
+    sort: 'custom',
+  },
+  {
+    label: '数量合计-库存事务',
+    field: 'sumQtyTransaction',
+    sort: 'custom',
+  },
+  {
+    label: '数量合计-库存余额',
+    field: 'sumQtyBalance',
+    sort: 'custom',
+  },
+  {
+    label: '事务数量减余额数量',
+    field: 'differenceQty',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))

From 584cc51d87f91aafedd30dd125150a8694a30f0a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 10:11:31 +0800
Subject: [PATCH 032/225] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=8C=E9=99=90=E5=88=B6=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A612?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unplannedissueRequestMain.data.ts                      | 7 +++++++
 .../unplannedreceiptRequestMain.data.ts                    | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 57c2c5dd2..de84a8941 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -335,6 +335,13 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        type:"textarea",
+        maxlength:12,
+        showWordLimit:true
+      }
+    }
   },
   {
     label: '目的地',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index 05419185b..9b50b490a 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -545,6 +545,13 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTable:true,
+    form: {
+      componentProps: {
+        type:"textarea",
+        maxlength:12,
+        showWordLimit:true
+      }
+    }
     //sortTableDefault: 1000,
   },
   {

From 23430e3c5dda1190255d7cc167a25cddfb0a8915 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 4 Nov 2024 11:07:32 +0800
Subject: [PATCH 033/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6325=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierApbalanceCalendar/index.ts    |  56 ++++
 .../supplierApbalanceCalendar/index.vue       | 244 ++++++++++++++++++
 .../supplierApbalanceCalendar.data.ts         |  94 +++++++
 3 files changed, 394 insertions(+)
 create mode 100644 src/api/wms/supplierApbalanceCalendar/index.ts
 create mode 100644 src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
 create mode 100644 src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts

diff --git a/src/api/wms/supplierApbalanceCalendar/index.ts b/src/api/wms/supplierApbalanceCalendar/index.ts
new file mode 100644
index 000000000..19836c294
--- /dev/null
+++ b/src/api/wms/supplierApbalanceCalendar/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface SupplierApbalanceCalendarVO {
+  id: number
+  beginMonth: string
+  beginDay: string
+  endMonth: string
+  endDay: string
+  descriiption: string
+  available: string
+  remark: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询询证函日历列表
+export const getSupplierApbalanceCalendarPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplier-apbalance-calendar/senior', data })
+  } else {
+    return await request.get({ url: `/wms/supplier-apbalance-calendar/page`, params })
+  }
+}
+
+// 查询询证函日历详情
+export const getSupplierApbalanceCalendar = async (id: number) => {
+  return await request.get({ url: `/wms/supplier-apbalance-calendar/get?id=` + id })
+}
+
+// 新增询证函日历
+export const createSupplierApbalanceCalendar = async (data: SupplierApbalanceCalendarVO) => {
+  return await request.post({ url: `/wms/supplier-apbalance-calendar/create`, data })
+}
+
+// 修改询证函日历
+export const updateSupplierApbalanceCalendar = async (data: SupplierApbalanceCalendarVO) => {
+  return await request.put({ url: `/wms/supplier-apbalance-calendar/update`, data })
+}
+
+// 删除询证函日历
+export const deleteSupplierApbalanceCalendar = async (id: number) => {
+  return await request.delete({ url: `/wms/supplier-apbalance-calendar/delete?id=` + id })
+}
+
+// 导出询证函日历 Excel
+export const exportSupplierApbalanceCalendar = async (params) => {
+  return await request.download({ url: `/wms/supplier-apbalance-calendar/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/supplier-apbalance-calendar/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
new file mode 100644
index 000000000..ae0ce7f01
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierApbalanceCalendar.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierApbalanceCalendar.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SupplierApbalanceCalendarRules"
+    :formAllSchemas="SupplierApbalanceCalendar.allSchemas"
+    :apiUpdate="SupplierApbalanceCalendarApi.updateSupplierApbalanceCalendar"
+    :apiCreate="SupplierApbalanceCalendarApi.createSupplierApbalanceCalendar"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierApbalanceCalendar.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/supplier-apbalance-calendar/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierApbalanceCalendar,SupplierApbalanceCalendarRules } from './supplierApbalanceCalendar.data'
+import * as SupplierApbalanceCalendarApi from '@/api/wms/supplierApbalanceCalendar'
+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'
+
+defineOptions({ name: 'SupplierApbalanceCalendar' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierApbalanceCalendar.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierApbalanceCalendarApi.getSupplierApbalanceCalendarPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:supplier-apbalance-calendar:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplier-apbalance-calendar:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:supplier-apbalance-calendar:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-apbalance-calendar:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier-apbalance-calendar:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =SupplierApbalanceCalendar.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await SupplierApbalanceCalendarApi.createSupplierApbalanceCalendar(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SupplierApbalanceCalendarApi.updateSupplierApbalanceCalendar(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierApbalanceCalendar')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SupplierApbalanceCalendarApi.deleteSupplierApbalanceCalendar(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierApbalanceCalendarApi.exportSupplierApbalanceCalendar(tableObject.params)
+    download.excel(data, '询证函日历.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '询证函日历导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SupplierApbalanceCalendarApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
new file mode 100644
index 000000000..d1fda217c
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
@@ -0,0 +1,94 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const SupplierApbalanceCalendarRules = reactive({
+  beginMonth: [required],
+  beginDay: [required],
+  endMonth: [required],
+  endDay: [required],
+  concurrencyStamp: [required],
+})
+
+export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: 'id',
+  //   field: 'id',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
+  {
+    label: '开始月份',
+    field: 'beginMonth',
+    sort: 'custom',
+  },
+  {
+    label: '开始日期',
+    field: 'beginDay',
+    sort: 'custom',
+  },
+  {
+    label: '结束月份',
+    field: 'endMonth',
+    sort: 'custom',
+  },
+  {
+    label: '结束日期',
+    field: 'endDay',
+    sort: 'custom',
+  },
+  {
+    label: '描述',
+    field: 'descriiption',
+    sort: 'custom',
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  // {
+  //   label: '扩展属性',
+  //   field: 'extraProperties',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  // {
+  //   label: '并发乐观锁',
+  //   field: 'concurrencyStamp',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   },
+  // },
+  // {
+  //   label: '地点ID',
+  //   field: 'siteId',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From b50e0ced10df8476874400657cb881a860dc3cad Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 13:41:20 +0800
Subject: [PATCH 034/225] =?UTF-8?q?=E8=AF=A2=E8=AF=81=E5=87=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceCalendar/index.vue       | 36 ++++++++++++++++++-
 .../supplierApbalanceCalendar.data.ts         | 29 +++++++++++----
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index ae0ce7f01..e85943fa4 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -47,8 +47,20 @@
     :apiUpdate="SupplierApbalanceCalendarApi.updateSupplierApbalanceCalendar"
     :apiCreate="SupplierApbalanceCalendarApi.createSupplierApbalanceCalendar"
     @searchTableSuccess="searchTableSuccess"
+    @onChange="onChange"
     :isBusiness="false"
-  />
+  >
+  <template #beginDay>
+    <el-select v-model="beginDay" placeholder="请选择开始日期" @change="(value)=>selectChange(value,'beginDay')">
+      <el-option v-for="dict in daysInMonths" :key="dict.value" :label="dict.label" :value="dict.value"/>
+    </el-select>
+  </template>
+  <template #endDay>
+    <el-select v-model="endDay" placeholder="请选择结束日期" @change="(value)=>selectChange(value,'endDay')">
+      <el-option v-for="dict in daysInMonths" :key="dict.value" :label="dict.label" :value="dict.value"/>
+    </el-select>
+  </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierApbalanceCalendar.allSchemas" />
@@ -65,6 +77,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import dayjs from 'dayjs'
 
 defineOptions({ name: 'SupplierApbalanceCalendar' })
 
@@ -235,6 +248,27 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const beginDay = ref('')
+const endDay = ref('')
+const selectChange = (value,field)=>{
+  basicFormRef.value.formRef.formModel[field] = value
+}
+const daysInMonths = ref([])
+const onChange = (field, value, formRef)=>{
+  if(field=='month'){
+    let days = []
+    for (let i=1;i<=dayjs(`${value}-01`).daysInMonth();i++){
+      days.push({
+        value:i,
+        label:i
+      })
+    }
+    basicFormRef.value.formRef.formModel['beginDay'] = ''
+    basicFormRef.value.formRef.formModel['endDay'] = ''
+    daysInMonths.value = days
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
index d1fda217c..9e77d578b 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
@@ -10,6 +10,14 @@ export const SupplierApbalanceCalendarRules = reactive({
   concurrencyStamp: [required],
 })
 
+
+let months = []
+for(let i=0;i<12;i++){
+  months.push({
+    value: i+1,
+    label: i+1,
+  })
+}
 export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
   // {
   //   label: 'id',
@@ -18,20 +26,27 @@ export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
   //   isForm: false,
   // },
   {
-    label: '开始月份',
-    field: 'beginMonth',
+    label: '月份',
+    field: 'month',
     sort: 'custom',
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: months,
+        placeholder: '请选择月份',
+      }
+    },
   },
   {
     label: '开始日期',
     field: 'beginDay',
     sort: 'custom',
   },
-  {
-    label: '结束月份',
-    field: 'endMonth',
-    sort: 'custom',
-  },
+  // {
+  //   label: '结束月份',
+  //   field: 'endMonth',
+  //   sort: 'custom',
+  // },
   {
     label: '结束日期',
     field: 'endDay',

From 30cc9ababe67ca2be299bc9e201513d2fed4c106 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 13:43:30 +0800
Subject: [PATCH 035/225] =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierManage/supplierApbalanceCalendar/index.vue   | 5 ++++-
 .../supplierApbalanceCalendar.data.ts                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index e85943fa4..f7de2c11e 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -255,7 +255,7 @@ const selectChange = (value,field)=>{
 }
 const daysInMonths = ref([])
 const onChange = (field, value, formRef)=>{
-  if(field=='month'){
+  if(field=='beginMonth'){
     let days = []
     for (let i=1;i<=dayjs(`${value}-01`).daysInMonth();i++){
       days.push({
@@ -265,6 +265,9 @@ const onChange = (field, value, formRef)=>{
     }
     basicFormRef.value.formRef.formModel['beginDay'] = ''
     basicFormRef.value.formRef.formModel['endDay'] = ''
+    beginDay.value = ''
+    endDay.value = ''
+
     daysInMonths.value = days
   }
 }
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
index 9e77d578b..3c1bf7825 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
@@ -27,7 +27,7 @@ export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
   // },
   {
     label: '月份',
-    field: 'month',
+    field: 'beginMonth',
     sort: 'custom',
     form: {
       component: 'Select',

From 4e56e916e0529ccfd2abfd4ea95c5192566ad37d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 13:44:58 +0800
Subject: [PATCH 036/225] =?UTF-8?q?=20=20=20=20message.error('=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=A5=E6=9C=9F=E4=B8=8D=E8=83=BD=E5=B0=8F=E4=BA=8E?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F')?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierManage/supplierApbalanceCalendar/index.vue    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index f7de2c11e..9490866cf 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -167,6 +167,10 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
+  if(endDay.value<beginDay.value){
+    message.error('结束日期不能小于开始日期')
+    return;
+  }
   var isHave =SupplierApbalanceCalendar.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });

From c80e8fd2c2bc1d5ea621983a67381992f6537b8d Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 4 Nov 2024 13:50:10 +0800
Subject: [PATCH 037/225] =?UTF-8?q?HL-6311=20=E4=BF=AE=E5=A4=8D=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../initialContainerMainRequest.data.ts       | 40 +++++++++----------
 .../scrapContainerMainRequest/index.vue       |  8 ++--
 .../scrapContainerMainRequest.data.ts         |  6 ++-
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
index 8bed7ab51..e83b73dd5 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts
@@ -465,6 +465,26 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '数量',
     field: 'toQty',
@@ -503,26 +523,6 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '库存状态',
-    field: 'toInventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true,
-      type: 'Select'
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '子备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index ce2b89d73..c17773476 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@@ -158,7 +158,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['uom'] = item['uom']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['fromInventoryStatus'] = item['inventoryStatus']
-          newRow['toInventoryStatus'] = 'SCRAP'
+          newRow['toInventoryStatus'] = item['inventoryStatus']
           newRow['toQty'] = item['qty']
           tableData.value.push(newRow)
         })
@@ -426,9 +426,9 @@ const isShowButton = ref(true)
 const tableFormKeys = {}
 ContainerDetailRequest.allSchemas.tableFormColumns.forEach(item => {
   tableFormKeys[item.field] = item.default ? item.default : ''
-  if(item.field == 'toInventoryStatus'){
-    tableFormKeys[item.field] = "SCRAP"
-    }
+  // if(item.field == 'toInventoryStatus'){
+  //   tableFormKeys[item.field] = "SCRAP"
+  //   }
 })
 const tableData = ref([])
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index fa9c45a11..60834a2f2 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -141,7 +141,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
+    isSearch: false,
+    isForm: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -585,7 +587,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '子备注',
     field: 'remark',
     sort: 'custom',
-    isTable: true,
+    isTable: false,
     isForm: false,
     isTableForm: false
   },

From bbbfdbd253f786feab3e4d9948d3bcde3cf2ae51 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 13:53:01 +0800
Subject: [PATCH 038/225] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
index 3c1bf7825..f8c9f2b14 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
@@ -62,6 +62,8 @@ export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     sort: 'custom',
     isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
   },
   {
     label: '备注',

From 505dfb5c4761b69679399f43939d0ca3673d5384 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 14:03:08 +0800
Subject: [PATCH 039/225] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moveContainerMainRequest.data.ts                   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/moveContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/moveContainerMainRequest.data.ts
index e51780c8c..dcf7fa77d 100644
--- a/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/moveContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/moveContainerMainRequest/moveContainerMainRequest.data.ts
@@ -436,6 +436,11 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalanceByQJ,
+      searchCondition: [{
+        key: 'fromLocationCode',
+        value: 'toLocationCode',
+        isMainValue: true // 表示查询条件是主表的字段的值
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -446,6 +451,11 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
         searchPage: BalanceApi.getBalanceByQJ,
+        searchCondition: [{
+          key: 'fromLocationCode',
+          value: 'toLocationCode',
+          isMainValue: true // 表示查询条件是主表的字段的值
+        }]
       }
     }
   },

From 7b0e8fc1341aee88fc07b5ee49b772617737bb1a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 14:12:40 +0800
Subject: [PATCH 040/225] =?UTF-8?q?=E8=AF=A2=E8=AF=81=E5=87=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierApbalanceCalendar/index.vue    | 5 ++++-
 .../supplierApbalanceCalendar.data.ts                     | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index 9490866cf..728b16463 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -261,7 +261,10 @@ const daysInMonths = ref([])
 const onChange = (field, value, formRef)=>{
   if(field=='beginMonth'){
     let days = []
-    for (let i=1;i<=dayjs(`${value}-01`).daysInMonth();i++){
+    let maxday = dayjs(`${value}-01`).daysInMonth()
+    if(value==2) maxday = 29
+
+    for (let i=1;i<=maxday;i++){
       days.push({
         value:i,
         label:i
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
index f8c9f2b14..b1d91b15b 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
@@ -64,6 +64,14 @@ export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '备注',

From b49cf4bd78a6f79611417f6368a59edfc6983a44 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 4 Nov 2024 14:25:26 +0800
Subject: [PATCH 041/225] =?UTF-8?q?HL-6311=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../returnContainerMainRequest.data.ts                 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts
index fdb53d163..a5ce9bc18 100644
--- a/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/returnContainerMainRequest/returnContainerMainRequest.data.ts
@@ -436,6 +436,11 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalanceByQJ,
+      searchCondition: [{
+        key: 'fromLocationCode',
+        value: 'toLocationCode',
+        isMainValue: true // 表示查询条件是主表的字段的值
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -446,6 +451,11 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
         searchPage: BalanceApi.getBalanceByQJ,
+        searchCondition: [{
+          key: 'fromLocationCode',
+          value: 'toLocationCode',
+          isMainValue: true // 表示查询条件是主表的字段的值
+        }]
       }
     }
   },

From 6f96866f0e6797e87405ce04ac8a6fdb9fc93d75 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 4 Nov 2024 15:47:18 +0800
Subject: [PATCH 042/225] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierApbalanceMain/index.ts    |   7 ++
 .../supplierApbalanceMain/index.vue           | 102 +++++++++++++++++-
 .../supplierApbalanceMain.data.ts             |  18 ++++
 .../supplierApbalanceCalendar/index.vue       |   2 +
 4 files changed, 128 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/supplierApbalanceMain/index.ts b/src/api/wms/supplierApbalanceMain/index.ts
index ed7e2f60c..a3cdc8940 100644
--- a/src/api/wms/supplierApbalanceMain/index.ts
+++ b/src/api/wms/supplierApbalanceMain/index.ts
@@ -70,3 +70,10 @@ export const exportSupplierApbalanceMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplier-apbalance-main/get-import-template' })
 }
+
+
+// 查询年月日
+export const getMonthDay = async () => {
+  return await request.get({ url: `/wms/supplier-apbalance-calendar/getMonthDay`})
+}
+
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 459b3230b..b50b34802 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -1,7 +1,23 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SupplierApbalanceMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search ref="searchRef" :schema="SupplierApbalanceMain.allSchemas.searchSchema" @search="searchClick" @reset="resetClick" >
+      <template #year>
+        <el-select v-model="year" placeholder="请选择年" @change="(value)=>selectChange(value,'year')">
+          <el-option v-for="dict in yearList" :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </template>
+      <template #month>
+        <el-select v-model="month" placeholder="请选择月" @change="(value)=>selectChange(value,'month')">
+          <el-option v-for="dict in monthList" :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </template>
+      <template #day>
+        <el-select v-model="day" placeholder="请选择日" @change="(value)=>selectChange(value,'day')">
+          <el-option v-for="dict in dayList" :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </template>
+    </Search>
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -92,6 +108,7 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import * as BasicSpotCheckOptionApi from "@/api/eam/basicSpotCheckOption";
 import TableFormAdjustment from '@/components/TableFormAdjustment/src/TableFormAdjustment.vue'
 import AdjustmentDialog from '@/components/TableFormAdjustment/src/AdjustmentDialog.vue'
+import dayjs from 'dayjs'
 
 import {getJmreportBaseUrl} from "@/utils/systemParam";
 import {getAccessToken} from "@/utils/auth";
@@ -296,8 +313,91 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const year = ref('')
+const month = ref('')
+const day = ref('')
+// 年份
+const yearList = ref([])
+const getDefaultYear = ()=>{
+  yearList.value = []
+  let current = new Date().getFullYear()
+  for(let i=-10;i<=10;i++){
+    yearList.value.push({
+      label:current+i,
+      value:current+i
+    })
+  }
+}
+// 月份
+const daysInMonths = ref([])
+const monthList = ref([])
+const getMonthDay = async ()=>{
+  getDefaultYear()
+  monthList.value = []
+  let res = await SupplierApbalanceMainApi.getMonthDay()
+  console.log('获取年月日',res)
+  if(res){
+    daysInMonths.value = res
+    res.forEach(item => {
+      monthList.value.push({
+        label:item['beginMonth'],
+        value:item['beginMonth'],
+      })
+    });
+    console.log('monthList',monthList.value)
+  }
+}
+
+const searchRef = ref()
+// 日期
+const dayList = ref([])
+const selectChange = (value,field)=>{
+  searchRef.value.setFormValues({
+    [field]:value,
+  })
+  if(field=='month'){
+    //重置日期
+    dayList.value = []
+    //更新日期数组
+    let dayObj = daysInMonths.value.find(item=>item['beginMonth']==month.value)
+    if(dayObj){
+      for(let i= Number(dayObj['beginDay']);i<=Number(dayObj['endDay']);i++){
+        dayList.value.push({
+            label:i,
+            value:i
+        })
+      }
+    }
+    if(dayList.value.length>0){
+      day.value = dayList.value[0]['value']
+    }
+  }
+}
+
+const resetClick = async (data)=>{
+  year.value = ''
+  month.value = ''
+  day.value = ''
+  searchClick(data)
+}
+
+const searchClick = async (data)=>{
+  if((data['year']||data['month']||data['day'])&&(!data['year']||!data['month']||!data['day'])){
+    message.error('请选择年月日')
+    return
+  }
+  if(data['month'].length==1){
+    data['month'] = '0'+data['month']
+  }
+  if((''+data['day']).length==1){
+    data['day'] = '0' + data['day']
+  }
+  data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}`
+  setSearchParams(data)
+}
 /** 初始化 **/
 onMounted(async () => {
+  getMonthDay()
   getList()
   importTemplateData.templateUrl = await SupplierApbalanceMainApi.importTemplate()
 })
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 0641ff6ef..24c55a678 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -39,6 +39,24 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
+  {
+    label: '年',
+    field: 'year',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '月',
+    field: 'month',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '日',
+    field: 'day',
+    sort: 'custom',
+    isSearch: true,
+  },
   // {
   //   label: '账户类型',
   //   field: 'ttGltype',
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index 728b16463..b14e79362 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -162,6 +162,8 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  beginDay.value = row['beginDay']
+  endDay.value = row['endDay']
   basicFormRef.value.open(type, row)
 }
 

From f053d8527fb5c185428bf85e528da5867972aaf8 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 4 Nov 2024 16:07:54 +0800
Subject: [PATCH 043/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6325?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 459b3230b..7f7d00b7e 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -166,7 +166,7 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListPrintBtn({hasPermi:'wms:supplier-apbalance-main:update'}), // 打印
-  defaultButtons.mainListReplyInputBtn({hasPermi:'wms:supplier-apbalance-main:update'}), // 回函录入
+  // defaultButtons.mainListReplyInputBtn({hasPermi:'wms:supplier-apbalance-main:update'}), // 回函录入
 ]
 
 

From 4e410e0cac82c5b7a74c8a9a75f7c6ab2682a435 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 4 Nov 2024 17:15:57 +0800
Subject: [PATCH 044/225] =?UTF-8?q?HL-6311=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                          | 11 +++++++++++
 .../scrapContainerMainRequest.data.ts                 |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 1387a2391..2a2445c38 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -210,6 +210,17 @@ export const getBalanceByQJ = async (params) => {
   }
 }
 
+// 查询器具库存余额列表
+export const getBalanceByQJToScrap = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorContainerToScrap', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageContainerToScrap`, params })
+  }
+}
+
 
 // 查询库存余额列表根据业务类型  根据库存状态及库区类型筛选
 export const getBalanceByBusinessTypeByItemType = async (params) => {
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index 60834a2f2..e5ce12e4a 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -428,7 +428,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceByQJ,
+      searchPage: BalanceApi.getBalanceByQJToScrap,
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -438,7 +438,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalanceByQJ,
+        searchPage: BalanceApi.getBalanceByQJToScrap,
       }
     }
   },

From a20a05c8221c07ce586dd8e5edded2b210983f53 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 4 Nov 2024 17:29:36 +0800
Subject: [PATCH 045/225] =?UTF-8?q?HL-6311=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/containerRecordMain/index.ts                      | 4 ++--
 .../scrapContainerMainRequest.data.ts                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/containerRecordMain/index.ts b/src/api/wms/containerRecordMain/index.ts
index 3fe4f2c53..34ea53f97 100644
--- a/src/api/wms/containerRecordMain/index.ts
+++ b/src/api/wms/containerRecordMain/index.ts
@@ -123,9 +123,9 @@ export const exportContainerDeliverRecordMain = async (params) => {
 if (params.isSearch) {
 delete params.isSearch
 const data = { ...params }
-return await request.downloadPost({ url: '/wms/container-record-main/export-excel-init-senior', data })
+return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data })
 } else {
-return await request.download({ url: `/wms/container-record-main/export-excel-init`, params })
+return await request.download({ url: `/wms/container-record-main/export-excel`, params })
 }
 }
 
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index e5ce12e4a..09323ee79 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -142,7 +142,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: false,
-    isForm: true,
+    isForm: false,
     isTable: false,
     table: {
       width: 150

From 1deef31cb0d5cc8967f394aca4aeaa2340b0b19c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 5 Nov 2024 09:03:31 +0800
Subject: [PATCH 046/225] =?UTF-8?q?tag=E5=A4=9A=E4=B8=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8B=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
index beeb61457..a5115d043 100644
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@@ -65,7 +65,7 @@ export default defineComponent({
         return (
           dictDataList.map(item => {
             return <ElTag
-                    style={item?.cssClass=='none'?'background-color: transparent;':item?.cssClass ? 'color: #fff' : ''}
+                    style={item?.cssClass=='none'?'background-color: transparent;':item?.cssClass=='purple_type'?'background-color: #f7ebf9;border-color: #ecd5ec;color: #e348e3;':item?.cssClass ? 'color: #fff' : ''}
                     type={item?.colorType}
                     color={
                       item?.cssClass && isHexColor(item?.cssClass)

From cd0cb91a111d77d4f1c68ad5569a76e4ec52dabf Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Tue, 5 Nov 2024 10:05:42 +0800
Subject: [PATCH 047/225] =?UTF-8?q?HL-6311=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverContainerRecordMain.data.ts        | 13 +++--
 .../scrapContainerMainRequest.data.ts         | 56 +++++++++----------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
index ab4b00f7d..b1e354b59 100644
--- a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
@@ -27,12 +27,12 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 200
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    isSearch: true,
-  },
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
   {
     label: '类型',
     field: 'type',
@@ -185,6 +185,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
index 09323ee79..73a23d34c 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts
@@ -510,46 +510,46 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
-  // {
-  //   label: '从库存状态',
-  //   field: 'fromInventoryStatus',
-  //   dictType: DICT_TYPE.INVENTORY_STATUS,
-  //   dictClass: 'string',
-  //   isForm: false,
-  //   isTableForm: false,
-  //   isTable: false,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   tableForm: {
-  //     disabled: true,
-  //     type: 'Select'
-  //   },
-  // },
-  // {
-  //   label: '从数量',
-  //   field: 'fromQty',
-  //   sort: 'custom',
-  //   tableForm: {
-  //     disabled: true,
-  //   },
-  // },
   {
     label: '库存状态',
-    field: 'toInventoryStatus',
+    field: 'fromInventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
+    isForm: false,
+    isTableForm: false,
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
-      type: 'Select',
-      disabled: true
+      disabled: true,
+      type: 'Select'
     },
   },
+  // {
+  //   label: '从数量',
+  //   field: 'fromQty',
+  //   sort: 'custom',
+  //   tableForm: {
+  //     disabled: true,
+  //   },
+  // },
+  // {
+  //   label: '库存状态',
+  //   field: 'toInventoryStatus',
+  //   dictType: DICT_TYPE.INVENTORY_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     type: 'Select',
+  //     disabled: true
+  //   },
+  // },
   {
     label: '数量',
     field: 'toQty',

From 79f02dff9ffa590d7f31905102e25cd34a3219da Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 5 Nov 2024 11:38:55 +0800
Subject: [PATCH 048/225] =?UTF-8?q?HL-6343=20=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorychange/inventorychangeRequestMain/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index b180eb5ec..701224f34 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -483,10 +483,11 @@ const submitForm = async (formType, submitData) => {
   //   formRef.value.formLoading = false
   //   return message.warning('包装号1重复')
   // }
-  if (duplicateItems.length>0) {
-    formRef.value.formLoading = false
-    return message.warning('物料代码重复')
-  }
+  // if (duplicateItems.length>0) {
+  //   formRef.value.formLoading = false
+  //   return message.warning('物料代码重复')
+
+  // }
   data.subList.forEach(obj => {
     if(obj.toQty == 0){
       message.error(`到数量不能为0!`)

From bf3f23b1cd6940156aebc8ebb38890e3518512ed Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 5 Nov 2024 11:40:19 +0800
Subject: [PATCH 049/225] HL-6360

---
 .../inventorymoveRequestMain/inventorymoveRequestMain.data.ts   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 73a2c0bfe..19b18d4e2 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -653,13 +653,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0,
       precision: 6
     }
   },

From 5ad30e35875a26d01453a775b4e3d14d835df8a0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 5 Nov 2024 11:58:42 +0800
Subject: [PATCH 050/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6361=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 |  3 ++
 .../sparepartsrequisitionRequestMain.data.ts  | 30 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 8e8b29650..a90d628d0 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -126,6 +126,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['inventoryStatus'] = item['inventoryStatus']
           newRow['fromLocationCode'] = item['locationCode']
           newRow['itemCode'] = item['itemCode']
+          newRow['itemName'] = item['itemName']
+          newRow['itemDesc1'] = item['itemDesc1']
+          newRow['itemDesc2'] = item['itemDesc2']
           newRow['uom'] = item['uom']
           tableData.value.push(newRow)
         })
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index 79008aa80..b569ac9fb 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -668,7 +668,15 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    },
+    isTableForm: true,
     isForm: false,
   },
   {
@@ -678,7 +686,15 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    },
+    isTableForm: true,
     isForm: false,
   },
   {
@@ -688,7 +704,15 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    },
+    isTableForm: true,
     isForm: false,
   },
   {

From 376dfd28baf28f563bc490c8410c766e7e7096a5 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 5 Nov 2024 16:08:47 +0800
Subject: [PATCH 051/225] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86,=E5=B9=B4=E6=9C=88=E6=97=A5?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceMain/supplierApbalanceMain.data.ts      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 24c55a678..cedc89710 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -44,18 +44,23 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'year',
     sort: 'custom',
     isSearch: true,
+    isTable:false,
   },
   {
     label: '月',
     field: 'month',
     sort: 'custom',
     isSearch: true,
+    isTable:false,
+
   },
   {
     label: '日',
     field: 'day',
     sort: 'custom',
     isSearch: true,
+    isTable:false,
+
   },
   // {
   //   label: '账户类型',

From 376dc332398cb2485bcbeacf22c1d220ed703e6e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 5 Nov 2024 16:15:53 +0800
Subject: [PATCH 052/225] =?UTF-8?q?=E8=AF=A2=E8=AF=81=E5=87=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceCalendar/index.vue         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index b14e79362..191636fa7 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -162,8 +162,21 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
-  beginDay.value = row['beginDay']
-  endDay.value = row['endDay']
+  if(row){
+    beginDay.value = row['beginDay']
+    endDay.value = row['endDay']
+    let days = []
+    let maxday = dayjs(`${row['beginMonth']}-01`).daysInMonth()
+    if(row['beginMonth']==2) maxday = 29
+
+    for (let i=1;i<=maxday;i++){
+      days.push({
+        value:i,
+        label:i
+      })
+    }
+    daysInMonths.value = days
+  }
   basicFormRef.value.open(type, row)
 }
 

From 07854dd5b2471d8eb9f98628d41c1e48240faad2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 5 Nov 2024 17:07:44 +0800
Subject: [PATCH 053/225] =?UTF-8?q?HL-6360=E5=BA=93=E5=AD=98=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E6=8A=8A=E8=B4=9F=E6=95=B0=E5=8F=98=E4=B8=BA0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMain.data.ts                            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
index 656e456a6..32da3e0ee 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
@@ -652,13 +652,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0,
       precision: 6
     }
   },

From d0615b3718f2f549025664a660b401689debdedf Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 09:36:04 +0800
Subject: [PATCH 054/225] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index e5a762365..9d8b24505 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -370,6 +370,9 @@ const selectChange = (value,field)=>{
     }
     if(dayList.value.length>0){
       day.value = dayList.value[0]['value']
+      searchRef.value.setFormValues({
+        'day':day.value,
+      })
     }
   }
 }

From a7b527075736367afe1ec53bf67212b6f2ef7d39 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 10:04:22 +0800
Subject: [PATCH 055/225] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 9d8b24505..459811915 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -248,7 +248,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/973017727126409216?token=' + getAccessToken())
 const handlePrint = async (row) => {
-  window.open(src.value+'&id='+row.id)
+  window.open(src.value+'&id='+row.id+'&searchTime='+tableObject.params.searchTime)
 }
 
 
@@ -381,6 +381,7 @@ const resetClick = async (data)=>{
   year.value = ''
   month.value = ''
   day.value = ''
+  data['searchTime'] = ''
   searchClick(data)
 }
 
@@ -395,7 +396,9 @@ const searchClick = async (data)=>{
   if((''+data['day']).length==1){
     data['day'] = '0' + data['day']
   }
-  data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}`
+  if(data['year']&&data['month']&&data['day']){
+    data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}`
+  }
   setSearchParams(data)
 }
 /** 初始化 **/

From c9aead922fbad728fbb6bc5c6a809839fe604290 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 10:18:24 +0800
Subject: [PATCH 056/225] undefined

---
 .../supplierApbalance/supplierApbalanceMain/index.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 459811915..4586e8290 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -248,7 +248,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/973017727126409216?token=' + getAccessToken())
 const handlePrint = async (row) => {
-  window.open(src.value+'&id='+row.id+'&searchTime='+tableObject.params.searchTime)
+  window.open(src.value+'&id='+row.id+'&searchTime='+`${tableObject.params.searchTime||''}`)
 }
 
 

From cdd9db2588144414893249c658ee17b3602f356d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 10:21:03 +0800
Subject: [PATCH 057/225] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=97=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceMain/supplierApbalanceMain.data.ts      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index cedc89710..72f3f1c10 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -45,6 +45,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isTable:false,
+    isDetail:false,
   },
   {
     label: '月',
@@ -52,7 +53,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isTable:false,
-
+    isDetail:false,
   },
   {
     label: '日',
@@ -60,7 +61,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isTable:false,
-
+    isDetail:false,
   },
   // {
   //   label: '账户类型',

From c47672ebbf22241fbd0ce42679dcd2a622bed91a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 10:31:19 +0800
Subject: [PATCH 058/225] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceMain.data.ts                | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 72f3f1c10..858334c5b 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -19,14 +19,14 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isForm: false,
   },
-  {
-    label: '状态',
-    field: 'replyStatus',
-    sort: 'custom',
-    isSearch: true,
-    dictType: DICT_TYPE.REPLY_STATUS,
-    dictClass: 'string',
-  },
+  // {
+  //   label: '状态',
+  //   field: 'replyStatus',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   dictType: DICT_TYPE.REPLY_STATUS,
+  //   dictClass: 'string',
+  // },
   {
     label: '公司代码',
     field: 'ttCompany',

From e35096db173795e76a7ca9ea1368c78a9fb6e21b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 10:35:26 +0800
Subject: [PATCH 059/225] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=A7=94=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backflushDetailbQad/backflushDetailbQad.data.ts        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
index 14b82105e..76bea1dd6 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
+++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
@@ -106,6 +106,13 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'qty',
     sort: 'custom',
   },
+  {
+    label: '是否委外',
+    field: 'isWw',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
   {
     label: '操作',
     field: 'action',

From 114cb9af1dc8bcb17fa1015ef62b58ac51473aa8 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 13:51:41 +0800
Subject: [PATCH 060/225] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7-=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain.data.ts                 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index cdca664aa..938de9583 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -173,6 +173,19 @@ export const ProductscrapRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '成本中心类型',
+      field: 'costCenterType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+    },
     {
       label: '原因代码',
       field: 'reasonCodeRequisition',

From 001997e861b62845146eb4a9badaef66a2b48308 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 13:57:50 +0800
Subject: [PATCH 061/225] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrapRequestMain.data.ts                 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index cdca664aa..938de9583 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -173,6 +173,19 @@ export const ProductscrapRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '成本中心类型',
+      field: 'costCenterType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+    },
     {
       label: '原因代码',
       field: 'reasonCodeRequisition',

From 9761f76e37b87d7254d5f0eabafed9db4d2df7b4 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 14:46:46 +0800
Subject: [PATCH 062/225] =?UTF-8?q?SCP=E5=8E=BB=E6=8E=89=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceipt/purchasereceiptJobMain/index.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 16b901b6a..51b472a5c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -177,7 +177,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
-  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
+  defaultButtons.defaultUpdateTaskSettingBtn({hide:routeName.value.includes('SCP')}), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

From adcac0a5cd70d8df755e69ccd8c31c60166dd316 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 6 Nov 2024 15:51:44 +0800
Subject: [PATCH 063/225] =?UTF-8?q?HL-6386=E5=8E=9F=E5=9B=A0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=BB=98=E8=AE=A4SC99=EF=BC=8C=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=BB=98=E8=AE=A4DEFC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain/index.vue         | 16 ++++++++++++++++
 .../productionscrapRequestMain.data.ts           |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 5096dda96..58f1f53d8 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -230,6 +230,11 @@ const clearSearchInput = (field)=>{
     })
   }
 }
+const defaultReasonCodeRequisition = ref(true)
+const setDefaultrReasonCodeRequisition = ()=>{
+    formRef.value.setDefaultBlurValue('reasonCodeRequisition','SC99')
+    defaultReasonCodeRequisition.value = false
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async () => {
@@ -324,6 +329,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV[formField] = val[0][searchField]
       tableData.value = [] // 重置明细数据
       formRef.setValues(setV)
+      if(formField == 'costCenterCode'){
+        if(defaultReasonCodeRequisition.value){
+          setDefaultrReasonCodeRequisition()
+        }
+      }
     }
   })
 }
@@ -641,6 +651,12 @@ const openForm =async (type: string, row?: number) => {
     })
   }
   formRef.value.open(type, row)
+  if(type == 'create'){
+    nextTick(()=>{
+      defaultReasonCodeRequisition.value = true
+      formRef.value.setDefaultBlurValue('costCenterCode','DEFC')
+    })
+  }
 }
 
 // 批量打印--生产退料
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 959141c48..4fe78c5f4 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -892,7 +892,7 @@ export const ProductionscrapRequestMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isForm:false,
+      isForm:true,
       isTable:false,
       isTableForm:false,
       form: {

From 788b0c74da1aec9d2edb4c8543b67cae927385ca Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Wed, 6 Nov 2024 19:53:04 +0800
Subject: [PATCH 064/225] =?UTF-8?q?=E5=99=A8=E5=85=B7=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/balanceContainer/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryManage/balanceContainer/index.vue b/src/views/wms/inventoryManage/balanceContainer/index.vue
index 2d4ee1064..a00fdf2ec 100644
--- a/src/views/wms/inventoryManage/balanceContainer/index.vue
+++ b/src/views/wms/inventoryManage/balanceContainer/index.vue
@@ -107,7 +107,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: BalanceApi.getBalanceByQJ // 分页接口
+  getListApi: BalanceApi.getBalanceByQJToScrap // 分页接口
 })
 
 // 获得表格的各种操作

From c8624ebac6835fe0151ce85138a08e2d3758470f Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Thu, 7 Nov 2024 08:36:42 +0800
Subject: [PATCH 065/225] =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../balanceContainer/index.vue                | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/inventoryManage/balanceContainer/index.vue b/src/views/wms/inventoryManage/balanceContainer/index.vue
index a00fdf2ec..c72deb283 100644
--- a/src/views/wms/inventoryManage/balanceContainer/index.vue
+++ b/src/views/wms/inventoryManage/balanceContainer/index.vue
@@ -150,9 +150,11 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
-  } else if (val=='selection_point'){// 批量打印
-    handleSelectionPoint()
-  } else { // 其他按钮 
+  } 
+  // else if (val=='selection_point'){// 批量打印
+  //   handleSelectionPoint()
+  // } 
+  else { // 其他按钮 
     console.log('其他按钮', item)
   }
 }
@@ -220,22 +222,22 @@ const handleSelectionPoint = async ()=>{
   // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
 }
 // 列表-操作按钮
-const butttondata = [
-  {
-    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'}), // 删除
-]
+// const butttondata = [
+//   {
+//     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'}), // 删除
+// ]
 
 // 列表-操作按钮事件 
 const buttonTableClick = async (val, row) => {

From 7076612e28facc2d56abf57d87a9b3798f6a1f1c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 8 Nov 2024 10:10:50 +0800
Subject: [PATCH 066/225] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/rule/index.ts                     |  5 +++++
 .../strategy/upShelfStrategy/AddForm.vue      |  8 +++++--
 .../strategy/upShelfStrategy/index.vue        | 22 +++++++++++++------
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/api/wms/rule/index.ts b/src/api/wms/rule/index.ts
index a6fe74970..2fd735970 100644
--- a/src/api/wms/rule/index.ts
+++ b/src/api/wms/rule/index.ts
@@ -56,3 +56,8 @@ export const exportRule = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/rule/get-import-template' })
 }
+// 查询规则详情
+export const getMaxPriority = async (code: number) => {
+  return await request.get({ url: `/wms/rule/getMaxPriority?code=` + code })
+}
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index a648a54d9..82eabc696 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -660,7 +660,6 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 const formStrategyCode = ref('')
 
-
 // 仓库类型
 const warehouseType = ref('WarehouseCode')
 
@@ -1112,7 +1111,7 @@ const changeWarehouse = (e) => {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, strategyCode: string, id?: number) => {
+const open = async (type: string, strategyCode: string, id?: number, priority?: Number) => {
 
   formStrategyCode.value = strategyCode
   dialogVisible.value = true
@@ -1120,6 +1119,7 @@ const open = async (type: string, strategyCode: string, id?: number) => {
   formType.value = type
   warehouseType.value = 'WarehouseCode'
   // getFormWarehouseList()
+  
 
   resetForm()
   // 修改时，设置数据
@@ -1196,6 +1196,9 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       formLoading.value = false
     }
   } else {
+    if(priority){
+      formData.value.priority = priority
+    }
     Butttondata.value = [
       defaultButtons.formSaveBtn(null), // 保存
       defaultButtons.formCloseBtn(null) // 关闭
@@ -1389,6 +1392,7 @@ const getOverflowLocationCodes = async ()=>{
 
 getOverflowLocationCodes()
 
+
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index 023b5a04c..97ac40a2b 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -110,8 +110,8 @@ const resetQuery = () => {
 
 // 显示弹窗
 const formRef = ref()
-const openForm = (type: string, strategyCode: string, id: number) => {
-  formRef.value.open(type, strategyCode, id)
+const openForm = (type: string, strategyCode: string, id?: number, priority?:number) => {
+  formRef.value.open(type, strategyCode, id, priority)
 }
 
 /** 删除按钮操作 */
@@ -130,9 +130,11 @@ const route = useRoute() // 路由信息
 
 
 // 头部按钮事件 
-const buttonBaseClick = (val, item) => {
+const buttonBaseClick = async (val, item) => {
   if (val == 'add') { // 新增
-    openForm('create', queryParams.strategyCode)
+    await getDefaultPriority()
+
+    openForm('create', queryParams.strategyCode,undefined,defaultPriority.value)
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
@@ -207,13 +209,19 @@ const butttondata = (row) => {
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {
   if (val == 'edit') { // 编辑
-    openForm('update', queryParams.strategyCode, row.id)
+    openForm('update', queryParams.strategyCode, row.id,undefined)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
-
-
+const defaultPriority = ref(0)//默认优先级
+const getDefaultPriority = async ()=>{
+  const res = await RuleApi.getMaxPriority(queryParams.strategyCode)
+  console.log('getMaxPriority',res)
+  if(res){
+    defaultPriority.value = Number(res)
+  }
+}
 /** 初始化 **/
 onMounted( async() => {
   getList()

From 52cee5f603287f66bfa9e28f8a9a01d8228358b1 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 8 Nov 2024 10:14:02 +0800
Subject: [PATCH 067/225] =?UTF-8?q?=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.wyf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.wyf b/.env.wyf
index 2fa7437f1..d3ace2edb 100644
--- a/.env.wyf
+++ b/.env.wyf
@@ -9,11 +9,11 @@ VITE_DEV=false
 # # 上传路径
 # VITE_UPLOAD_URL='http://192.168.0.105:12080/admin-api/infra/file/upload'
 
-# 大哥
+# # 大哥
 # # 请求路径
-# VITE_BASE_URL='http://192.168.1.252:12080'
+# VITE_BASE_URL='http://192.168.0.216:12080'
 # # 上传路径
-# VITE_UPLOAD_URL='http://192.168.1.252:12080/admin-api/infra/file/upload'
+# VITE_UPLOAD_URL='http://192.168.0.216:12080/admin-api/infra/file/upload'
 
 # # 雪冰
 # # # 请求路径

From c459e574d8f044214083e93e5cdda664b11ee077 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 8 Nov 2024 11:30:44 +0800
Subject: [PATCH 068/225] =?UTF-8?q?=E4=B8=B4=E6=9C=9F=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/itembasic/itembasic.data.ts        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index eab07f83c..92749ca25 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -472,6 +472,21 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: '临期提醒天数',
+    field: 'adventReminderDay',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 0
+      }
+    },
+  },
   { label: '备注', field: 'remark', sort: 'custom', isTable: false},
   {
     label: '操作',

From 62416a635c7849b21555d91d9b6d7d7f851594d2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 8 Nov 2024 16:20:48 +0800
Subject: [PATCH 069/225] =?UTF-8?q?HL-6335=E6=94=B6=E5=88=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 58e404fdd..08d712db8 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1138,7 +1138,7 @@ const submitPurchasePass = async (id, submitData) => {
 const formFinanceRef = ref()
 const handleFinanceApp = async (row) => {
   row.postingDate = dayjs().valueOf()
-  row.voucherNumberRemark = `收到${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>5?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-5):row.goldenTaxInvoiceNumber:''}`
+  row.voucherNumberRemark = `收${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>5?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-5):row.goldenTaxInvoiceNumber:''}`
   formFinanceRef.value.open('update', row, null, '财务通过', '财务通过')
 }
 

From 70a059c17a3cf427a642fc2f5d8c801bfbae2c16 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 11 Nov 2024 13:05:03 +0800
Subject: [PATCH 070/225] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptJobMain/index.ts          |  5 +++++
 .../productreceipt/productreceiptJobMain/index.vue  | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index 91f9d4e90..cb318cb37 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -163,3 +163,8 @@ export const closeProductreceiptMain = async (id) => {
 export const executeProductreceiptMain = async (data) => {
   return await request.put({ url: `/wms/productreceipt-job-main/execute`, data})
 }
+
+// 更新任务配置
+export const updateProductreceiptJobConfig = () => {
+  return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptJobConfig'})
+}
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 9f076b485..6ebb47b2b 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -181,6 +181,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -198,6 +199,18 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductreceiptJobMainApi.updateProductreceiptJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 266d4f43eaf84a9ae20f68a61a54609bfef44773 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 11 Nov 2024 13:23:30 +0800
Subject: [PATCH 071/225] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptJobMain/index.ts          |  5 +++++
 .../productreceiptAssembleJobMain/index.vue         | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index cb318cb37..cdb7b0a05 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -167,4 +167,9 @@ export const executeProductreceiptMain = async (data) => {
 // 更新任务配置
 export const updateProductreceiptJobConfig = () => {
   return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptJobConfig'})
+}
+
+// 更新任务配置
+export const updateProductreceiptJobAssembleConfig = () => {
+  return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptJobAssembleConfig'})
 }
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
index 4a8c401c4..a8de9330f 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -120,6 +120,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productreceiptAssemble-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -137,6 +138,18 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductreceiptJobMainApi.updateProductreceiptJobAssembleConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 2ed69e9acd66d5c79bba58df6efefcbb437c224e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 11 Nov 2024 14:26:30 +0800
Subject: [PATCH 072/225] =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=99=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E9=80=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecordFirst/addForm.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index c5a92cfdb..c05c87a1f 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -1408,7 +1408,15 @@ const boxList = ref()
 //   })
 // }
 const inputChange = (val,cur) => {
-  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
+  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '').replace(/\./, '#').replace(/\./, '').replace(/#/, '\.') // 只保留第一个小数点
+  // cur.inspectionValue =
+  // cur.inspectionValue
+  //     .replace(/[^\d^\.^-]+/g, '')   // 把不是数字，不是小数点的过滤掉
+  //     .replace(/^0+(\d)/, '$1')      // 以0开头，0后面为数字，则过滤掉，取后面的数字
+  //     .replace(/^-0+(\d)/, '-$1')    // 以-0开头，0后面为数字，则过滤掉，取后面的数字
+  //     .replace(/-/g, (match: any, offset: number) => offset === 0 ? '-' : '') // 只允许第一个是负号-
+  //     .replace(/\./, '#').replace(/\./, '').replace(/#/, '\.') // 只保留第一个小数点
+
 }
 const inspectionValueInput = (item, cur) => {
   for (

From 1da6b7d839f5691fa1a5c480c0b11cb4b906e95f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 11 Nov 2024 15:28:45 +0800
Subject: [PATCH 073/225] =?UTF-8?q?=E9=95=BF=E5=AE=BD=E9=AB=98=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=98=AF=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageunit/packageunit.data.ts           | 60 +++++++++++++++----
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index eb1d13c75..e517db6da 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -39,7 +39,10 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -48,7 +51,10 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -57,7 +63,10 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -66,7 +75,10 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -383,7 +395,10 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -392,7 +407,10 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -401,7 +419,10 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -410,7 +431,10 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -762,7 +786,10 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -771,7 +798,10 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -780,7 +810,10 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {
@@ -789,7 +822,10 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     form: {
       component: 'InputNumber',
-      value: 0
+      value: 0,
+      componentProps: {
+        min: 0
+      }
     },
   },
   {

From c59ce2b3c6db1b7835cd3c14bc04a56ba144ae3b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 11 Nov 2024 16:54:00 +0800
Subject: [PATCH 074/225] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productredressJobMain/index.ts          |  5 +++++
 .../productredress/productredressJobMain/index.vue  | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts
index 8e90c034c..3c0570c36 100644
--- a/src/api/wms/productredressJobMain/index.ts
+++ b/src/api/wms/productredressJobMain/index.ts
@@ -102,3 +102,8 @@ export const exportProductredressJobMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/productredress-job-main/get-import-template' })
 }
+
+// 更新任务配置
+export const updateProductredressJobConfig = () => {
+  return request.put({ url: '/wms/productredress-job-main/updateProductredressJobConfig'})
+}
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index e44e29c50..1310bf3a3 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -88,6 +88,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productredress-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -97,6 +98,18 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductredressJobMainApi.updateProductredressJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From f036cb63d58794b812d67de8f2cf554ab18cca33 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 12 Nov 2024 11:33:09 +0800
Subject: [PATCH 075/225] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E7=89=88-?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BC=96=E7=A0=81=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/qms/inspectionTemplate/detail.vue b/src/views/qms/inspectionTemplate/detail.vue
index 509c20c43..4e4b2ce77 100644
--- a/src/views/qms/inspectionTemplate/detail.vue
+++ b/src/views/qms/inspectionTemplate/detail.vue
@@ -332,6 +332,7 @@ onMounted(async () => {
   let arr = []
   list.forEach((item, index) => {
     let obj = {
+      code: item.code,
       inspectionCode: item.inspectionCode,
       description: item.description,
       inspectionCharCode: item.inspectionCharCode,

From e302621937f664315c76e069d0088024b19b87af Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 12 Nov 2024 11:51:22 +0800
Subject: [PATCH 076/225] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionScheme/addForm.vue | 90 +++++++++++++---------
 1 file changed, 52 insertions(+), 38 deletions(-)

diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue
index 0586ae2b1..6c9b83b98 100644
--- a/src/views/qms/inspectionScheme/addForm.vue
+++ b/src/views/qms/inspectionScheme/addForm.vue
@@ -910,12 +910,14 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       let arr = []
       list.forEach((item, index) => {
         let obj = {
+          code: item.code,
           inspectionCode: item.inspectionCode,
           description: item.description,
           inspectionCharCode: item.inspectionCharCode,
           sequenceCode: item.sequenceCode,
           name: String(index + 1),
           inspectionCharacteristicsBaseVO: {
+            code: item.inspectionCharacteristicsBaseVO.code,
             description: item.inspectionCharacteristicsBaseVO.description,
             featureType: item.inspectionCharacteristicsBaseVO.featureType,
             inspectionMethodCode: item.inspectionCharacteristicsBaseVO.inspectionMethodCode,
@@ -1388,44 +1390,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
     } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {
-      isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段
-      data.value.programmeTemplateName = val[0].description
-      data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode
-      data.value.dynamicUpdateName = val[0].dynamicUpdateName
-      let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
-      rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
-      rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
-      rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
-      list.forEach((item, index) => {
-        editableTabsValue.value = index + 1
-        item.name = index + 1
-        // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        // 编辑判断上限下限目标值是否必填
-        if (
-          item.inspectionCharacteristicsBaseVO.featureType == 0 &&
-          item.inspectionCharacteristicsBaseVO.quantifyIsCapping
-        ) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
-        }
-        if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
-        }
-        if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
-          rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
-        }
-        if (item.inspectionCharacteristicsBaseVO.sampleType == 4) {
-          isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段
-        }
-      })
-      // 显示aql和检验水平字段的时候添加必填规则
-      if (isShowField.value > 0) {
-        rules.value.aql[0].required = true
-        rules.value.aql[0].required = true
-      } else {
-        rules.value.aql[0].required = false
-        rules.value.aql[0].required = false
-      }
-      data.value.process = list
+      setDataProgrammeTemplateCode(val[0])
     } else if (formField == 'dynamicUpdateCode') {
       data.value[formField] = val[0].code
       data.value.dynamicUpdateName = val[0].description
@@ -1434,6 +1399,48 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
 
   // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
 }
+
+
+const setDataProgrammeTemplateCode = async (dataValue)=>{
+  isShowField.value = 0 //设置isShowField == 0隐藏aql和检验水平字段
+  data.value.programmeTemplateName = dataValue.description
+  data.value['dynamicUpdateCode'] = dataValue.dynamicUpdateCode
+  data.value.dynamicUpdateName = dataValue.dynamicUpdateName
+  let list = await InspectionProcessPageApi.getListByTempleteCode(dataValue.code)
+  rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
+  rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
+  rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
+  list.forEach((item, index) => {
+    editableTabsValue.value = index + 1
+    item.name = index + 1
+    // rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+    // 编辑判断上限下限目标值是否必填
+    if (
+      item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+      item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+    ) {
+      rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = true
+    }
+    if (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit) {
+      rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = true
+    }
+    if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
+      rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
+    }
+    if (item.inspectionCharacteristicsBaseVO.sampleType == 4) {
+      isShowField.value += 1 //设置isShowField > 0显示aql和检验水平字段
+    }
+  })
+  // 显示aql和检验水平字段的时候添加必填规则
+  if (isShowField.value > 0) {
+    rules.value.aql[0].required = true
+    rules.value.aql[0].required = true
+  } else {
+    rules.value.aql[0].required = false
+    rules.value.aql[0].required = false
+  }
+  data.value.process = list
+}
 // 选择是否设定上限值
 const changeIsCapping = (e, item) => {
   item.inspectionCharacteristicsBaseVO.quantifyCapping = ''
@@ -1508,6 +1515,7 @@ const onItemBlur = async (field, pageApi, item) => {
 }
 //失去焦点
 const onBlur = async (field, pageApi, item) => {
+  console.log('onBlur',field, pageApi, item)
   const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value
   if (dataObj[field + 'Code']) {
     const _searchCondition = {}
@@ -1528,6 +1536,7 @@ const onBlur = async (field, pageApi, item) => {
     _searchCondition.isSearch = true
     _searchCondition.filters = filters
     const array = await pageApi(_searchCondition)
+    console.log('array',array)
     Butttondata = [
       defaultButtons.formSaveBtn(null), // 保存
       defaultButtons.formCloseBtn(null) // 关闭
@@ -1541,6 +1550,11 @@ const onBlur = async (field, pageApi, item) => {
       dataObj[field + 'Code'] = ''
       dataObj[field + 'Name'] = ''
     }
+
+
+    if(field == 'programmeTemplate'){ //检验模板
+      setDataProgrammeTemplateCode(obj)
+    }
   } else {
     dataObj[field + 'Name'] = ''
     Butttondata = [

From efeb7ce9b7c7a0a4887d466cb5670da3b47a6ef0 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 12 Nov 2024 17:08:01 +0800
Subject: [PATCH 077/225] =?UTF-8?q?HL-6411WMS=E5=BA=93=E5=AD=98=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=89=93=E5=BC=80=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/transaction/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue
index 2bcfbe349..9b50aa1b5 100644
--- a/src/views/wms/inventoryManage/transaction/index.vue
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@@ -216,7 +216,8 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async() => {
-  getList()
+  // getList()
+  tableObject.loading = false
   // importTemplateData.templateUrl = await TransactionApi.importTemplate()
 })
 </script>

From 8b88cf57c4fb91c7f68c9ab37fe4cbb424c51fac Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 13 Nov 2024 08:54:29 +0800
Subject: [PATCH 078/225] =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartsrequisitionJobMain/index.vue                     | 2 +-
 .../sparepartsrequisitionRecordMain/index.vue                  | 2 +-
 .../sparepartsrequisitionRequestMain/index.vue                 | 2 +-
 .../purchasereceipt/purchasereceiptRequestMain/index.vue       | 3 ++-
 .../purchasereceiptRequestOrderMTypeMain/index.vue             | 2 +-
 .../sparereceipt/sparereceiptRequestMain/index.vue             | 3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
index 401b48728..cf218aa4c 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
@@ -76,7 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
-// 计划外出库任务主
+// 备件领用任务主
 defineOptions({ name: 'UnplannedissueJobMainSpare' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
index a1fb6bb8a..bc1221341 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
@@ -71,7 +71,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
-// 计划外出库记录主
+// 备件领用记录主
 defineOptions({ name: 'UnplannedissueRecordMainSpare' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index a90d628d0..c36915118 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -94,7 +94,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
-// 计划外出库申请
+// 备件领用申请
 defineOptions({ name: 'UnplannedissueRequestMainSpare' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 1a18428fc..68090068d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -1007,7 +1007,8 @@ const tableSelectionDelete = (selection) => {
 }
 const onEnter = async (field,value)=>{
   console.log(field,value)
-  getSearchTableData(value,true)
+  formRef.value.setDefaultBlurValue(field,value)
+  // getSearchTableData(value,true)
 }
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index 55bc94ec4..89f8da48a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -736,7 +736,7 @@ const tableSelectionDelete = (selection) => {
 }
 const onEnter = async (field,value)=>{
   console.log(field,value)
-  getSearchTableData(value,true)
+  formRef.value.setDefaultBlurValue(field,value)
 }
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index e70bcc3b3..de595896b 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -220,7 +220,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 const onEnter = async (field,value)=>{
   console.log(field,value)
-  getSearchTableData(value,true)
+  formRef.value.setDefaultBlurValue(field,value)
+  // getSearchTableData(value,true)
 }
 const updateTableData = (tableList)=>{
   console.log('tableList',tableList)

From d5d6e8c6824449b4be06cd7c4dbc5b12c355a377 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 13 Nov 2024 10:43:55 +0800
Subject: [PATCH 079/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6415=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchaseDetail/index.ts                  | 12 ++++++++++++
 .../purchasereceiptRequestMain.data.ts               |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts
index 4623e6fea..fda3f3623 100644
--- a/src/api/wms/purchaseDetail/index.ts
+++ b/src/api/wms/purchaseDetail/index.ts
@@ -56,6 +56,18 @@ export const getPurchaseDetailPageWMS = async (params) => {
 }
 
 
+// 查询采购订单子列表
+export const getPurchaseDetailPageWMSPurchasereceiptRequest = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-detail/purchasereceiptRequestSeniorWMS', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-detail/purchasereceiptRequestPageWMS`, params })
+  }
+}
+
+
 // 查询M类型的采购订单子列表
 export const getPurchaseDetailPageWMSMOrderType = async (params) => {
   if (params.isSearch) {
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index dee8a1ac0..5ad786120 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -67,7 +67,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         isConcatDetailSchemas:true,//是否是主子表合并 默认false
         searchDetailSchemas:PurchaseDetail.allSchemas,
         searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
+        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMSPurchasereceiptRequest, // 查询弹窗所需分页方法
         isEnter:true,
         searchCondition: [{
           key:'status',

From 8af8f82c65d28b4b07b19211150e8576f25a4646 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 13 Nov 2024 13:39:33 +0800
Subject: [PATCH 080/225] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestOrderMTypeMain/index.vue             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index 89f8da48a..d549e63ba 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -516,7 +516,8 @@ const updateTableData = (tableList)=>{
     // }else{
       newRow['qty'] = row['orderQty']
     // }
-    
+    newRow['orderQty'] = row['orderQty']-row['receivedQty']+row['returnedQty']
+
     if(!tableData.value.find((item:object)=>item.poNumber == newRow.poNumber&&item.itemCode == newRow.itemCode&&item.poLine == newRow.poLine&&item.batch == newRow.batch)){
       tableData.value.push(newRow)
     }

From e942f50b3eb9a5c4188f9dceced4cd33654d743b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 13 Nov 2024 13:46:24 +0800
Subject: [PATCH 081/225] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=9E=E8=BD=A6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/Form.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 33db690db..af48eb620 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -197,6 +197,7 @@ export default defineComponent({
       emit('onChange', field, cur)
     }
     const onSubmit = (event) => {
+      event.preventDefault();
       emit('onSubmit', event)
     }
     

From 3e0f5ed7a43b72977fae3db7c697ded07fb3e18a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 13 Nov 2024 14:31:37 +0800
Subject: [PATCH 082/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6415=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceipt/sparereceiptRequestMain/index.vue              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index de595896b..1fcd12dfe 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -258,7 +258,7 @@ const updateTableData = (tableList)=>{
 const getSearchTableData = async (number,isEnter=false)=>{
   const {tableObject ,tableMethods} = useTable({
     defaultParams:{number},
-    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口
+    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMSSpare // 分页接口
   })
   // 获得表格的各种操作
   const { getList:getList1 } = tableMethods

From 990340d774d59e4ab8874938c112220d95c6a542 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 14 Nov 2024 09:33:55 +0800
Subject: [PATCH 083/225] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=AD=89=E4=BA=8E=E6=94=B6=E8=8E=B7=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestOrderMTypeMain/index.vue              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
index d549e63ba..5011ec837 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue
@@ -514,7 +514,7 @@ const updateTableData = (tableList)=>{
     // if(Number(row['orderQty'])>1){
     //   newRow['qty'] = 1
     // }else{
-      newRow['qty'] = row['orderQty']
+      newRow['qty'] = row['orderQty']-row['receivedQty']+row['returnedQty']
     // }
     newRow['orderQty'] = row['orderQty']-row['receivedQty']+row['returnedQty']
 

From 28785183353ec73315e38a7c6fb00844317e7173 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 14 Nov 2024 11:33:22 +0800
Subject: [PATCH 084/225] =?UTF-8?q?HL-6423QMS=E6=A3=80=E9=AA=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=BE=E7=BD=AE=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=E4=B8=8D=E5=A5=BD?=
 =?UTF-8?q?=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecord/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index 30c69f3e9..b77a70eb7 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -157,6 +157,11 @@ const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns)
 //   }
 // }
 
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
 // 子表新增的时候选择表格之后需要会显得字段
 const { tableObject, tableMethods } = useTable({
   getListApi: InspectionRecordMainApi.getInspectionRecordMainPage // 分页接口

From 1b249bb3072a1c021b6a025809ea3e8670512518 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 14 Nov 2024 14:00:51 +0800
Subject: [PATCH 085/225] =?UTF-8?q?HL-6425=E7=BB=B4=E4=BF=AE=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E9=A2=86=E7=94=A8=E7=94=B3=E8=AF=B7=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8E=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E7=9B=B8=E5=90=8C=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E9=80=89=E6=8B=A9=E7=9A=84=E9=A2=86=E7=94=A8=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0=E5=BC=BA=E5=88=B6=E5=A1=AB=E5=86=99=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=99=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 | 21 +++++++++++++++++++
 .../sparepartsrequisitionRequestMain.data.ts  |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index c36915118..121f4cb1f 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -149,6 +149,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
       if(formField === 'reasonCodeRequisition'){
         setV['reasonCodeRequisition'] = val[0]['code']
+        // 项目是否必填
+        if(UnplannedissueRequestMainRules['projectCode']){
+          UnplannedissueRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE'
+        }
+        UnplannedissueRequestMain.allSchemas.formSchema.forEach((item) => {
+          if (item.field == 'projectCode') {
+            //项目代码
+            if(val[0]['isProject']=='TRUE'){
+              //是-可编辑，可选择
+              item.componentProps.enterSearch = true
+              item.componentProps.isSearchList = true
+              item.componentProps.disabled = false
+            }else{
+              //否-不可编辑，内容为空
+              setV['projectCode'] = ''
+              item.componentProps.enterSearch = false
+              item.componentProps.isSearchList = false
+              item.componentProps.disabled = true
+            }
+          }
+        })
       }
       if(formField === 'projectCode'){
         setV['projectCode'] = val[0]['projectCode']
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index b569ac9fb..03015fddb 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -544,6 +544,9 @@ export const UnplannedissueRequestMainRules = reactive({
   // dueTime: [
   //   { required: true, message: '请输入截止时间', trigger: 'blur' }
   // ],
+  projectCode: [
+    { required: false, message: '请输入项目代码', trigger: 'blur' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],

From a3b4e07e4854b16dc810c60f6a751089b4e8e76d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 14 Nov 2024 16:22:10 +0800
Subject: [PATCH 086/225] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptJobMain/index.ts        |  7 ++++++-
 .../productreceiptscrapJobMain/index.vue          | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index cdb7b0a05..d73319812 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -172,4 +172,9 @@ export const updateProductreceiptJobConfig = () => {
 // 更新任务配置
 export const updateProductreceiptJobAssembleConfig = () => {
   return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptJobAssembleConfig'})
-}
\ No newline at end of file
+}
+
+// 更新任务配置
+export const updateProductreceiptScrapJobConfig = () => {
+  return request.put({ url: '/wms/productreceipt-job-main/updateProductreceiptScrapJobConfig'})
+}
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 577cc44b9..bd7283e31 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -121,6 +121,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productreceiptscrap-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -138,7 +139,19 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductreceiptJobMainApi.updateProductreceiptScrapJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
+  }else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
         filters: tableObject.params.filters

From 2e620a2a752a1b86cec4c742403f711667f50542 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 15 Nov 2024 08:51:50 +0800
Subject: [PATCH 087/225] =?UTF-8?q?HL-6428WMS=20=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E5=A4=84=E7=90=86=E4=B8=AD=E6=97=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=AD=98=E5=9C=A8=E7=94=9F=E6=88=90=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturn/customerreturnRequestMain/index.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index c980f1d34..3fdc49e37 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -351,7 +351,7 @@ const butttondata = (row,$index) => {
         {
       label: '生成标签',
       name: 'ssbq',
-      hide: isShowMainButton(row, ['3','6']),
+      hide: isShowMainButton(row, ['3']),
       type: 'primary',
       icon: '',
       color: '',

From 0e6419a948f8101a33cacf8f4704c8e4b519592d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 15 Nov 2024 09:23:27 +0800
Subject: [PATCH 088/225] =?UTF-8?q?HL-6427SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=82=B9=E5=87=BB=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=90=8E=EF=BC=8C=E8=B4=A2=E5=8A=A1=E5=87=AD=E8=AF=81?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=EF=BC=9A=E6=94=B6+=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=89=8D6=E4=B8=AA=E6=B1=89=E5=AD=97+=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8+=E5=8F=91=E7=A5=A8=E5=8F=B7=E5=90=8E6=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 08d712db8..10ee8e0db 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1138,7 +1138,7 @@ const submitPurchasePass = async (id, submitData) => {
 const formFinanceRef = ref()
 const handleFinanceApp = async (row) => {
   row.postingDate = dayjs().valueOf()
-  row.voucherNumberRemark = `收${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>5?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-5):row.goldenTaxInvoiceNumber:''}`
+  row.voucherNumberRemark = `收${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>6?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-6):row.goldenTaxInvoiceNumber:''}`
   formFinanceRef.value.open('update', row, null, '财务通过', '财务通过')
 }
 

From 5a23a1017abd412d45df074d2bae526f4c6454d7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 15 Nov 2024 15:32:04 +0800
Subject: [PATCH 089/225] =?UTF-8?q?HL-6431WMS=E5=85=81=E8=AE=B8=E5=81=9C?=
 =?UTF-8?q?=E7=94=A8=E7=8A=B6=E6=80=81=E7=89=A9=E6=96=99=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerManage/customeritem/customeritem.data.ts       | 6 +-----
 .../basicDataManage/customerManage/customeritem/index.vue  | 1 +
 .../basicDataManage/itemManage/itemarea/itemarea.data.ts   | 6 +-----
 .../itemManage/itempackage/itempackage.data.ts             | 6 +-----
 .../productionlineitem/productionlineitem.data.ts          | 7 -------
 .../itemManage/stdcostprice/stdcostprice.data.ts           | 6 +-----
 .../supplierManage/supplieritem/supplieritem.data.ts       | 6 +-----
 7 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index 082f012de..e4a1143e2 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -67,11 +67,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
+        searchCondition: [],
         verificationParams: [{
           key: 'code',
           action: '==',
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
index 40ea29d56..e519c085d 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
@@ -74,6 +74,7 @@ import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
+// 客户物料
 defineOptions({ name: 'Customeritem' })
 
 const message = useMessage() // 消息弹窗
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index 98b205c6f..d9e53d1ec 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -34,11 +34,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
+        searchCondition: [],
         verificationParams: [{
           key: 'code',
           action: '==',
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index bd8739244..9e970b878 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -30,11 +30,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
+        searchCondition: [],
         verificationParams: [{
           key: 'code',
           action: '==',
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index 34b928016..61c1e764a 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -139,13 +139,6 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
           action: 'notin',
           isSearch: true,
           isMainValue: false
-        },
-        {
-          key:'available',
-          value:'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
         }
       ]
       }
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
index c8bc2b996..be4f5f274 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
@@ -66,11 +66,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
         //   value:'supplierCode',
         //   isMainValue: true
         // },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-          }],
+        ],
         verificationParams: [{
           key: 'code',
           action: '==',
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index d1c0fe5b7..c53781342 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -87,11 +87,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
         searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
+        searchCondition: [],
         verificationParams: [{
           key: 'code',
           action: '==',

From 5d24ba63bd5b56323d71391012f5a63bfd700a92 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 15 Nov 2024 15:48:48 +0800
Subject: [PATCH 090/225] =?UTF-8?q?HL-6424SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8=E6=9C=89?=
 =?UTF-8?q?=E4=BB=B7=E5=B7=AE=E7=9A=84=E5=8F=91=E7=A5=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=A1=AB=E5=86=99=E7=9A=84=E4=BB=B7=E5=B7=AE=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E8=AF=B4=E6=98=8E=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 10ee8e0db..6d3d43bd1 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -229,6 +229,7 @@
     :isBusiness="false"
     :footButttondata="undefined"
     @success="submitPurchasePass"
+    @onChange="onChangePurchasePass"
   />
   <!-- 详情 -->
   <!-- :apiUpdate="SupplierinvoiceRequestDetailApi.updateSupplierinvoiceRequestDetail" -->
@@ -1107,10 +1108,20 @@ const handleSub = async (id: number) => {
     tableObject.loading = false
   }
 }
-
+const onChangePurchasePass = (field, cur, formRef)=>{
+  console.log('onChangePurchasePass',field, cur, formRef)
+  if(field=='balanceStatement'){
+    formRef.value.setValues({
+      'balanceStatement':cur.trim()
+    })
+  }
+}
 /** 采购审批通过按钮操作 */
 const submitPurchasePass = async (id, submitData) => {
   console.log(submitData)
+  if(!submitData?.balanceStatement.trim()){
+    message.error('请输入价差通过说明')
+  }
   const id1 = submitData?.id || id
 
   console.log(id1)

From d5b3f9f82a59a49a2d44baf9e6da6331228fc7c9 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 15 Nov 2024 16:46:05 +0800
Subject: [PATCH 091/225] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E8=AF=A2=E8=AF=81?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/src/Search.vue          | 11 +++++++-
 .../supplierApbalanceMain/index.vue           | 27 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index 81f58b97d..1fbda34ed 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -273,6 +273,14 @@ const reset = async () => {
   emit('reset', model)
 }
 
+const getSearchFormData = async () => {
+  await unref(elFormRef)?.validate()
+  const { getFormData } = methods
+  const model = await getFormData()
+  console.log(model)
+  return model
+}
+
 const bottonButtonStyle = computed(() => {
   return {
     textAlign: props.buttomPosition as unknown as 'left' | 'center' | 'right'
@@ -293,7 +301,7 @@ const onBlur = async (field, e) => {
 }
 const Search = ref()
 onMounted(() => {})
-defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
+defineExpose({setFormValues,search,getSearchFormData}) // 提供 open 方法，用于打开弹窗
 
 </script>
 
@@ -319,6 +327,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
     >
       <template #action>
         <div v-if="layout === 'inline'">
+          <slot name="actionMoreTop"></slot>
           <!-- update by 芋艿：去除搜索的 type="primary"，颜色变淡一点 -->
           <ElButton type="info" plain v-if="showSearch" @click="search">
             <Icon class="mr-5px" icon="ep:search" />
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 4586e8290..2467d4b97 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -17,6 +17,13 @@
           <el-option v-for="dict in dayList" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </template>
+      <template #actionMoreTop>
+        <el-button type="primary"   @click="confirmationHandle">
+          <Icon class="mr-5px" icon="ep:" />
+          询证
+          <Icon class="ml-5px" icon="ep:" />
+        </el-button>
+      </template>
     </Search>
   </ContentWrap>
 
@@ -347,7 +354,27 @@ const getMonthDay = async ()=>{
     console.log('monthList',monthList.value)
   }
 }
+// 询证回调
+const confirmationHandle = async ()=>{
+  let searchData =  await searchRef.value.getSearchFormData() 
+  if((year.value||month.value||day.value)&&(!year.value||!month.value||!day.value)){
+    message.error('请选择年月日')
+    return
+  }
+  if(month.value.length==1){
+    month.value = '0'+month.value
+  }
+  if((''+day.value).length==1){
+    day.value = '0' + day.value
+  }
+  if(year.value&&month.value&&day.value){
+    // 年-月-日  `${year.value}-${month.value}-${day.value}`
+  }
+  //供应商代码 searchData.ttSupplier
+
 
+
+}
 const searchRef = ref()
 // 日期
 const dayList = ref([])

From ff54af3652d2e5cbfb1649c07ede02ea58d989ff Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 15 Nov 2024 17:08:49 +0800
Subject: [PATCH 092/225] =?UTF-8?q?=E8=AF=A2=E8=AF=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8QAD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierApbalanceMain/index.ts               | 5 +++++
 .../supplierApbalance/supplierApbalanceMain/index.vue    | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/supplierApbalanceMain/index.ts b/src/api/wms/supplierApbalanceMain/index.ts
index a3cdc8940..e1f105182 100644
--- a/src/api/wms/supplierApbalanceMain/index.ts
+++ b/src/api/wms/supplierApbalanceMain/index.ts
@@ -77,3 +77,8 @@ export const getMonthDay = async () => {
   return await request.get({ url: `/wms/supplier-apbalance-calendar/getMonthDay`})
 }
 
+
+// 查询供应商余额明细主列表
+export const confirmationPage = async (params) => {
+    return await request.get({ url: `/wms/supplier-apbalance-main/confirmationPage`, params })
+}
\ No newline at end of file
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 2467d4b97..97f94a0d7 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -371,9 +371,12 @@ const confirmationHandle = async ()=>{
     // 年-月-日  `${year.value}-${month.value}-${day.value}`
   }
   //供应商代码 searchData.ttSupplier
-
-
-
+  let param = {
+    "ttCompany":searchData.ttCompany,
+    "ttSupplier":searchData.ttSupplier,
+    "searchTime": `${year.value}-${month.value}-${day.value}`
+  }
+  SupplierApbalanceMainApi.confirmationPage(param)
 }
 const searchRef = ref()
 // 日期

From bb5eefa17835c3faeaa0153adfd413015978ba39 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 18 Nov 2024 09:25:55 +0800
Subject: [PATCH 093/225] =?UTF-8?q?HL-6424=E6=B2=A1=E6=9C=89=E4=BB=B7?=
 =?UTF-8?q?=E5=B7=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E9=80=9A=E8=BF=87=E6=97=B6=EF=BC=8C=E4=BC=9A=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=8F=90=E7=A4=BA=E3=80=82=E6=B2=A1=E6=9C=89=E4=BB=B7?=
 =?UTF-8?q?=E5=B7=AE=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=AF=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=8F=90=E7=A4=BA=20@=E7=8E=8B=E5=AE=87=E9=A3=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 6d3d43bd1..5b35f05bb 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1119,8 +1119,9 @@ const onChangePurchasePass = (field, cur, formRef)=>{
 /** 采购审批通过按钮操作 */
 const submitPurchasePass = async (id, submitData) => {
   console.log(submitData)
-  if(!submitData?.balanceStatement.trim()){
+  if(submitData&&!submitData.balanceStatement.trim()){
     message.error('请输入价差通过说明')
+    return
   }
   const id1 = submitData?.id || id
 

From 37c8f19059396bbec25c838cd2f5e6bb78709f2d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 18 Nov 2024 13:13:12 +0800
Subject: [PATCH 094/225] =?UTF-8?q?=E8=AF=A2=E8=AF=81=E5=87=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceMain.data.ts             | 57 ++++++++++++++++---
 1 file changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 858334c5b..55da558ad 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -88,9 +88,9 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm:false,
     isDetail:false,
-                form: {
-                  component: 'SelectV2'
-                },
+    form: {
+      component: 'SelectV2'
+    },
   },
   {
     label: '名称1',
@@ -150,23 +150,62 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   },
   // },
+  {
+    label: '年度',
+    field: 'ttYear',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '月度',
+    field: 'ttPeriod',
+    sort: 'custom',
+    isSearch: false,
+  },
   {
     label: '应付挂账金额',
-    field: 'ttAccountAp',
+    field: 'ttYfAmt',
     sort: 'custom',
     isSearch: false,
+    table: {
+      width: 120,
+    }
   },
   {
     label: '其他应付金额',
-    field: 'ttAccountOthap',
+    field: 'ttQtyfAmt',
     sort: 'custom',
     isSearch: false,
+    table: {
+      width: 120,
+    }
   },
   {
     label: '预付金额',
-    field: 'ttAccountPrepay',
+    field: 'ttPreAmt',
     sort: 'custom',
     isSearch: false,
+    table: {
+      width: 120,
+    }
+  },
+  {
+    label: '暂估余额',
+    field: 'ttZgAmt',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120,
+    }
+  },
+  {
+    label: '活动金额',
+    field: 'ttActAmt',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120,
+    }
   },
   {
     label: '付款周期',
@@ -194,13 +233,16 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 180,
+    }
   },
   {
     label: '创建人',
     field: 'creator',
     sort: 'custom',
     isSearch: false,
-    isTable: true,
+    isTable: false,
     isForm:false,
     isDetail:false,
   },
@@ -218,6 +260,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
   },
   {
     label: '地点ID',

From bc657a91ad2e52c87111e11c9baca3c96a945c06 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 18 Nov 2024 14:06:22 +0800
Subject: [PATCH 095/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6412=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=81=E5=87=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceCalendar/index.vue              |  4 ----
 .../supplierApbalanceCalendar.data.ts                | 12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index 191636fa7..41e495da9 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -182,10 +182,6 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  if(endDay.value<beginDay.value){
-    message.error('结束日期不能小于开始日期')
-    return;
-  }
   var isHave =SupplierApbalanceCalendar.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime';
   });
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
index b1d91b15b..91b17d3b4 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
@@ -38,7 +38,7 @@ export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '开始日期',
+    label: '日期',
     field: 'beginDay',
     sort: 'custom',
   },
@@ -47,11 +47,11 @@ export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
   //   field: 'endMonth',
   //   sort: 'custom',
   // },
-  {
-    label: '结束日期',
-    field: 'endDay',
-    sort: 'custom',
-  },
+  // {
+  //   label: '结束日期',
+  //   field: 'endDay',
+  //   sort: 'custom',
+  // },
   {
     label: '描述',
     field: 'descriiption',

From 2ec9280709563dbab4bad8f2b1f3c31e08bd7ec6 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 18 Nov 2024 14:23:44 +0800
Subject: [PATCH 096/225] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E7=AE=A1=E7=90=86--=20=E6=97=A5=E6=9C=9F=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=A4=9A=E5=80=BC=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 97f94a0d7..3a095656d 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -391,11 +391,11 @@ const selectChange = (value,field)=>{
     //更新日期数组
     let dayObj = daysInMonths.value.find(item=>item['beginMonth']==month.value)
     if(dayObj){
-      for(let i= Number(dayObj['beginDay']);i<=Number(dayObj['endDay']);i++){
-        dayList.value.push({
-            label:i,
-            value:i
-        })
+      if(Array.isArray(dayObj['beginDay'])){
+        dayList.value = dayObj['beginDay'].map(item=>({
+          label:item,
+          value:item
+        }))
       }
     }
     if(dayList.value.length>0){

From 7795d3c289f3d8a3f87d1302b959f9882ab74e07 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 18 Nov 2024 14:35:31 +0800
Subject: [PATCH 097/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6412=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=81=E5=87=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 3a095656d..4e868d52a 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -376,7 +376,14 @@ const confirmationHandle = async ()=>{
     "ttSupplier":searchData.ttSupplier,
     "searchTime": `${year.value}-${month.value}-${day.value}`
   }
-  SupplierApbalanceMainApi.confirmationPage(param)
+  try {
+    loadStart()
+    await SupplierApbalanceMainApi.confirmationPage(param)
+  } catch {
+  } finally {
+    getList() // 刷新当前列表
+    loadDone()
+  }
 }
 const searchRef = ref()
 // 日期

From cff863348ebb07402e4c2568fa525fc6530823c9 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 18 Nov 2024 14:51:15 +0800
Subject: [PATCH 098/225] =?UTF-8?q?=E8=AF=B7=E9=80=89=E6=8B=A9=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=90=8E=E5=9C=A8=E7=82=B9=E5=87=BB=E8=AF=A2=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 4e868d52a..cf6c5265b 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -357,8 +357,8 @@ const getMonthDay = async ()=>{
 // 询证回调
 const confirmationHandle = async ()=>{
   let searchData =  await searchRef.value.getSearchFormData() 
-  if((year.value||month.value||day.value)&&(!year.value||!month.value||!day.value)){
-    message.error('请选择年月日')
+  if(!year.value||!month.value||!day.value){
+    message.error('请选择日期后在点击询证')
     return
   }
   if(month.value.length==1){

From 5771f3187fcf57432b78c8592c491fa6ef5690b6 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 18 Nov 2024 14:51:51 +0800
Subject: [PATCH 099/225] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index cf6c5265b..7f035807c 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -358,7 +358,7 @@ const getMonthDay = async ()=>{
 const confirmationHandle = async ()=>{
   let searchData =  await searchRef.value.getSearchFormData() 
   if(!year.value||!month.value||!day.value){
-    message.error('请选择日期后在点击询证')
+    message.error('请选择日期后再点击询证')
     return
   }
   if(month.value.length==1){

From 56b4dfcf0c82c3f179b39ce8b16b5f269040e1f5 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 18 Nov 2024 15:27:02 +0800
Subject: [PATCH 100/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6412=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=81=E5=87=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 7f035807c..2b257d6ff 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -381,7 +381,8 @@ const confirmationHandle = async ()=>{
     await SupplierApbalanceMainApi.confirmationPage(param)
   } catch {
   } finally {
-    getList() // 刷新当前列表
+    searchClick(searchData)
+    // getList() // 刷新当前列表
     loadDone()
   }
 }

From 6b77cb2c25eaa4225d16428acd2955b9dc9996d0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 18 Nov 2024 16:30:31 +0800
Subject: [PATCH 101/225] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 55da558ad..28d926bf0 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -123,7 +123,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商名称',
     field: 'ttSupplierName',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
   },
   // {
   //   label: '生成时间',

From 3360ae4676edc59dea599b6e84b77ec8ced5ffce Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 18 Nov 2024 17:04:51 +0800
Subject: [PATCH 102/225] =?UTF-8?q?HL-6421=20=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B7=B2=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierinvoiceInvoiced/index.ts  |  12 +
 .../index.vue                                 | 314 ++++++++++++++++++
 .../supplierinvoiceInvoiced.data.ts           | 284 ++++++++++++++++
 3 files changed, 610 insertions(+)
 create mode 100644 src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
 create mode 100644 src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/supplierinvoiceInvoiced.data.ts

diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts
index 2271cdf16..6cd9ac709 100644
--- a/src/api/wms/supplierinvoiceInvoiced/index.ts
+++ b/src/api/wms/supplierinvoiceInvoiced/index.ts
@@ -45,6 +45,18 @@ export const getSupplierinvoiceInvoicedPageDiscrete = async (params) => {
   }
 }
 
+// 查询待开票列表--日程/离散
+export const getSupplierinvoiceInvoicedPageScheduleDeleted = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierinvoice-invoiced/seniorDeleted', data })
+  } else {
+    return await request.get({ url: `/wms/supplierinvoice-invoiced/deletedPage`, params })
+  }
+}
+
+
 
 // 查询待开票详情
 export const getSupplierinvoiceInvoiced = async (id: number) => {
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
new file mode 100644
index 000000000..88ea8b7fb
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
@@ -0,0 +1,314 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SupplierinvoiceInvoiced.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SupplierinvoiceInvoiced.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table v-clientTable
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, t('ts.代码'), row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SupplierinvoiceInvoicedRules"
+    :formAllSchemas="SupplierinvoiceInvoiced.allSchemas"
+    :apiUpdate="SupplierinvoiceInvoicedApi.updateSupplierinvoiceInvoiced"
+    :apiCreate="SupplierinvoiceInvoicedApi.createSupplierinvoiceInvoiced"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierinvoiceInvoiced.allSchemas" />
+
+  <!-- 导入 -->
+  <!-- <ImportForm ref="importFormRef" url="/wms/supplierinvoice-invoiced/import" :importTemplateData="importTemplateData" @success="importSuccess" /> -->
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SupplierinvoiceInvoiced,SupplierinvoiceInvoicedRules } from './supplierinvoiceInvoiced.data'
+import * as SupplierinvoiceInvoicedApi from '@/api/wms/supplierinvoiceInvoiced'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
+defineOptions({ name: 'SupplierinvoiceInvoiced' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierinvoiceInvoiced.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierinvoiceInvoicedApi.getSupplierinvoiceInvoicedPageScheduleDeleted // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) =>{
+  return [
+    // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
+    // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}),
+    {
+      label: t('ts.审核通过'),
+      name: 'agree',
+      hide: isShowMainButton(row, ['1']),
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: 'wms:supplierinvoice-invoiced:agree'
+    },
+    {
+      label: t('ts.作废'),
+      name: 'refuse',
+      hide: isShowMainButton(row, ['1']),
+      type: 'danger',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: 'wms:supplierinvoice-invoiced:refuse'
+    }
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if(val == 'agree'){//审核通过
+    handleAgree(row.id)
+  } else if(val == 'refuse'){//作废
+    handleRefuse(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =SupplierinvoiceInvoiced.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error(t('ts.失效时间要大于生效时间'))
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await SupplierinvoiceInvoicedApi.createSupplierinvoiceInvoiced(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SupplierinvoiceInvoicedApi.updateSupplierinvoiceInvoiced(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'qadSupplierinvoiceInvoiced')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SupplierinvoiceInvoicedApi.deleteSupplierinvoiceInvoiced(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id : number) => {
+  try {
+    // 审批通过的二次确认
+    await message.confirm(t('ts.是否审批通过所选中数据？'))
+    tableObject.loading = true
+    // 发起审批通过
+    await SupplierinvoiceInvoicedApi.agreeSupplierinvoiceInvoiced(id)
+    message.success(t('ts.审批通过成功!'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch { }finally{
+    tableObject.loading = false
+  }
+}
+
+
+/** 审批通过按钮操作 */
+const handleRefuse = async (id : number) => {
+  try {
+    // 审批通过的二次确认
+    await message.confirm(t('ts.是否审批拒绝所选中数据？'))
+    tableObject.loading = true
+    // 发起审批通过
+    await SupplierinvoiceInvoicedApi.refuseSupplierinvoiceInvoiced(id)
+    message.success(t('ts.审批成功!'))
+    tableObject.loading = false
+    // 刷新列表
+    await getList()
+  } catch { }finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await SupplierinvoiceInvoicedApi.exportSupplierinvoiceInvoicedSchedule(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // importTemplateData.templateUrl = await SupplierinvoiceInvoicedApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/supplierinvoiceInvoiced.data.ts
new file mode 100644
index 000000000..51a203719
--- /dev/null
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/supplierinvoiceInvoiced.data.ts
@@ -0,0 +1,284 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+// 表单校验
+export const SupplierinvoiceInvoicedRules = reactive({
+  supplierCode: [required],
+  poNumber: [required],
+  currency: [required],
+  concurrencyStamp: [required],
+})
+
+export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnBillNum',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商送货日期',
+    field: 'supplierDeliveryTime',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '收货日期',
+    field: 'prhRcpDate',
+    sort: 'custom',
+    isSearch: true,
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '项目编码',
+    field: 'projectCode',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据类型',
+    field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+
+  // {
+  //   label: '发票申请状态',
+  //   field: 'requestStatus',
+  //   dictType: DICT_TYPE.INVOICE_REQUEST_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   isForm:false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch: false,
+  //   form: {
+  //     value: '1',
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
+
+
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '采购价格',
+    field: 'purchasePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '票据总数',
+    field: 'invoicableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '实际开票数量',
+    field: 'issuedInvoicableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '可开票数量',
+    field: 'invoiceAvailableQuantity',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '零件号',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', 
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货币',
+    field: 'currency',
+    sort: 'custom',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      type:'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))

From c6ef0f31cbf3f29c073cfb9dcd3b7c2e01e94e38 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 18 Nov 2024 17:05:44 +0800
Subject: [PATCH 103/225] =?UTF-8?q?HL-6421=20=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B7=B2=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierinvoiceInvoiced/index.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts
index 6cd9ac709..88e303e78 100644
--- a/src/api/wms/supplierinvoiceInvoiced/index.ts
+++ b/src/api/wms/supplierinvoiceInvoiced/index.ts
@@ -45,15 +45,9 @@ export const getSupplierinvoiceInvoicedPageDiscrete = async (params) => {
   }
 }
 
-// 查询待开票列表--日程/离散
+// 查询待开票被删除列表--日程/离散
 export const getSupplierinvoiceInvoicedPageScheduleDeleted = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/wms/supplierinvoice-invoiced/seniorDeleted', data })
-  } else {
     return await request.get({ url: `/wms/supplierinvoice-invoiced/deletedPage`, params })
-  }
 }
 
 

From 92f525f33c30cf97a115485785d7e837fb3b37e5 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Tue, 19 Nov 2024 10:34:41 +0800
Subject: [PATCH 104/225] =?UTF-8?q?HL-6421=20=E6=81=A2=E5=A4=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B7=B2=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierinvoiceInvoiced/index.ts  |  6 +++++
 src/utils/disposition/defaultButtons.ts       | 12 +++++++++
 .../index.vue                                 | 26 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts
index 88e303e78..2be01466c 100644
--- a/src/api/wms/supplierinvoiceInvoiced/index.ts
+++ b/src/api/wms/supplierinvoiceInvoiced/index.ts
@@ -96,4 +96,10 @@ export const agreeSupplierinvoiceInvoiced = async (id: number) => {
 // 审批拒绝待开票
 export const refuseSupplierinvoiceInvoiced = async (id: number) => {
   return await request.post({ url: `/wms/supplierinvoice-invoiced/refuse?id=` + id })
+}
+
+
+// 恢复被删除的待开票
+export const receverySupplierinvoiceInvoiced = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-invoiced/recevery?id=` + id })
 }
\ No newline at end of file
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index e693de83d..ee1e4b756 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -463,6 +463,18 @@ export function mainListFinishBtn(option: any) {
   })
 }
 
+// 待开票被删除数据-恢复按钮
+export function mainListReceveryBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.恢复`).replace('ts.', ''),
+    name: 'recevery',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 export function mainListSendBtn(option: any) {
   return __defaultBtnOption(option, {
     label: t(`ts.发送邮件`).replace('ts.', ''),
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
index 88ea8b7fb..5bdfc78f5 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
@@ -146,7 +146,7 @@ const butttondata = (row) =>{
   return [
     // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
-    // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}),
+    defaultButtons.mainListReceveryBtn({hasPermi:'wms:supplierinvoice-invoiced:recevery'}),//恢复
     {
       label: t('ts.审核通过'),
       name: 'agree',
@@ -164,6 +164,15 @@ const butttondata = (row) =>{
       color: '',
       link: true, // 文本展现按钮
       hasPermi: 'wms:supplierinvoice-invoiced:refuse'
+    },
+    {
+      label: t('ts.恢复'),
+      name: 'recevery',
+      hide: isShowMainButton(row, ['1']),
+      type: 'danger',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: 'wms:supplierinvoice-invoiced:recevery'
     }
   ]
 }
@@ -178,6 +187,8 @@ const buttonTableClick = async (val, row) => {
     handleAgree(row.id)
   } else if(val == 'refuse'){//作废
     handleRefuse(row.id)
+  }else if(val == 'recevery'){//恢复
+    handleRecevery(row.id)
   }
 }
 
@@ -230,6 +241,19 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
+/** 恢复按钮操作 */
+const handleRecevery = async (id: number) => {
+  try {
+    // 恢复的二次确认
+    await message.delConfirm()
+    // 发起恢复
+    await SupplierinvoiceInvoicedApi.receverySupplierinvoiceInvoiced(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** 审批通过按钮操作 */
 const handleAgree = async (id : number) => {
   try {

From 842a3091d8e6cb7b020f9e417341fc66e377c2dc Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Tue, 19 Nov 2024 11:10:02 +0800
Subject: [PATCH 105/225] =?UTF-8?q?=E5=BE=85=E5=BC=80=E7=A5=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierinvoiceInvoicedDiscrete/index.vue    | 2 +-
 .../supplierManage/supplierinvoiceInvoicedSchedule/index.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue
index 6796b9b69..f94068de2 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue
@@ -145,7 +145,7 @@ const buttonBaseClick = (val, item) => {
 const butttondata = (row) =>{
   return [
     // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), // 编辑
-    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
     // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}),
     {
       label: t('ts.审核通过'),
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue
index caebb3108..ce444d982 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue
@@ -145,7 +145,7 @@ const buttonBaseClick = (val, item) => {
 const butttondata = (row) =>{
   return [
     // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}), // 编辑
-    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
+    defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-invoiced:delete'}), // 删除
     // defaultButtons.mainListEditBtn({hasPermi:'wms:supplierinvoice-invoiced:update'}),
     {
       label: t('ts.审核通过'),

From dd0441b99f49be56c455055b5d86be103dd79d94 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Tue, 19 Nov 2024 11:18:02 +0800
Subject: [PATCH 106/225] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceInvoicedScheduleDeleted/index.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
index 5bdfc78f5..0b739ebb6 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
@@ -245,10 +245,10 @@ const handleDelete = async (id: number) => {
 const handleRecevery = async (id: number) => {
   try {
     // 恢复的二次确认
-    await message.delConfirm()
+    await message.confirm(t('是否恢复所选中数据？'))
     // 发起恢复
     await SupplierinvoiceInvoicedApi.receverySupplierinvoiceInvoiced(id)
-    message.success(t('common.delSuccess'))
+    message.success(t('恢复成功!'))
     // 刷新列表
     await getList()
   } catch {}

From 87bb68cfe74bfce31058cba5b877dfb074f261e8 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 19 Nov 2024 14:17:37 +0800
Subject: [PATCH 107/225] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productputawayJobMain/index.ts        |  7 ++++++-
 .../productputawayJobMain/index.vue               | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/productputawayJobMain/index.ts b/src/api/wms/productputawayJobMain/index.ts
index d9379684f..32a1874b6 100644
--- a/src/api/wms/productputawayJobMain/index.ts
+++ b/src/api/wms/productputawayJobMain/index.ts
@@ -129,4 +129,9 @@ export const closeProductputawayMain = async (id) => {
 // 执行发料任务
 export const executeProductputawayMain = async (data) => {
   return await request.put({ url: `/wms/productputaway-job-main/execute`, data})
-}
\ No newline at end of file
+}
+
+// 更新任务配置
+export const updateProductputawayJobConfig = () => {
+  return request.put({ url: '/wms/productputaway-job-main/updateProductputawayJobConfig'})
+}
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 0fc3c3863..563a1d1bc 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -138,6 +138,7 @@ const getSwitchStatus = async ()=>{
 const HeadButttondata = computed(()=>{
   return [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   {
       label: '待处理状态全部打印',
       name: 'printAllPending',
@@ -157,7 +158,19 @@ const HeadButttondata = computed(()=>{
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductputawayJobMainApi.updateProductputawayJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
+  }else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
         filters: tableObject.params.filters

From 181aa585a4b0f2efa2c042d3a3727cce30aeb433 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 19 Nov 2024 14:41:39 +0800
Subject: [PATCH 108/225] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productputawayJobMain/index.ts          |  5 +++++
 .../productputawayAssembleJobMain/index.vue         | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/api/wms/productputawayJobMain/index.ts b/src/api/wms/productputawayJobMain/index.ts
index 32a1874b6..657ab6f95 100644
--- a/src/api/wms/productputawayJobMain/index.ts
+++ b/src/api/wms/productputawayJobMain/index.ts
@@ -135,3 +135,8 @@ export const executeProductputawayMain = async (data) => {
 export const updateProductputawayJobConfig = () => {
   return request.put({ url: '/wms/productputaway-job-main/updateProductputawayJobConfig'})
 }
+
+// 更新任务配置装配
+export const updateProductputawayJobAssembleConfig = () => {
+  return request.put({ url: '/wms/productputaway-job-main/updateProductputawayJobAssembleConfig'})
+}
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index 41ebf2409..51066971a 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -138,6 +138,7 @@ const getSwitchStatus = async ()=>{
 const HeadButttondata = computed(()=>{
   return [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   {
       label: '待处理状态全部打印',
       name: 'printAllPending',
@@ -159,6 +160,18 @@ const HeadButttondata = computed(()=>{
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductputawayJobMainApi.updateProductputawayJobAssembleConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({

From 7fb7585383fd199771d9b124d1218a27efb63c47 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Tue, 19 Nov 2024 15:27:40 +0800
Subject: [PATCH 109/225] =?UTF-8?q?HL-6421=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceInvoicedScheduleDeleted/index.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
index 0b739ebb6..230d73168 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedScheduleDeleted/index.vue
@@ -111,9 +111,9 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',

From 1f0966b3ef2e1d84754a7d2dcbd7621126160d02 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 20 Nov 2024 10:23:16 +0800
Subject: [PATCH 110/225] =?UTF-8?q?=E8=AE=AD=E8=AF=81=20=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index 2b257d6ff..c1a14dd22 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -149,6 +149,7 @@ const updataTableColumns = (val) => {
 const { tableObject, tableMethods } = useTable({
   getListApi: SupplierApbalanceMainApi.getSupplierApbalanceMainPage // 分页接口
 })
+tableObject.params.actionType = 'search'
 
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
@@ -381,7 +382,7 @@ const confirmationHandle = async ()=>{
     await SupplierApbalanceMainApi.confirmationPage(param)
   } catch {
   } finally {
-    searchClick(searchData)
+    searchClick(searchData,'confirmation')
     // getList() // 刷新当前列表
     loadDone()
   }
@@ -423,7 +424,7 @@ const resetClick = async (data)=>{
   searchClick(data)
 }
 
-const searchClick = async (data)=>{
+const searchClick = async (data,actionType="search")=>{
   if((data['year']||data['month']||data['day'])&&(!data['year']||!data['month']||!data['day'])){
     message.error('请选择年月日')
     return
@@ -437,6 +438,7 @@ const searchClick = async (data)=>{
   if(data['year']&&data['month']&&data['day']){
     data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}`
   }
+  tableObject.params.actionType = actionType
   setSearchParams(data)
 }
 /** 初始化 **/

From f16786932822298f369b0b3d2a642e19f000badf Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Nov 2024 10:46:24 +0800
Subject: [PATCH 111/225] =?UTF-8?q?=E8=AF=A2=E8=AF=81=E5=87=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalanceMain/index.vue           |  2 +-
 .../supplierApbalanceMain.data.ts             | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index c1a14dd22..d91377e95 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -160,7 +160,7 @@ const HeadButttondata = [
   //defaultButtons.defaultImportBtn({hasPermi:'wms:supplier-apbalance-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplier-apbalance-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  //defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 28d926bf0..583c1d615 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -216,6 +216,30 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
     isDetail:false,
   },
+  {
+    label: '打印开始时间',
+    field: 'printStart',
+    sort: 'custom',
+    isSearch: false,
+    isTable: true,
+    isForm:false,
+    isDetail:false,
+    table: {
+      width: 120,
+    }
+  },
+  {
+    label: '打印结束时间',
+    field: 'printEnd',
+    sort: 'custom',
+    isSearch: false,
+    isTable: true,
+    isForm:false,
+    isDetail:false,
+    table: {
+      width: 120,
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',

From 234981fd2eddc5ecc291d3d61983b8ab5cc03f6c Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Nov 2024 11:10:58 +0800
Subject: [PATCH 112/225] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseDiscreteOrderMain.data.ts              | 14 ++++++++++++++
 .../supplierinvoiceRecordMain.data.ts              | 14 ++++++++++++++
 .../supplierinvoiceRequestMain.data.ts             | 14 ++++++++++++++
 .../supplierinvoiceRequestMainDifference.data.ts   | 14 ++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts
index 47515e88f..6e077ff37 100644
--- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts
@@ -496,6 +496,20 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
   },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   {
     label: '财务凭证号',
     field: 'voucherNumber',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 3f551943e..6224e082d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -471,6 +471,20 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
   },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   {
     label: '财务凭证号',
     field: 'voucherNumber',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 89aa1311d..04db901dc 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -250,6 +250,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
     isForm: false,
   },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   {
     label: '供应商维护未税金额',
     field: 'amount',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index 569bfbc44..a64708f61 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -241,6 +241,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true,
     isForm: false,
   },
+  {
+    label: '待开票单据号',
+    field: 'recvBillNum',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isTableForm:false,
+    isTable:false,
+    isDetail:false,
+    isSearch: true,
+    isForm: false,
+  },
   {
     label: '供应商维护未税金额',
     field: 'amount',

From 2f8f9c9a8bf6e1addcc54de8eed6d88cd709557b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 20 Nov 2024 13:30:29 +0800
Subject: [PATCH 113/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6412=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierApbalance/supplierApbalanceMain/index.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index d91377e95..f8a8d9696 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -256,7 +256,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
 const BASE_URL = getJmreportBaseUrl()
 const src = ref(BASE_URL + '/jmreport/view/973017727126409216?token=' + getAccessToken())
 const handlePrint = async (row) => {
-  window.open(src.value+'&id='+row.id+'&searchTime='+`${tableObject.params.searchTime||''}`)
+  window.open(src.value+'&id='+row.id+'&searchTime='+`${tableObject.params.searchTime||''}`+'&actionType='+`${tableObject.params.actionType||''}`)
 }
 
 

From 44ab4552fe8774999bd9c7a4632e08eca79ba9ed Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 25 Nov 2024 10:09:41 +0800
Subject: [PATCH 114/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6441=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue
index b77a70eb7..5d96ad648 100644
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@@ -512,7 +512,7 @@ const searchFormClick = (searchData) => {
       )
     } else {
       searchData.filters.push({
-        action: 'notIn',
+        action: 'notin',
         column: 'inspectionType',
         value: '1,4,11'
       })

From e5d22c34d904bfed68af46bae5304da8968a01d9 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 25 Nov 2024 16:34:59 +0800
Subject: [PATCH 115/225] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegateRequestMain.data.ts               | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 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 c1ee6008b..0c61fb19e 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -19,6 +19,8 @@ import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackag
 import * as SupplieritemApi  from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data'
 import * as ProductionitemcodeSpareitemcodeApi from '@/api/wms/productionitemcodeSpareitemcode'
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -434,11 +436,35 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'packUnit',
     sort: 'custom',
     table: {
-      width: 120
-    },
-    tableForm: {
-      disabled: true
+      width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true, //可输入回车
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
+      }
+    }
   },
   {
     label: '批次',

From cb47d3f3a14219534644a19040a791b02c6a8efe Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 25 Nov 2024 16:57:44 +0800
Subject: [PATCH 116/225] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/index.vue        |  7 +++-
 .../relegateRequestMain.data.ts               | 39 +++++++++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
index 4e1b6747a..5288c8a37 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@@ -195,8 +195,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           newRow['fromLocationCode'] = item['locationCode']
           newRow['toLocationCode'] = item['locationCode']
           newRow['inventoryStatus'] = item['inventoryStatus']
-          newRow['packUnit'] = item['packUnit']
-          newRow['packQty'] = item['packQty']
+          // newRow['packUnit'] = item['packUnit']
+          // newRow['packQty'] = item['packQty']
           tableData.value.push(newRow)
         })
         let itemCodes = []
@@ -234,6 +234,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         // console.log(row['itemCode']);
         // ItembasicApi.getItemListByCodes(row['itemCode'])
         row['downItemCode'] = val[0]['code']
+      } else if (formField == 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       }  else {
         row[formField] = val[0][searchField]
       }
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 0c61fb19e..bb1cec0eb 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -446,14 +446,18 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '包装规格信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
-          action: '==',
-          isSearch: true,
           isMainValue: false
+        },{
+          key: 'downItemCode',
+          value: 'downItemCode',
+          message: '请选择物料代码',
+          isTableRowValue: true, 
+          isMainValue:false
         }],
         verificationParams: [{
           key: 'code',
@@ -464,6 +468,33 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true
         }], // 失去焦点校验参数
       }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '包装规格信息', // 查询弹窗标题
+      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+      searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'downItemCode',
+        value: 'downItemCode',
+        message: '请选择物料代码',
+        isTableRowValue: true, 
+        isMainValue:false
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true
+      }], // 失去焦点校验参数
     }
   },
   {

From 3e0e352ea968f02984a50a17baf2ef9871bc3b08 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Mon, 25 Nov 2024 17:06:34 +0800
Subject: [PATCH 117/225] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=8F=98=E6=9B=B4=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/relegateRequestMain.data.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 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 bb1cec0eb..650ca689a 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -453,7 +453,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'TRUE',
           isMainValue: false
         },{
-          key: 'downItemCode',
+          key: 'itemCode',
           value: 'downItemCode',
           message: '请选择物料代码',
           isTableRowValue: true, 
@@ -481,7 +481,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         value: 'TRUE',
         isMainValue: false
       },{
-        key: 'downItemCode',
+        key: 'itemCode',
         value: 'downItemCode',
         message: '请选择物料代码',
         isTableRowValue: true, 

From b5bddf77894b178d870cb86e61bea1d824f368cd Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 25 Nov 2024 17:10:17 +0800
Subject: [PATCH 118/225] =?UTF-8?q?=E8=AF=B7=E9=80=89=E6=8B=A9=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegate/relegateRequest/relegateRequestMain.data.ts       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 650ca689a..b0978df05 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -483,8 +483,9 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       },{
         key: 'itemCode',
         value: 'downItemCode',
-        message: '请选择物料代码',
+        message: '请选择变更物料代码',
         isTableRowValue: true, 
+        required:true,
         isMainValue:false
       }],
       verificationParams: [{

From 6d8f5413f903a1d0121bcea6c32a304173a0e070 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 26 Nov 2024 13:04:22 +0800
Subject: [PATCH 119/225] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/transaction/index.ts                    | 11 +++++++++++
 src/views/wms/inventoryManage/transaction/index.vue |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/api/wms/transaction/index.ts b/src/api/wms/transaction/index.ts
index 1581755c6..739473073 100644
--- a/src/api/wms/transaction/index.ts
+++ b/src/api/wms/transaction/index.ts
@@ -60,6 +60,17 @@ export const deleteTransaction = async (id: number) => {
   return await request.delete({ url: `/wms/transaction/delete?id=` + id })
 }
 
+// 导出库存事务 Excel
+export const checkExportTransaction = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transaction/export-excel-senior-checkCnt', data })
+  } else {
+    return await request.get({ url: `/wms/transaction/export-excel-checkCnt`, params })
+  }
+}
+
 // 导出库存事务 Excel
 export const exportTransaction = async (params) => {
   if (params.isSearch) {
diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue
index 9b50aa1b5..34540dd98 100644
--- a/src/views/wms/inventoryManage/transaction/index.vue
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@@ -182,6 +182,10 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
+    
+    const checkData = await TransactionApi.checkExportTransaction(tableObject.params)
+    console.log('checkData',checkData)
+
     const data = await TransactionApi.exportTransaction(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {

From e9883d2c461075914e2187e0ff240590a797f6f2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 26 Nov 2024 13:12:27 +0800
Subject: [PATCH 120/225] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/transaction/index.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue
index 34540dd98..bed65c3b6 100644
--- a/src/views/wms/inventoryManage/transaction/index.vue
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@@ -176,16 +176,14 @@ const handleDelete = async (id: number) => {
 
 /** 导出按钮操作 */
 const handleExport = async () => {
+  const checkData = await TransactionApi.checkExportTransaction(tableObject.params)
+  console.log('checkData',checkData)
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    
-    const checkData = await TransactionApi.checkExportTransaction(tableObject.params)
-    console.log('checkData',checkData)
-
     const data = await TransactionApi.exportTransaction(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {

From 80fbe0f46f340f7aadaa2d9f0b04648729dc8ae9 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Tue, 26 Nov 2024 14:36:59 +0800
Subject: [PATCH 121/225] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E8=8B=A5=E5=AD=97=E6=95=B0?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E8=EF=BC=8C=E5=88=99=E5=B0=86=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E7=9C=81=E7=95=A5=E6=88=90...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packageoverMain/packageoverRecordMain/index.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
index e54e6a66c..9e15e0c58 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@@ -162,11 +162,11 @@ const handlePoint = async (row) => {
  if (labelType.value == 'cg') {
   // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
     const src = ref(BASE_URL + '/jmreport/view/998431235767558144?token=' + getAccessToken())
-    window.open(src.value+'&asn_number='+resLable)
+    window.open(src.value+'&asn_number='+resLable+'&labelNumber='+resLable)
   } else {
     // const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
     const src = ref(BASE_URL + '/jmreport/view/998438158579556352?token=' + getAccessToken())
-    window.open(src.value+'&asn_number='+resLable)
+    window.open(src.value+'&asn_number='+resLable+'&labelNumber='+resLable)
   }
     })
     }

From c8bf1e7c44c4acd65b75df300fcc41eca114395d Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 26 Nov 2024 14:51:44 +0800
Subject: [PATCH 122/225] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryinitRequestMain.data.ts           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index a29cf5e29..0a94f94a0 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -265,15 +265,15 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTable: false,
-  // },
+  {
+    label: '主备注',
+    field: 'mainRemark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
   {
     label: '创建时间',
     field: 'createTime',

From 23c0a6d31ec03b47765647b2997c78bfd0ee2002 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 08:49:23 +0800
Subject: [PATCH 123/225] =?UTF-8?q?HL-6455=E7=BB=B4=E4=BF=AE=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E9=80=80=E5=BA=93=E7=94=B3=E8=AF=B7=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=B0=86=E5=89=8D=E7=AB=AF=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=8E=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E9=AA=8C=E8=AF=81=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E9=A2=86=E7=94=A8=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=A0=A1=E9=AA=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=85=E5=A1=AB=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6=E6=88=90=E6=9C=AC=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BD=BF=E7=94=A8=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartReturnRequestMain/index.vue      | 33 ++++++++++++++++++-
 .../sparepartReturnRequestMain.data.ts        |  3 ++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index 23097f9f1..eb7815d97 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -58,6 +58,7 @@
     :isShowReduceButtonSelection="true"
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
+    @clearSearchInput="clearSearchInput"
     @submitForm="submitForm"
     @inputNumberChange="inputNumberChange"
     @tableFormSelectOnBlur="tableFormSelectOnBlur">
@@ -136,7 +137,15 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-
+const clearSearchInput = (formField) => {
+  if(formField == 'costCenterCode'){
+    formRef.value.formRef.setValues({
+      costCenterType:'',
+      reasonCodeRequisition:'',
+      projectCode:'',
+    })
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async () => {
@@ -191,6 +200,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
       if(formField === 'reasonCodeRequisition'){
         setV['reasonCodeRequisition'] = val[0]['code']
+        // 项目是否必填
+        val[0]['isProject']='TRUE'
+        if(UnplannedreceiptRequestMainRules['projectCode']){
+          UnplannedreceiptRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE'
+        }
+        UnplannedreceiptRequestMain.allSchemas.formSchema.forEach((item) => {
+          if (item.field == 'projectCode') {
+            //项目代码
+            if(val[0]['isProject']=='TRUE'){
+              //是-可编辑，可选择
+              item.componentProps.enterSearch = true
+              item.componentProps.isSearchList = true
+              item.componentProps.disabled = false
+            }else{
+              //否-不可编辑，内容为空
+              setV['projectCode'] = ''
+              item.componentProps.enterSearch = false
+              item.componentProps.isSearchList = false
+              item.componentProps.disabled = true
+            }
+          }
+        })
       }
       if(formField === 'projectCode'){
         setV['projectCode'] = val[0]['projectCode']
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
index 62fe54e2d..9638264f6 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -635,6 +635,9 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
 
 //表单校验
 export const UnplannedreceiptRequestMainRules = reactive({
+  projectCode: [
+    { required: false, message: '请输入项目代码', trigger: 'blur' }
+  ],
   toWarehouseCode: [
     { required: true, message: '请输入到库位代码', trigger: 'blur' }
   ],

From bfaa2d8f6cba0a65cf2132ec577a73c3c61b954f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 09:02:07 +0800
Subject: [PATCH 124/225] =?UTF-8?q?HL-6443QMS=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E7=89=A9=E6=96=99=E6=A3=80=E9=AA=8C=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E9=87=8D=E6=96=B0=E9=80=89=E6=8B=A9=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=A7=84=E5=88=99=E5=90=8E=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA=E3=80=82=E6=8F=90=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=BA=EF=BC=9A=E8=AF=B7=E5=9C=A8=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=A1=E6=95=B0=E5=99=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E7=A1=AE=E8=AE=A4=E5=AF=B9=E5=BA=94=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E6=A3=80=E9=AA=8C=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionScheme/index.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue
index 723f7763e..a51eed27d 100644
--- a/src/views/qms/inspectionScheme/index.vue
+++ b/src/views/qms/inspectionScheme/index.vue
@@ -197,10 +197,16 @@ const buttonTableClick = async (val, row) => {
 
 /** 添加/修改操作 */
 const basicFormRef = ref()
+const updateRow = ref()
 const openForm = (type: string, row?: any) => {
   // if(type=='add'){//新增的时候让动态模版置灰
   //   InspectionTemplateMain.allSchemas.formSchema.find(item => item.field == 'programmeTemplateCode').componentProps.disabled = true//动态规则来源于模版新增置灰之后选择模版之后赋值之后才能自由选择
   // }
+  if('update' == type){
+    updateRow.value = row
+  }else{
+    updateRow.value = null
+  }
   basicFormRef.value.open(type, row)
 }
 
@@ -240,6 +246,12 @@ const submitForm = async (formType, data) => {
       await InspectionSchemeApi.InspectionSchemeCreat(data1)
       message.success(t('common.createSuccess'))
     } else {
+      if('update' == formType&&updateRow.value&&updateRow.value.dynamicUpdateCode!=data1.dynamicUpdateCode){
+        await ElMessageBox.alert(
+          '请在物料检验计数器管理中，确认对应物料的检验阶段',
+          '重要提示'
+        )
+      }
       await InspectionSchemeApi.InspectionSchemeUpdate(data1)
       message.success(t('common.updateSuccess'))
     }

From 4c023b9665389ed14e31c3e0df5ab8438a008293 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 09:30:46 +0800
Subject: [PATCH 125/225] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartReturn/sparepartReturnRequestMain/index.vue         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index eb7815d97..b633fdb26 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -201,7 +201,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField === 'reasonCodeRequisition'){
         setV['reasonCodeRequisition'] = val[0]['code']
         // 项目是否必填
-        val[0]['isProject']='TRUE'
         if(UnplannedreceiptRequestMainRules['projectCode']){
           UnplannedreceiptRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE'
         }

From 57b69fc1f2c4992896a4bfca147f682075e3ce5e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 09:59:41 +0800
Subject: [PATCH 126/225] HL-6459

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts   |  8 ++-
 .../scrapRecordMain/scrapRecordMain.data.ts   | 27 +++++-----
 .../scrap/scrapRequestMain/index.vue          | 49 +++++++++++++++++--
 .../scrapRequestMain/scrapRequestMain.data.ts | 29 +++++------
 4 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index b711a2a2b..77076f60f 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -89,8 +89,9 @@ export const ScrapJobMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable:false,
-      isForm:false,
+      isTable:true,
+      sortTableDefault:9997,
+      isForm:true,
       isTableForm:false,
       tableForm: {
         isInpuFocusShow: true, // 开启查询弹窗
@@ -944,6 +945,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9998
   },
   {
     label: '货主代码',
@@ -995,6 +997,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTable: true,
+    sortTableDefault:9999
   },
   {
     label: '创建者',
@@ -1004,6 +1007,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable: true,
+    sortTableDefault:10000
   },
 ]))
 
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index fc7019e3c..1a74f4e71 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -98,8 +98,9 @@ export const ScrapRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable:false,
-      isForm:false,
+      isTable:true,
+      sortTableDefault:9992,
+      isForm:true,
       isTableForm:false,
       tableForm: {
         isInpuFocusShow: true, // 开启查询弹窗
@@ -112,11 +113,6 @@ export const ScrapRecordMain = useCrudSchemas(
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
-          key: 'costcentreType',
-          value: 'costCenterType',
-          message: '成本中心类型不能为空!',
-          isMainValue: true
         }]
       },
       form: {
@@ -132,11 +128,6 @@ export const ScrapRecordMain = useCrudSchemas(
             key: 'available',
             value: 'TRUE',
             isMainValue: false
-          },{
-            key: 'costcentreType',
-            value: 'costCenterType',
-            message: '成本中心类型不能为空!',
-            isMainValue: true
           }]
         }
       }
@@ -727,6 +718,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9993
   },
   {
     label: '单价',
@@ -737,7 +729,8 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:9994
   },
   {
     label: '金额',
@@ -748,7 +741,8 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:9995
   },
   {
     label: '从库位组代码',
@@ -757,6 +751,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9996
   },
   {
     label: '从库区代码',
@@ -765,6 +760,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9997
   },
   {
     label: '从货主代码',
@@ -806,6 +802,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9998
   },
   {
     label: '创建时间',
@@ -826,6 +823,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    sortTableDefault:9999
   },
   {
     label: '创建者',
@@ -834,6 +832,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10000
   },
   // {
   //   label: '任务明细ID',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 9585b6cb3..c9a058bd5 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -71,7 +71,6 @@
     @searchTableSuccess="searchTableSuccess"
     @inputNumberChange="inputNumberChange"
     @submitForm="submitForm"
-    @tableFormSelectOnBlur="tableFormSelectOnBlur"
     @clearSearchInput="clearSearchInput"
   />
 
@@ -90,7 +89,6 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailBasicFormOnChange="qtyOnChange"
     :detailValidate="detailValidate"
-    @onBlur="onBlur"
   />
 
   <!-- 导入 -->
@@ -139,7 +137,11 @@ const tableColumns = ref([
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
+const defaultReasonCodeRequisition = ref(true)
+const setDefaultrReasonCodeRequisition = ()=>{
+    formRef.value.setDefaultBlurValue('reasonCodeRequisition','SC99')
+    defaultReasonCodeRequisition.value = false
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -201,6 +203,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       }
       if (formField == 'q2Number') {
         setV['noticeRemark'] = val[0]['desc']
+        if(val[0]['number']){
+          setV['reasonCodeRequisition'] = ''
+          setV['projectCode'] = ''
+        }
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q1Number' || item.field == 'q3Number') {
             item.componentProps.enterSearch = false
@@ -227,14 +233,43 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         setV['costcentreCode'] = val[0]['costcentreCode']
         setV['costCenterType'] = val[0]['costcentreType']
       }
-      if(formField === 'reasonCodeRequisition'){
+      if(formField == 'reasonCodeRequisition'){
         setV['reasonCodeRequisition'] = val[0]['code']
+        // 项目是否必填
+        if(ScrapRequestMainRules['projectCode']){
+          ScrapRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE'
+        }
+        ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
+          if (item.field == 'projectCode') {
+            //项目代码
+            if(val[0]['isProject']=='TRUE'){
+              //是-可编辑，可选择
+              item.componentProps.enterSearch = true
+              item.componentProps.isSearchList = true
+              item.componentProps.disabled = false
+            }else{
+              //否-不可编辑，内容为空
+              setV['projectCode'] = ''
+              item.componentProps.enterSearch = false
+              item.componentProps.isSearchList = false
+              item.componentProps.disabled = true
+            }
+          }
+        })
+        if(val[0]['code']){
+          setV['q2Number'] = ''
+        }
       }
       if(formField === 'projectCode'){
         setV['projectCode'] = val[0]['projectCode']
       }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
+      if(formField == 'costCenterCode'){
+        if(defaultReasonCodeRequisition.value){
+          setDefaultrReasonCodeRequisition()
+        }
+      }
     }
    
   })
@@ -578,6 +613,12 @@ const openForm = async (type: string, row?: any) => {
 
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
+  if(type == 'create'){
+    nextTick(()=>{
+      defaultReasonCodeRequisition.value = true
+      // formRef.value.setDefaultBlurValue('costCenterCode','DEFC')
+    })
+  }
 }
 
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index dd69b6f42..5f72d3c58 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -169,8 +169,9 @@ export const ScrapRequestMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable:false,
-      isForm:false,
+      isTable:true,
+      sortTableDefault:9997,
+      isForm:true,
       isTableForm:false,
       tableForm: {
         enterSearch: true,
@@ -184,12 +185,7 @@ export const ScrapRequestMain = useCrudSchemas(
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
-          key: 'costcentreType',
-          value: 'costCenterType',
-          message: '成本中心类型不能为空!',
-          isMainValue: true
-          }],
+        }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -200,11 +196,12 @@ export const ScrapRequestMain = useCrudSchemas(
         }], // 失去焦点校验参数
       },
       form: {
+        value:'SC99',
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+          searchListPlaceholder: '请选择领用原因代码', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '领用原因代码', // 查询弹窗标题
           searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
@@ -213,12 +210,7 @@ export const ScrapRequestMain = useCrudSchemas(
             key: 'available',
             value: 'TRUE',
             isMainValue: false
-          },{
-            key: 'costcentreType',
-            value: 'costCenterType',
-            message: '成本中心类型不能为空!',
-            isMainValue: true
-            }],
+          }],
           verificationParams: [{
             key: 'code',
             action: '==',
@@ -1183,6 +1175,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9998
   },
   {
     label: '项目订单号',
@@ -1249,7 +1242,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    sortTableDefault:9999
   },
   {
     label: '创建者',
@@ -1259,7 +1253,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    sortTableDefault:10000
   },
   {
     label: '最后更新时间',

From 09f87a5dc950ef3b014cefe24af2c2dd06c326df Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 10:09:06 +0800
Subject: [PATCH 127/225] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryjobManage/scrap/scrapRequestMain/index.vue   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index c9a058bd5..ea5af74a8 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -265,11 +265,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
-      if(formField == 'costCenterCode'){
-        if(defaultReasonCodeRequisition.value){
-          setDefaultrReasonCodeRequisition()
-        }
-      }
+      
     }
    
   })
@@ -616,7 +612,7 @@ const openForm = async (type: string, row?: any) => {
   if(type == 'create'){
     nextTick(()=>{
       defaultReasonCodeRequisition.value = true
-      // formRef.value.setDefaultBlurValue('costCenterCode','DEFC')
+      setDefaultrReasonCodeRequisition()
     })
   }
 }

From ff1c082618ba66b63d4bdcdfd087ab4c371c781a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 10:48:02 +0800
Subject: [PATCH 128/225] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportForm/src/ImportDetailForm.vue       |  9 +++++++-
 .../countManage/count/countJobMain/index.vue  | 22 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue
index d8a45338b..580183cee 100644
--- a/src/components/ImportForm/src/ImportDetailForm.vue
+++ b/src/components/ImportForm/src/ImportDetailForm.vue
@@ -1,6 +1,6 @@
 <!-- 导入组件 -->
 <template>
-  <Dialog v-model="dialogVisible" :title="t('ts.导入')" width="600" :close-on-click-modal="false">
+  <Dialog v-model="dialogVisible" :title="t(`ts.${dialogTitle}`).replace('ts.','')" width="600" :close-on-click-modal="false">
     <el-upload
       ref="uploadRef"
       v-model:file-list="fileList"
@@ -198,6 +198,13 @@ const props = defineProps({
     required: false,
     default: false
   },
+  dialogTitle:{
+    type: String,
+    required: false,
+    default: ()=>{
+      return  '导入'
+    }
+  }
 })
 const importTemplateData = ref(props.importTemplateData)
 const accept = ref(props.accept)
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 49d33490a..b75414aa4 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -75,7 +75,8 @@
   <!-- 导入 -->
   <ImportDetailForm
     ref="importFormRef"
-    url="/wms/count-job-main/import"
+    :dialogTitle="importTitle"
+    :url="importUrl"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
     :updateIsDisable="true"
@@ -237,6 +238,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
+    {
+      label: '线边盘点',
+      name: 'lineTypeImport',
+      hide: false,//row.isLineType!=true,
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:lineTypeImport
+    },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',
@@ -250,7 +260,8 @@ const butttondata = (row, $index) => {
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
-
+const importTitle = ref('导入')
+const importUrl = ref('/wms/count-job-main/import')
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') {
@@ -284,6 +295,13 @@ const buttonTableClick = async (val, row) => {
     handleExportCountJob(row.id, row.number)
   } else if (val == 'importCountJob') {
     // 导入
+    importUrl.value = "/wms/count-job-main/import"
+    importTitle.value = '导入'
+    handleImport(row.id)
+  } else if (val == 'lineTypeImport') {
+    // 线边盘点
+    importUrl.value = "/wms/count-job-main/lineTypeImport"
+    importTitle.value = '线边盘点'
     handleImport(row.id)
   } else if (val == 'done') {
     // 完成

From ba630352eead6e5ce21d87c29ba95b7c1e0d4885 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 10:52:43 +0800
Subject: [PATCH 129/225] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/countManage/count/countJobMain/countJobMain.data.ts     | 2 +-
 src/views/wms/countManage/count/countJobMain/index.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index 0256bd71e..173a7c2d1 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -541,7 +541,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 250,
+      width: 320,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index b75414aa4..03d550f0f 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -241,7 +241,7 @@ const butttondata = (row, $index) => {
     {
       label: '线边盘点',
       name: 'lineTypeImport',
-      hide: false,//row.isLineType!=true,
+      hide: row.isLineType!=true,
       type: 'success',
       color: '',
       link: true, //文本展现按钮

From c0a34721bcd9e05fb421d58c8fd2519b24d94084 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 11:07:47 +0800
Subject: [PATCH 130/225] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportDetailForm.vue  | 13 ++++++++++++-
 .../wms/countManage/count/countJobMain/index.vue    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue
index 580183cee..757a7409a 100644
--- a/src/components/ImportForm/src/ImportDetailForm.vue
+++ b/src/components/ImportForm/src/ImportDetailForm.vue
@@ -206,6 +206,17 @@ const props = defineProps({
     }
   }
 })
+
+
+watch(
+  () => props.url,
+  () => {
+    importUrl.value = getBaseUrl() + import.meta.env.VITE_API_URL + props.url
+  },
+  {
+    deep: true
+  }
+)
 const importTemplateData = ref(props.importTemplateData)
 const accept = ref(props.accept)
 const mode = ref(props.mode) //是否更新已经存在的用户数据.默认值是1
@@ -215,7 +226,7 @@ const coverIsDisable = ref(props.coverIsDisable) //覆盖是否禁用,默认值
 const updatePart = ref(props.updatePart) //是否部门保存
 const outFile = ref(props.outFile) //是否引入外部资源
 
-const importUrl = getBaseUrl() + import.meta.env.VITE_API_URL + props.url
+const importUrl = ref(getBaseUrl() + import.meta.env.VITE_API_URL + props.url)
 
 /** 打开弹窗 */
 const open = () => {
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 03d550f0f..32bbf56c2 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -241,7 +241,7 @@ const butttondata = (row, $index) => {
     {
       label: '线边盘点',
       name: 'lineTypeImport',
-      hide: row.isLineType!=true,
+      hide: !(row.status==2&&row.lineType==true),
       type: 'success',
       color: '',
       link: true, //文本展现按钮

From da1190b0e63237b36eb4427d2bc7b3950d2e3cfe Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Wed, 27 Nov 2024 13:42:07 +0800
Subject: [PATCH 131/225] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BD=8D=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?8-20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/updatePassword.vue        | 4 ++--
 src/views/login/updatePasswordNewTips.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/login/updatePassword.vue b/src/views/login/updatePassword.vue
index c3b0a71b6..e7688340d 100644
--- a/src/views/login/updatePassword.vue
+++ b/src/views/login/updatePassword.vue
@@ -6,7 +6,7 @@
         <el-col>
           <el-form-item label="新密码" prop="password" align="center">
             <el-input v-model="loginData.password" placeholder="请输入新密码" :type="isShowPassword?'text':'password'"/>
-            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="18" @click="isShowPassword = !isShowPassword">
+            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowPassword = !isShowPassword">
               <View v-if="!isShowPassword"/>
               <Hide v-if="isShowPassword"/>
             </el-icon>
@@ -15,7 +15,7 @@
         <el-col>
           <el-form-item label="确认新密码" prop="againPassword">
             <el-input v-model="loginData.againPassword" placeholder="请再次新密码"  :type="isShowAgainPassword?'text':'password'"/>
-            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="18" @click="isShowAgainPassword = !isShowAgainPassword">
+            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowAgainPassword = !isShowAgainPassword">
               <View v-if="!isShowAgainPassword"/>
               <Hide v-if="isShowAgainPassword"/>
             </el-icon>
diff --git a/src/views/login/updatePasswordNewTips.vue b/src/views/login/updatePasswordNewTips.vue
index 14a055432..65747f425 100644
--- a/src/views/login/updatePasswordNewTips.vue
+++ b/src/views/login/updatePasswordNewTips.vue
@@ -32,7 +32,7 @@
         </el-col>
       </el-row>
     </el-form>
-<!--    <div class="tips">温馨提示：<span>密码长度通常需要在6-20个字符之间。</span></div>-->
+<!--    <div class="tips">温馨提示：<span>密码长度通常需要在8-20个字符之间。</span></div>-->
     <div class="dialog-footer">
       <el-button type="primary" @click="submitForm" style="width: 100%;height: 40px;line-height: 40px;">确 定</el-button>
     </div>

From f28be2fab9e28705a6e6b23482d8a435cde27e58 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 14:37:16 +0800
Subject: [PATCH 132/225] =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionRecordFirst/index.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue
index 400398434..0f3e9a13e 100644
--- a/src/views/qms/inspectionRecordFirst/index.vue
+++ b/src/views/qms/inspectionRecordFirst/index.vue
@@ -3,8 +3,8 @@
     <!-- 搜索工作栏 -->
     <Search
       :schema="InspectionRecordMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
+      @search="searchClick"
+      @reset="searchClick"
     />
   </ContentWrap>
 
@@ -332,6 +332,13 @@ const submitForm = async (formType, data) => {
     basicFormRef.value.formLoading = false
   }
 }
+
+const searchClick = async (data)=>{
+  console.log('searchClick',data)
+  data.params.available = 'TRUE'
+  data.inspectionType = '11'
+  setSearchParams(data)
+}
 // 筛选提交
 const searchFormClick = (searchData) => {
   searchData.filters.push({

From 7285c04997cc641fca6757978755d149f68db89d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 14:55:55 +0800
Subject: [PATCH 133/225] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue
index 0f3e9a13e..3beac00a9 100644
--- a/src/views/qms/inspectionRecordFirst/index.vue
+++ b/src/views/qms/inspectionRecordFirst/index.vue
@@ -335,7 +335,7 @@ const submitForm = async (formType, data) => {
 
 const searchClick = async (data)=>{
   console.log('searchClick',data)
-  data.params.available = 'TRUE'
+  data.available = 'TRUE'
   data.inspectionType = '11'
   setSearchParams(data)
 }

From 3ff521474fb82e26e3077960e080ffaba46c7143 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 27 Nov 2024 16:36:53 +0800
Subject: [PATCH 134/225] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartReturn/sparepartReturnRequestMain/index.vue        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index b633fdb26..7dd585274 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -197,6 +197,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField === 'costCenterCode'){
         setV['costcentreCode'] = val[0]['costcentreCode']
         setV['costCenterType'] = val[0]['costcentreType']
+        setV['reasonCodeRequisition'] = ''
+        setV['projectCode'] = ''
       }
       if(formField === 'reasonCodeRequisition'){
         setV['reasonCodeRequisition'] = val[0]['code']

From 5c281df516bb4118d7448e095ef18274af4beb9b Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 28 Nov 2024 10:15:40 +0800
Subject: [PATCH 135/225] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 32bbf56c2..f7923ec53 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -238,15 +238,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    {
-      label: '线边盘点',
-      name: 'lineTypeImport',
-      hide: !(row.status==2&&row.lineType==true),
-      type: 'success',
-      color: '',
-      link: true, //文本展现按钮
-      hasPermi: '' // wms:count-job-main:lineTypeImport
-    },
+    // {
+    //   label: '线边盘点',
+    //   name: 'lineTypeImport',
+    //   hide: !(row.status==2&&row.lineType==true),
+    //   type: 'success',
+    //   color: '',
+    //   link: true, //文本展现按钮
+    //   hasPermi: '' // wms:count-job-main:lineTypeImport
+    // },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',

From 790d4d0852970f3f0cbde3e298440976bf164eb4 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 29 Nov 2024 09:43:55 +0800
Subject: [PATCH 136/225] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E8=A7=A3=E5=86=BB=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9372ed134..b46241cd9 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -84,7 +84,7 @@
                            v-hasPermi="['system:permission:assign-user-role']">
                   <Icon icon="ep:circle-check" />分配角色
                 </el-button>
-                <el-button type="primary" link @click="handleFree(scope.row)" v-hasPermi="['system:user:update-password']"  v-if="useUserStore().userSelfInfo.userType=='MASTER'">
+                <el-button type="primary" link @click="handleFree(scope.row)" v-hasPermi="['system:user:update']">
                   <Icon icon="ep:edit" />解冻
                 </el-button>
                 <el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['system:user:delete']">

From 4826e48fc3f7224d2c59b9b3a8c52cba2b0bf4f7 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 29 Nov 2024 14:34:26 +0800
Subject: [PATCH 137/225] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/countJobMain/index.ts             |  5 +++-
 .../countManage/count/countJobMain/index.vue  | 26 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts
index d851c3104..43e70a492 100644
--- a/src/api/wms/countJobMain/index.ts
+++ b/src/api/wms/countJobMain/index.ts
@@ -86,7 +86,10 @@ export const exportCountJobMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/count-job-main/get-import-template' })
 }
-
+// 下载用户导入模板
+export const lineTypeImportTemplate = () => {
+  return request.download({ url: '/wms/count-job-main/get-lineTypeImport-template' })
+}
 // 关闭盘点任务主
 export const closeCountJobMain = (id: number) => {
   return request.put({ url: '/wms/count-job-main/close?id=' + id })
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index f7923ec53..cb744daa7 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -102,6 +102,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {lineTypeImportTemplate} from "@/api/wms/countJobMain";
 const { loadStart, loadDone } = usePageLoading()
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
@@ -238,15 +239,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    // {
-    //   label: '线边盘点',
-    //   name: 'lineTypeImport',
-    //   hide: !(row.status==2&&row.lineType==true),
-    //   type: 'success',
-    //   color: '',
-    //   link: true, //文本展现按钮
-    //   hasPermi: '' // wms:count-job-main:lineTypeImport
-    // },
+    {
+      label: '线边盘点',
+      name: 'lineTypeImport',
+      hide: !(row.status==2&&row.lineType==true),
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:lineTypeImport
+    },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',
@@ -297,11 +298,15 @@ const buttonTableClick = async (val, row) => {
     // 导入
     importUrl.value = "/wms/count-job-main/import"
     importTitle.value = '导入'
+    importTemplateData.value.templateTitle = "盘点任务导入模板.xlsx"
+    importTemplateData.value.templateUrl = await CountJobMainApi.importTemplate()
     handleImport(row.id)
   } else if (val == 'lineTypeImport') {
     // 线边盘点
     importUrl.value = "/wms/count-job-main/lineTypeImport"
     importTitle.value = '线边盘点'
+    importTemplateData.value.templateTitle = "线边盘点任务导入模板.xlsx"
+    importTemplateData.value.templateUrl = await CountJobMainApi.lineTypeImportTemplate()
     handleImport(row.id)
   } else if (val == 'done') {
     // 完成
@@ -405,7 +410,7 @@ const handleImport = (id: string) => {
 }
 
 // 导入附件弹窗所需的参数
-const importTemplateData = reactive({
+const importTemplateData = ref({
   templateUrl: '',
   templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
@@ -427,6 +432,5 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await CountJobMainApi.importTemplate()
 })
 </script>

From b9b9b842067bb73484b895e0016e94395abbbe9f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 2 Dec 2024 09:49:02 +0800
Subject: [PATCH 138/225] FWHL-20

---
 .../supplierinvoiceRequestMain/index.vue      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 5b35f05bb..abc916b67 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1423,10 +1423,29 @@ const submitForm = async (formType, submitData) => {
         message.warning(t('ts.明细数据条数已超过最大数量限制【20000条】'))
         return
       }
+      if(data.discountAmount1>0){
+        await ElMessageBox.alert(
+          '请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数',
+          '重要提示',
+          {
+            showCancelButton: true
+          }
+        )
+      }
+      
       formRef.value.formLoading = true
       await SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
+      if(data.discountAmount1>0){
+        await ElMessageBox.alert(
+          '请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数',
+          '重要提示',
+          {
+            showCancelButton: true
+          }
+        )
+      }
       formRef.value.formLoading = true
       data.masterId = data.id
       await SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain(data)

From 8c048c26f48979b608078f4dd749a586c281dc05 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 2 Dec 2024 11:12:47 +0800
Subject: [PATCH 139/225]   tableObject.pageSize = 500

---
 .../sparereceipt/sparereceiptRequestMain/index.vue               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 1fcd12dfe..b6bdf9697 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -260,6 +260,7 @@ const getSearchTableData = async (number,isEnter=false)=>{
     defaultParams:{number},
     getListApi: PurchaseDetailApi.getPurchaseDetailPageWMSSpare // 分页接口
   })
+  tableObject.pageSize = 500
   // 获得表格的各种操作
   const { getList:getList1 } = tableMethods
   await getList1()

From bb0a96410651a5743509155c8a999015025b4fd9 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 2 Dec 2024 13:34:09 +0800
Subject: [PATCH 140/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-21=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceiptJobMain/sparereceiptJobMain.data.ts           | 4 ++--
 .../sparereceiptRecordMain/sparereceiptRecordMain.data.ts     | 4 ++--
 .../sparereceiptRequestMain/sparereceiptRequestMain.data.ts   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
index 05d025955..4c04a99fd 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -988,7 +988,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     sortTableDefault:7,
   },
   {
@@ -998,7 +998,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     sortTableDefault:7,
   },
   // {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
index 4f22e1155..94216f6b9 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -590,7 +590,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:11,
-    hiddenInMain:true
+    hiddenInMain:false
   },
   {
     label: '物料描述2',
@@ -600,7 +600,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:11,
-    hiddenInMain:true
+    hiddenInMain:false
   },
   {
     label: '从批次',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index d1007af0d..7c7eae7e0 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -787,7 +787,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     sortTableDefault:7,
-    hiddenInMain:true,
+    hiddenInMain:false,
     isTableForm: true,
     tableForm:{
       disabled: true
@@ -806,7 +806,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     sortTableDefault:7,
-    hiddenInMain:true,
+    hiddenInMain:false,
     isTableForm: true,
     tableForm:{
       disabled: true

From 0a5b2bcfaf55f38f965439fffec5ebd9c98f219c Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Mon, 2 Dec 2024 13:37:26 +0800
Subject: [PATCH 141/225] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5=E6=A0=A1=E9=AA=8C=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/axios/service.ts              | 2 +-
 src/views/login/components/LoginForm.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index 958d2a79b..be603d4ed 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -182,7 +182,7 @@ service.interceptors.response.use(
           '<div>5 分钟搭建本地环境</div>'
       })
       return Promise.reject(new Error(msg))
-    } else if (code === 1002000008) {
+    } else if (code === 1002000016) {
       if (msg === '无效的刷新令牌') {
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index f78a1fa81..deed2bce2 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -332,7 +332,7 @@
       const { wsCache } = useCache()
       wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList())
     }catch (e){
-      if(e.code === 1002000008){
+      if(e.code === 1002000016){
         setTimeout(function (){
           router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}})
         },1500)

From 109b6e0fb0746bdf7b02aff2edfdc341b2d9d0c7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 2 Dec 2024 13:53:19 +0800
Subject: [PATCH 142/225] FWHL-32

---
 .../packagemergeMain/packagemergeMain.data.ts | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
index 2e4e8f15a..03634b036 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -11,14 +11,14 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-  },
+  // {
+  //   label: '仓库代码',
+  //   field: 'warehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 120
+  //   },
+  // },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
@@ -302,22 +302,22 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '从库存状态',
-    field: 'fromInventoryStatus',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到库存状态',
-    field: 'toInventoryStatus',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '从库存状态',
+  //   field: 'fromInventoryStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到库存状态',
+  //   field: 'toInventoryStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   // {
   //   label: '从器具号',
   //   field: 'fromContainerNumber',
@@ -393,10 +393,13 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      width: 150,
+      type: 'Select',
+      disabled: true
+    }
   },
   {
     label: '备注',

From 4f75a10f69257ddf8ffa350adbc43d5c2dbafff5 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 2 Dec 2024 15:36:38 +0800
Subject: [PATCH 143/225] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRecordMainNew.data.ts        | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
index 054543803..c80b1d48f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts
@@ -15,24 +15,26 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isSearch: true
   },
-  // {
-  //   label: '申请单号',
-  //   field: 'requestNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   isSearch: true
-  // },
-  // {
-  //   label: '任务单号',
-  //   field: 'jobNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   isSearch: true
-  // },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:9,
+    isSearch: true
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:9,
+    isSearch: true
+  },
   // {
   //   label: '使用在途库',
   //   field: 'useOnTheWayLocation',

From 9ecaec579e30534298dc64e65283dd4229f4bf56 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 2 Dec 2024 15:46:39 +0800
Subject: [PATCH 144/225] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymove/inventorymoveRecordMainNew/index.vue      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index 0e1f26bf6..ccc5db4e6 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -76,7 +76,7 @@
   <!-- 标签打印 -->
   <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
 <!-- 导入 -->
-<ImportForm ref="importFormRef" url="/wms/inventorymove-record-main/importMove" :importTemplateData="importTemplateData"
+<ImportForm ref="importFormRef" url="/wms/inventorymove-record-main/import" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :fromInventoryStatus= "fromInventoryStatus" :toInventoryStatus="toInventoryStatus" />
 </template>
 
@@ -137,7 +137,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
-  // defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -463,7 +463,7 @@ const searchList = (model)=>{
 onMounted(async () => {
   getList()
   // 库存转移记录(新)InventorymoveRecordMainNew
-  importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
+  importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate()
 })
 </script>
 ./inventorymoveRecordRequestMain.data

From 13bf12ebd705c135bf0d2599ccf5d1a9397babd1 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 2 Dec 2024 16:47:29 +0800
Subject: [PATCH 145/225] =?UTF-8?q?FWHL-26=E6=9D=A5=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrap/productscrapRequestMain/index.vue             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 8324adae6..2c866ba12 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -477,6 +477,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['singlePrice'] = item['singlePrice']
           newRow['amount'] = newRow['qty']*item['singlePrice']
           newRow['productionLineCode'] = item['productionLineCode']
+          newRow['fromLocationCode'] = item['fromLocationCode']
+          newRow['workStationCode'] = item['workStationCode']
+          
           if(item['bomList'].length>0){
             newRow['bomVersionInitOptions'] = item['bomList'].map(item1=>({
               label:item1,

From 7f609b310db62b8777b06c046caae8296ca01b00 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 2 Dec 2024 17:29:31 +0800
Subject: [PATCH 146/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7:FWHL-21=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRecordSpareMain.data.ts                 | 4 ++--
 .../purchasereturnRequestSpareMain.data.ts                | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
index 2d573ffe1..8350ac4f5 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts
@@ -496,7 +496,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     sortSearchDefault: 7,
-    hiddenInMain: true
+    hiddenInMain: false
   },
   {
     label: '物料描述2',
@@ -506,7 +506,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     sortSearchDefault: 7,
-    hiddenInMain: true
+    hiddenInMain: false
   },
   {
     label: '从批次',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
index c4db35da7..27c258274 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/purchasereturnRequestSpareMain.data.ts
@@ -805,8 +805,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm:false,
-    isTable:false,
-    hiddenInMain: true,
+    isTable:true,
+    hiddenInMain: false,
     isForm: false,
     tableForm:{
       disabled:true
@@ -825,8 +825,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm:false,
-    isTable:false,
-    hiddenInMain: true,
+    isTable:true,
+    hiddenInMain: false,
     isForm: false,
     tableForm:{
       disabled:true

From feb544270086d5e6827b7679a9fc8916a022cf9c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Dec 2024 14:58:35 +0800
Subject: [PATCH 147/225] FWHL-32

---
 .../packagemergeMain/packagemergeMain.data.ts | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
index 03634b036..75aa7aa68 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -302,22 +302,26 @@ export const PackagemergeDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '从库存状态',
-  //   field: 'fromInventoryStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '到库存状态',
-  //   field: 'toInventoryStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '从器具号',
   //   field: 'fromContainerNumber',

From d241a12a86211a69387af853099ac69fb4698208 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 4 Dec 2024 10:01:21 +0800
Subject: [PATCH 148/225] FWHL-71

---
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index bf4d22be7..1b906d432 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -435,7 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: isShowMainButton(row, ['4']),
+        hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
         type: 'primary',
         icon: '',
         color: '',

From 832243c528e7c2e99d5be9650cfa01b4b211513f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 4 Dec 2024 10:40:07 +0800
Subject: [PATCH 149/225] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 1b906d432..bc6f4a3ad 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -435,7 +435,8 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
+        hide: isShowMainButton(row, ['4']),
+        // hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
         type: 'primary',
         icon: '',
         color: '',

From f5c9e7f4c31756623ce437662fdba4cc9b7bb7d7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 4 Dec 2024 16:55:51 +0800
Subject: [PATCH 150/225] =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index bc6f4a3ad..1b906d432 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -435,8 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: isShowMainButton(row, ['4']),
-        // hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
+        hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
         type: 'primary',
         icon: '',
         color: '',

From 9197a9e6ddcc0dabbb451bf030aaabb1e2354f6e Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 5 Dec 2024 08:19:52 +0800
Subject: [PATCH 151/225] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B3=A8=E9=87=8A=E5=88=86=E9=92=9F=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/passwordRule/index.vue | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 353879cba..9eb1b7806 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -26,26 +26,26 @@
           </el-form-item>
         </el-col>
         <div>{{passwordConfig.ruleDesc}}</div>
-        <el-col>
-          <el-form-item label="每分钟密码输入错误" prop="tryCount">
-            <el-input-number
-              v-model="passwordConfig.tryCount"
-              :min="3"
-              :precision="0"
-              style="margin-right: 10px"
-            />次
-          </el-form-item>
-        </el-col>
-        <el-col>
-          <el-form-item label="锁定" prop="lockHours">
-            <el-input-number
-              v-model="passwordConfig.lockHours"
-              :min="1"
-              :precision="0"
-              style="margin-right: 10px"
-            />小时
-          </el-form-item>
-        </el-col>
+<!--        <el-col>-->
+<!--          <el-form-item label="每分钟密码输入错误" prop="tryCount">-->
+<!--            <el-input-number-->
+<!--              v-model="passwordConfig.tryCount"-->
+<!--              :min="3"-->
+<!--              :precision="0"-->
+<!--              style="margin-right: 10px"-->
+<!--            />次-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col>-->
+<!--          <el-form-item label="锁定" prop="lockHours">-->
+<!--            <el-input-number-->
+<!--              v-model="passwordConfig.lockHours"-->
+<!--              :min="1"-->
+<!--              :precision="0"-->
+<!--              style="margin-right: 10px"-->
+<!--            />小时-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col>
           <el-form-item label="24小时内密码输入错误" prop="tryCount">
             <el-input-number

From 8786af0b80170acc35c3b58d881fd3796df58f01 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 5 Dec 2024 09:42:21 +0800
Subject: [PATCH 152/225] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index cb744daa7..41057a8b6 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -239,15 +239,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    {
-      label: '线边盘点',
-      name: 'lineTypeImport',
-      hide: !(row.status==2&&row.lineType==true),
-      type: 'success',
-      color: '',
-      link: true, //文本展现按钮
-      hasPermi: '' // wms:count-job-main:lineTypeImport
-    },
+    // {
+    //   label: '线边盘点',
+    //   name: 'lineTypeImport',
+    //   hide: !(row.status==2&&row.lineType==true),
+    //   type: 'success',
+    //   color: '',
+    //   link: true, //文本展现按钮
+    //   hasPermi: '' // wms:count-job-main:lineTypeImport
+    // },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',

From 4abc1a0f3d7274fa044635178c784c6bcbf2d36d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Dec 2024 13:22:54 +0800
Subject: [PATCH 153/225] =?UTF-8?q?FWHL-81=E7=BA=BF=E8=BE=B9=E5=8E=9F?=
 =?UTF-8?q?=E6=96=99=E6=8A=A5=E5=BA=9F=E6=98=8E=E7=BB=86=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                  | 7 ++++++-
 src/components/TableForm/src/TableForm.vue                 | 4 ++--
 .../productionscrapRequestMain.data.ts                     | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2953275d5..cda786aae 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,12 @@ tableForm:{
   }]
 },
 
-
+tableForm: {
+    type: 'InputNumber',
+    minField: 0, // 每行数据不同最小值
+    precision: 2,
+    maxField:'maxQty' // 每行数据不同最大值
+}
 
 **主子表合并需要修改的代码**
 1、影响Table表头
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index eec0dcf8c..a49e1bad9 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -148,8 +148,8 @@
               style="width: 100%"
               :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
-              :max="headerItem?.tableForm?.max"
-              :min="headerItem?.tableForm?.min"
+              :max="headerItem?.tableForm?.maxField?row[headerItem?.tableForm?.maxField]:headerItem?.tableForm?.max"
+              :min="headerItem?.tableForm?.minField?row[headerItem?.tableForm?.minField]:headerItem?.tableForm?.min"
               :precision="headerItem?.tableForm?.precision"
               :disabled="itemIsDisabled(headerItem, row)"
               @change="
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 4fe78c5f4..373a1ed42 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1807,7 +1807,8 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 2
+      precision: 2,
+      maxField:'maxQty'
     }
   },
   {

From 681f30966ad50112e64babe0f44a5c7eaadc0077 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Dec 2024 13:29:16 +0800
Subject: [PATCH 154/225] FWHL-81

---
 .../productionscrap/productionscrapRequestMain/index.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 58f1f53d8..a047c09ed 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -254,19 +254,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           row['uom'] = val[0]['uom']
           row['inventoryStatus'] = val[0]['inventoryStatus']
           row['qty'] = val[0]['qty']
+          
           // 如果有批次 赋值库存余额批次 无批次 赋值 000000
           if (val[0]['batch'] !== '') {
             row['batch'] = val[0]['batch']
           } else {
             row['batch'] = '000000'
           }
-          // 修改 tableform 属性 数量最大值设置为库存余额中数量
-          // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制
-          ProductionscrapRequestDetail.allSchemas.tableFormColumns.map(item => {
-            if(item.field == 'qty' && val[0]['qty'] > 0) {
-              item.tableForm.max = val[0]['qty']
-            }
-          })
+          row['maxQty'] = val[0]['qty']
           let param = {'itemCodes':val[0]['itemCode']}
           let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param)
           console.log('resyStdcost',resyStdcost)

From 7c80b42aa76224137b56b111e7fcb3faaa420591 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Dec 2024 13:29:39 +0800
Subject: [PATCH 155/225] =?UTF-8?q?FWHL-72=E5=88=B6=E5=93=81=E5=AD=90?=
 =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7=E4=B8=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=BD=A6=E9=97=B4=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=80=BC=E5=90=8E=EF=BC=8C=E7=94=9F=E4=BA=A7=E7=BA=BF?=
 =?UTF-8?q?=E5=92=8C=E6=98=8E=E7=BB=86=E5=BA=94=E8=AF=A5=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=9B=E7=9B=AE=E5=89=8D=E6=9C=AA=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrap/productscrapRequestMain/index.vue            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 2c866ba12..7eea0a9ed 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -561,6 +561,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             }
           }
         })
+      }else if(formField == 'workshopCode'){
+        //车间
+        setV['productionLineCode'] = ''//生产线代码
+        tableData.value = []
       }
       formRef.setValues(setV)
       if(formField == 'costCenterCode'){

From 5aa6a87cdaba21d7345e6f16da49cc1acc99256a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Dec 2024 13:33:49 +0800
Subject: [PATCH 156/225] bug

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

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index c825bccf4..618f4c084 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -281,7 +281,7 @@ const props = defineProps({
   },
   //是否可以编辑子表
   updateTypeEdiltSubList: {
-    type: String,
+    type: Boolean,
     required: false,
     default: false
   },

From 95e34c1f61a6008bf4f058d700554a23f4a16db2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Dec 2024 16:44:04 +0800
Subject: [PATCH 157/225] =?UTF-8?q?FWHL-75=E9=BB=98=E8=AE=A4=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E5=BA=93=E4=BD=8D=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98BOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrap/productscrapRequestMain/index.vue             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 7eea0a9ed..900f61ccf 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -516,6 +516,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           //   buttonOperationClick(newRow,'Bom',tableData.value.indexOf(newRow),true)
           // }
           tableData.value.push(newRow)
+          if(newRow['fromLocationCode']){
+            buttonOperationClick(newRow,'Bom',tableData.value.indexOf(newRow),true)
+          }
         })
 
       }else if(formField == 'bomVersion'){

From 250560b99019d095e93ab21f434fc6be32d72d81 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 5 Dec 2024 17:08:38 +0800
Subject: [PATCH 158/225] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E6=98=8E=E7=BB=86=E9=87=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countadjustRequestMain/countadjustRequestMain.data.ts      | 2 +-
 .../countManage/countadjust/countadjustRequestMain/index.vue   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index bcc8c248a..b8a8b0e8b 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -637,7 +637,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false ,
-    isTable:false,
+    isTable:true,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 3fc7452a7..5839b0a9d 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -71,6 +71,9 @@
     :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
     fromeWhere="countadjustRequest"
     :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="true"
+    :detailButtonIsShowAddStatusArray="['1']"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />

From 6429057d84b1427e9c1b560217518659f6219bad Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 5 Dec 2024 17:34:57 +0800
Subject: [PATCH 159/225] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 41057a8b6..cb744daa7 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -239,15 +239,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    // {
-    //   label: '线边盘点',
-    //   name: 'lineTypeImport',
-    //   hide: !(row.status==2&&row.lineType==true),
-    //   type: 'success',
-    //   color: '',
-    //   link: true, //文本展现按钮
-    //   hasPermi: '' // wms:count-job-main:lineTypeImport
-    // },
+    {
+      label: '线边盘点',
+      name: 'lineTypeImport',
+      hide: !(row.status==2&&row.lineType==true),
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:lineTypeImport
+    },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',

From b3140f06105d236e419fd71515776fde9d0c31d3 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 6 Dec 2024 11:42:49 +0800
Subject: [PATCH 160/225] =?UTF-8?q?FWHL-61=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/spareitemLocation/index.ts        |  53 ++++
 .../spareitemLocation/index.vue               | 244 ++++++++++++++++++
 .../spareitemLocation.data.ts                 |  78 ++++++
 3 files changed, 375 insertions(+)
 create mode 100644 src/api/wms/spareitemLocation/index.ts
 create mode 100644 src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
 create mode 100644 src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts

diff --git a/src/api/wms/spareitemLocation/index.ts b/src/api/wms/spareitemLocation/index.ts
new file mode 100644
index 000000000..5f5a2e81b
--- /dev/null
+++ b/src/api/wms/spareitemLocation/index.ts
@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface SpareitemLocationVO {
+  itemCode: string
+  name: string
+  desc1: string
+  desc2: string
+  locationCode: string
+  locationName: string
+  available: string
+  remark: string
+}
+
+// 查询维修备件默认库位列表
+export const getSpareitemLocationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/spareitem-location/senior', data })
+  } else {
+    return await request.get({ url: `/wms/spareitem-location/page`, params })
+  }
+}
+
+// 查询维修备件默认库位详情
+export const getSpareitemLocation = async (id: number) => {
+  return await request.get({ url: `/wms/spareitem-location/get?id=` + id })
+}
+
+// 新增维修备件默认库位
+export const createSpareitemLocation = async (data: SpareitemLocationVO) => {
+  return await request.post({ url: `/wms/spareitem-location/create`, data })
+}
+
+// 修改维修备件默认库位
+export const updateSpareitemLocation = async (data: SpareitemLocationVO) => {
+  return await request.put({ url: `/wms/spareitem-location/update`, data })
+}
+
+// 删除维修备件默认库位
+export const deleteSpareitemLocation = async (id: number) => {
+  return await request.delete({ url: `/wms/spareitem-location/delete?id=` + id })
+}
+
+// 导出维修备件默认库位 Excel
+export const exportSpareitemLocation = async (params) => {
+  return await request.download({ url: `/wms/spareitem-location/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/spareitem-location/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
new file mode 100644
index 000000000..f5fb9f787
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="SpareitemLocation.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="SpareitemLocation.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="SpareitemLocationRules"
+    :formAllSchemas="SpareitemLocation.allSchemas"
+    :apiUpdate="SpareitemLocationApi.updateSpareitemLocation"
+    :apiCreate="SpareitemLocationApi.createSpareitemLocation"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="SpareitemLocation.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/spareitem-location/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { SpareitemLocation,SpareitemLocationRules } from './spareitemLocation.data'
+import * as SpareitemLocationApi from '@/api/wms/spareitemLocation'
+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'
+
+defineOptions({ name: 'SpareitemLocation' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SpareitemLocation.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SpareitemLocationApi.getSpareitemLocationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:spareitemLocation:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:spareitemLocation:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:spareitemLocation:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:spareitemLocation:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:spareitemLocation:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =SpareitemLocation.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await SpareitemLocationApi.createSpareitemLocation(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SpareitemLocationApi.updateSpareitemLocation(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSpareitemLocation')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SpareitemLocationApi.deleteSpareitemLocation(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SpareitemLocationApi.exportSpareitemLocation(tableObject.params)
+    download.excel(data, '维修备件默认库位.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '维修备件默认库位导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await SpareitemLocationApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts
new file mode 100644
index 000000000..7f9355c21
--- /dev/null
+++ b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts
@@ -0,0 +1,78 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const SpareitemLocationRules = reactive({
+  itemCode: [required],
+  locationCode: [required],
+})
+
+export const SpareitemLocation = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+  },
+  {
+    label: '描述1',
+    field: 'desc1',
+    sort: 'custom',
+  },
+  {
+    label: '描述2',
+    field: 'desc2',
+    sort: 'custom',
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '库位名称',
+    field: 'locationName',
+    sort: 'custom',
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 4494d1bc2d2df109e8773983fbb0e03e47d855e8 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Dec 2024 13:36:04 +0800
Subject: [PATCH 161/225] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spareitemLocation/index.vue               |  27 ++++-
 .../spareitemLocation.data.ts                 | 114 ++++++++++++++++++
 2 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
index f5fb9f787..e7ac96dcd 100644
--- a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
@@ -47,6 +47,7 @@
     :apiUpdate="SpareitemLocationApi.updateSpareitemLocation"
     :apiCreate="SpareitemLocationApi.createSpareitemLocation"
     @searchTableSuccess="searchTableSuccess"
+    @clearSearchInput="clearSearchInput"
     :isBusiness="false"
   />
 
@@ -75,12 +76,36 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(SpareitemLocation.allSchemas.tableColumns)
-
+const clearSearchInput = (field)=>{
+  console.log('field',field)
+  if('itemCode' == field){
+    //物料代码
+    basicFormRef.value.formRef.setValues({
+      name: '',
+      desc1: '',
+      desc2: ''
+    })
+  }else if('locationCode' == field){
+    // 库位代码
+    basicFormRef.value.formRef.setValues({
+      locationName: '',
+    })
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    if(formField=='itemCode'){
+      //物料代码
+      setV['name'] = val[0]['code']
+      setV['desc1'] = val[0]['desc1']
+      setV['desc2'] = val[0]['desc2']
+    }else if(formField=='locationCode'){
+      // 库位代码
+      setV['locationName'] = val[0]['name']
+    }
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts
index 7f9355c21..2959825a8 100644
--- a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts
+++ b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/spareitemLocation.data.ts
@@ -1,5 +1,11 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
+import * as ItembasicApi from "@/api/wms/itembasic";
+import * as ItemAccountsApi from '@/api/eam/itemAccounts'
+import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
 // 表单校验
 export const SpareitemLocationRules = reactive({
@@ -13,42 +19,147 @@ export const SpareitemLocation = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [
+        //   {
+        //   key:'supplierCode',
+        //   value:'supplierCode',
+        //   isMainValue: true
+        // },
+        ],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
+      }
+    },
+    table: {
+      width: 180
+    }
   },
   {
     label: '名称',
     field: 'name',
     sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 180
+    }
   },
   {
     label: '描述1',
     field: 'desc1',
     sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 180
+    }
   },
   {
     label: '描述2',
     field: 'desc2',
     sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 180
+    }
   },
   {
     label: '库位代码',
     field: 'locationCode',
     sort: 'custom',
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true
+        }], // 失去焦点校验参数
+      }
+    },
+    table: {
+      width: 180
+    }
   },
   {
     label: '库位名称',
     field: 'locationName',
     sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 180
+    }
   },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 110
+    }
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    table: {
+      width: 220
+    }
   },
   {
     label: '创建时间',
@@ -65,6 +176,9 @@ export const SpareitemLocation = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    table: {
+      width: 220
+    }
   },
   {
     label: '操作',

From 55b3f53a7af9bc28183435ca3295844f443c82c4 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 6 Dec 2024 19:04:01 +0800
Subject: [PATCH 162/225] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E7=BB=88=E6=80=81=E9=83=BD=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/countadjust/countadjustRequestMain/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 5839b0a9d..5779e163c 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -73,7 +73,7 @@
     :detailButtonIsShowAdd="false"
     :detailButtonIsShowEdit="false"
     :detailButtonIsShowDelete="true"
-    :detailButtonIsShowAddStatusArray="['1']"
+    :detailButtonIsShowAddStatusArray="['1','2','3','4','6','7']"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />

From b8d43213e41eac0d67778b2cd5ef077136519c00 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 9 Dec 2024 08:42:00 +0800
Subject: [PATCH 163/225] =?UTF-8?q?FWHL-85WMS=E5=BA=93=E5=AD=98=E4=BA=8B?=
 =?UTF-8?q?=E5=8A=A1=E5=AF=BC=E5=87=BA=EF=BC=8C=E9=80=9A=E8=BF=87=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=90=8E=EF=BC=8C=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=90=8E=E7=9A=84=E5=88=97=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E3=80=82=E7=9B=AE=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=AD=9B=E9=80=89=E5=90=8E=E5=AF=BC=E5=87=BA=E4=BA=86?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/transaction/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/transaction/index.ts b/src/api/wms/transaction/index.ts
index 739473073..14d04ad5a 100644
--- a/src/api/wms/transaction/index.ts
+++ b/src/api/wms/transaction/index.ts
@@ -63,8 +63,8 @@ export const deleteTransaction = async (id: number) => {
 // 导出库存事务 Excel
 export const checkExportTransaction = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
     const data = {...params}
+    delete data.isSearch
     return await request.post({ url: '/wms/transaction/export-excel-senior-checkCnt', data })
   } else {
     return await request.get({ url: `/wms/transaction/export-excel-checkCnt`, params })
@@ -74,8 +74,8 @@ export const checkExportTransaction = async (params) => {
 // 导出库存事务 Excel
 export const exportTransaction = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
     const data = {...params}
+    delete data.isSearch
     return await request.downloadPost({ url: '/wms/transaction/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/transaction/export-excel`, params })

From 8240c8b4b3b033030150c61c8662c6d256743082 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 9 Dec 2024 08:53:08 +0800
Subject: [PATCH 164/225] FWHL-71

---
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 1b906d432..2184c3046 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -435,7 +435,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: !(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty),
+        hide: row.type=='DISCRETE'?!(!isShowMainButton(row, ['4'])&&row.shippedQty<row.planQty):isShowMainButton(row, ['4']),
         type: 'primary',
         icon: '',
         color: '',

From 3a8bdf86a5bac80a172c434ff92c99adfb42c54b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 9 Dec 2024 09:34:07 +0800
Subject: [PATCH 165/225] FWHL-75

---
 .../productscrapRequestMain/index.vue         | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 900f61ccf..cecb4643c 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -141,6 +141,7 @@ import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BomDismantleApi from "@/api/wms/bomDismantle"
 import * as BomApi from "@/api/wms/bom";
+import * as SwitchApi from '@/api/wms/switch'
 import * as BalanceApi from "@/api/wms/balance";
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -356,11 +357,6 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
   }else{
     isShowFooterButtton.value = true
     isShowReduceButtonSelection.value = true
-    ProdcutscrapBomScrap.allSchemas.tableFormColumns.forEach(item=>{
-      if(item.field=='qty'){
-        item.tableForm.disabled = false
-      }
-    })
     bomSearchData.value = ''
     bomTableList.value = detatableDataBom.tableList
     detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
@@ -785,6 +781,22 @@ const openForm =async (type: string, row?: number) => {
     defaultButtons.formSaveBtn({ hide : mainStatus.value != 1 }), // 保存
     defaultButtons.formCloseBtn(null) // 关闭
   ]
+  try {
+    let switch1  = await SwitchApi.getByCode('productscrapBomEditSwitch')
+    console.log('switch',switch1)
+    ProdcutscrapBomScrap.allSchemas.tableFormColumns.map((bomItem) => {
+        if (bomItem.field == 'qty') {
+          bomItem.tableForm.disabled = switch1=='FALSE'
+        }
+    })
+  } catch {
+    ProdcutscrapBomScrap.allSchemas.tableFormColumns.map((bomItem) => {
+        if (bomItem.field == 'qty') {
+          bomItem.tableForm.disabled = false
+        }
+    })
+  }
+
   if(type == 'create'){
     ProductscrapRequestMain.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'productionLineCode'){

From f6539620d1e4cee37e449fae126c6693923e7d70 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 9 Dec 2024 14:55:36 +0800
Subject: [PATCH 166/225] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategySetting/spareitemLocation/index.vue            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
index e7ac96dcd..1b2074885 100644
--- a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
@@ -174,6 +174,13 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  SpareitemLocation.allSchemas.formSchema.forEach(item=>{
+    if(item.field == 'itemCode'){
+      item.componentProps.enterSearch = type=='create'
+      item.componentProps.isSearchList = type=='create'
+      item.componentProps.disabled = type!='create'
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 

From eb6381663997f9365bc0211582e8fc31719a70bc Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 9 Dec 2024 16:30:37 +0800
Subject: [PATCH 167/225] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BEpagesize?=
 =?UTF-8?q?=3D500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturn/productionreturnRequestMainNo/index.vue    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index bb512fad1..d67dcb7fc 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -495,6 +495,8 @@ const buttonTableClick = async (val, row) => {
       message.warning('已创建过标签！！！')
       return
     }
+    detatableData.pageSize = 500
+
     detatableData.params = {
       masterId:row.masterId
     }

From 11811db9a7cad43963124754f3c8863c3e11dc68 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 9 Dec 2024 17:01:08 +0800
Subject: [PATCH 168/225] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/strategySetting/spareitemLocation/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
index 1b2074885..7532d31b5 100644
--- a/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/spareitemLocation/index.vue
@@ -128,7 +128,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({hasPermi:'wms:spareitemLocation:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:spareitemLocation:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
+  // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',

From 8022884aba77eed406e6d9cf4a50bdb6eec2917e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:33:27 +0800
Subject: [PATCH 169/225] =?UTF-8?q?FWHL-98SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=88=87=E6=8D=A2=E4=B8=BA=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E7=9A=84=E6=9B=B4=E5=A4=9A=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C=E3=80=82=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XButton/src/ButtonBaseMore.vue | 21 +++++++++++++------
 .../supplierdeliverRequestMain/index.vue      |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index f1b7574d1..9a4e459e2 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -14,11 +14,11 @@
       <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>
     </el-button>
   </div>
-  <el-dropdown placement="top-start" v-if="showList().length>3">
-    <el-button link class="more"> 更多 </el-button>
+  <el-dropdown placement="top-start" v-if="showList().length>showMoreLength">
+    <el-button link class="more" style="justify-self: flex-end;"> {{ t('ts.更多') }} </el-button>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+3" class="btn-div">
+        <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+showMoreLength" class="btn-div">
           <el-button
             v-show="!item.hide"
             :type="item.type"
@@ -44,6 +44,7 @@ import { clearButtonBlurHandle } from '@/utils/index'
 import rowDrop from '@/components/rowDrop/index.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 const { wsCache } = useCache()
+const { t } = useI18n() // 国际化
 
 const props = defineProps({
   Butttondata: {
@@ -60,6 +61,10 @@ const props = defineProps({
     type: Object,
     default: null
   },
+  showMoreLength: {
+    type: Number,
+    default: 3
+  }
 })
 const showList = ()=>{
   const all_permission = '*:*:*'
@@ -80,13 +85,13 @@ const showList = ()=>{
 }
 const getMoreList = computed(()=>{
   let list = showList()
-  return list.slice(3)
+  return list.slice(props.showMoreLength)
 })
 const getButtonList = computed(()=>{
   let list = showList()
   if(list.length>3){
     console.log('list===',list)
-    return list.slice(0, 3)
+    return list.slice(0, props.showMoreLength)
   }
   return list
 })
@@ -131,5 +136,9 @@ const updataTableColumns = (val) => {
     margin: 0px;
   }
 }
-
+.more{
+  &.el-button:focus-visible {
+    outline: none;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 14d3475d7..1333b3e35 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -55,7 +55,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBaseMore
+        <ButtonBaseMore :showMoreLength="wsCache.get('lang')=='en-US'?2:3"
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />

From 5c692c425c72c269456f443645adc9873a0c7063 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:34:28 +0800
Subject: [PATCH 170/225] FWHL-97

---
 src/locales/en-US.ts                          | 54 ++++++++++++++++++-
 src/locales/zh-CN.ts                          | 54 ++++++++++++++++++-
 .../supplierApbalanceMain/index.vue           | 10 ++--
 3 files changed, 111 insertions(+), 7 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 3d295d2cb..5a40b7e19 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1298,7 +1298,59 @@ export default {
     发票回转:'Return of invoice',
     发票回转成功: 'The invoice has been successfully forwarded',
     最后更新人: 'Last Updated By',
-    可开票数量范围是:'The range of invoices is'
+    可开票数量范围是:'The range of invoices is',
+    日程待开票数据查询: 'Schedule to be invoiced data query',
+    离散待开票数据查询: 'Discrete invoicing data query',
+    待开票删除数据查询: 'Pending invoicing delete data query',
+    采购离散订单查看: 'Purchase discrete order view',
+    供应商对账管理: 'Supplier reconciliation management',
+    询证函日期管理: 'Confirmation date management',
+    月份: 'month',
+    日期: 'date',
+    公司代码: 'company code',
+    月: 'month',
+    日: 'day',
+    年度: 'year',
+    月度: 'monthly',
+    应付挂账金额: 'Amount payable payable',
+    其他应付金额: 'Other amounts payable',
+    预付金额: 'Amount paid in advance',
+    暂估金额: 'Provisional estimated amount',
+    暂估余额: 'Provisional estimated balance',
+    活动金额: 'Amount of activity',
+    打印开始时间: 'Print start time',
+    打印结束时间: 'Print end time',
+    票据总数: 'Total number of bills',
+    实际开票数量: 'Actual invoice quantity',
+    发票申请单号: 'Invoice application number',
+    已读状态: 'Read state',
+    价差合计: 'Total spread',
+    发票未税金额: 'Invoice amount not taxed',
+    发票税额: 'Invoice tax amount',
+    发票价税合计: 'Invoice value and tax total',
+    未税尾差: 'Untaxed residuals',
+    税额尾差: 'The tax tail difference',
+    价差合计尾差: 'Spread sum tail spread',
+    价税合计尾差: 'Total difference in value and tax',
+    财务凭证号: 'Financial Voucher No.',
+    供应商维护税额: 'Supplier maintenance tax',
+    供应商维护未税金额: 'supplier maintains the untaxed amount',
+    供应商维护价税合计: 'Total supplier maintenance price and tax',
+    回转日期: 'Date of return',
+    说明: 'Notes',
+    回转凭证号: 'Turn voucher number',
+    凭证描述: 'Credential Description',
+    恢复: 'recovery',
+    部分开票: 'Partial billing',
+    发票回转中: 'The invoice is being transferred',
+    询证: 'confirmation',
+    请选择年: 'Please select Year',
+    请选择月: 'Please select month',
+    请选择日: 'Please select day',
+    回调函明细: 'Details of callback letter',
+    履历表: 'Resume',
+    更多: 'more'
+
   },
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 5e531dc5f..fb1be92aa 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1296,7 +1296,59 @@ export default {
     发票回转:'发票回转',
     发票回转成功: '发票回转成功',
     最后更新人:'最后更新人',
-    可开票数量范围是:'可开票数量范围是'
+    可开票数量范围是:'可开票数量范围是',
+    日程待开票数据查询: '日程待开票数据查询',
+    离散待开票数据查询: '离散待开票数据查询',
+    待开票删除数据查询: '待开票删除数据查询',
+    采购离散订单查看: '采购离散订单查看',
+    供应商对账管理: '供应商对账管理',
+    询证函日期管理: '询证函日期管理',
+    月份: '月份',
+    日期: '日期',
+    公司代码: '公司代码',
+    月: '月',
+    日: '日',
+    年度: '年度',
+    月度: '月度',
+    应付挂账金额: '应付挂账金额',
+    其他应付金额: '其他应付金额',
+    预付金额: '预付金额',
+    暂估金额: '暂估金额',
+    暂估余额: '暂估余额',
+    活动金额: '活动金额',
+    打印开始时间: '打印开始时间',
+    打印结束时间: '打印结束时间',
+    票据总数: '票据总数',
+    实际开票数量: '实际开票数量',
+    发票申请单号: '发票申请单号',
+    已读状态: '已读状态',
+    价差合计: '价差合计',
+    发票未税金额: '发票未税金额',
+    发票税额: '发票税额',
+    发票价税合计: '发票价税合计',
+    未税尾差: '未税尾差',
+    税额尾差: '税额尾差',
+    价差合计尾差: '价差合计尾差',
+    价税合计尾差: '价税合计尾差',
+    财务凭证号: '财务凭证号',
+    供应商维护税额: '供应商维护税额',
+    供应商维护未税金额: '供应商维护未税金额',
+    供应商维护价税合计: '供应商维护价税合计',
+    回转日期: '回转日期',
+    说明: '说明',
+    回转凭证号: '回转凭证号',
+    凭证描述: '凭证描述',
+    恢复: '恢复',
+    部分开票: '部分开票',
+    发票回转中: '发票回转中',
+    询证: '询证',
+    请选择年: '请选择年',
+    请选择月: '请选择月',
+    请选择日: '请选择日',
+    回调函明细: '回调函明细',
+    履历表: '履历表',
+    更多: '更多'
+
   },
 
 }
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index f8a8d9696..c5dc06367 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -3,24 +3,24 @@
     <!-- 搜索工作栏 -->
     <Search ref="searchRef" :schema="SupplierApbalanceMain.allSchemas.searchSchema" @search="searchClick" @reset="resetClick" >
       <template #year>
-        <el-select v-model="year" placeholder="请选择年" @change="(value)=>selectChange(value,'year')">
+        <el-select v-model="year" :placeholder="t(`ts.请选择年`)" @change="(value)=>selectChange(value,'year')">
           <el-option v-for="dict in yearList" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </template>
       <template #month>
-        <el-select v-model="month" placeholder="请选择月" @change="(value)=>selectChange(value,'month')">
+        <el-select v-model="month" :placeholder="t(`ts.请选择月`)" @change="(value)=>selectChange(value,'month')">
           <el-option v-for="dict in monthList" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </template>
       <template #day>
-        <el-select v-model="day" placeholder="请选择日" @change="(value)=>selectChange(value,'day')">
+        <el-select v-model="day" :placeholder="t(`ts.请选择日`)" @change="(value)=>selectChange(value,'day')">
           <el-option v-for="dict in dayList" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </template>
       <template #actionMoreTop>
         <el-button type="primary"   @click="confirmationHandle">
           <Icon class="mr-5px" icon="ep:" />
-          询证
+          {{t(`ts.询证`)}}
           <Icon class="ml-5px" icon="ep:" />
         </el-button>
       </template>
@@ -86,7 +86,7 @@
           :detailButtonIsShowDelete=false
           :slotDetailTabList="[
             {
-              label: '回调函明细',
+              label: t(`ts.回调函明细`),
               prop: 'adjustment'
             }
           ]"

From 455d5176b6752d19ae740f9c2f4aff4f22400e06 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:39:45 +0800
Subject: [PATCH 171/225] =?UTF-8?q?FWHL-102SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=B0=86=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E5=8F=96=E6=B6=88=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E4=BE=9B=E5=BA=94=E5=95=86=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E4=BE=9D?=
 =?UTF-8?q?=E7=84=B6=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 2184c3046..11e85365c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -424,7 +424,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
   }
     return [
       // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') , hasPermi: 'wms:purchase-plan-main:close'}), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受

From a183a58eab944cacaff31f715e198999539c449b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 10:50:51 +0800
Subject: [PATCH 172/225] FWHL-70

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

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 938de9583..829c83855 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -863,6 +863,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         value: 'TRUE',
         isMainValue: false
         }],
+      isShowTableFormSearch: true,
+      verificationPage: ProductionlineitemApi.getProductionlineitemPageBom, // tableForm下方输入框校验失去焦点之后是否正确的方法
       verificationParams: [{
         key: 'itemCode',
         action: '==',

From 40b57405f815fa86431e3c200315ec4180a23a6f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 13:22:16 +0800
Subject: [PATCH 173/225] FWHL-100

---
 .../productionreturnRequestMainNo/index.vue           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index d67dcb7fc..f08808159 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -724,6 +724,17 @@ const submitFormLabel = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  let flag = true
+  detatableData.tableList.forEach(item => {
+    if(!item.supplierItemCode){
+      flag = false
+    }
+  });
+  if(!flag){
+    message.error('请填写供应商代码')
+    return
+  }
+  
   try {
     detatableData.tableList.forEach(async (item) => {
       await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {

From 110277e0d23e15b497a967596216cc62a33c8457 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 14:03:51 +0800
Subject: [PATCH 174/225] =?UTF-8?q?FWHL-61=E5=A4=87=E4=BB=B6=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E8=87=AA=E5=8A=A8=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/spareitemLocation/index.ts           |  8 +++++++-
 .../sparepartReturnRequestMain/index.vue         | 12 ++++++++++++
 .../sparepartReturnRequestMain.data.ts           |  2 +-
 .../sparereceiptRequestMain/index.vue            | 16 +++++++++++++---
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/api/wms/spareitemLocation/index.ts b/src/api/wms/spareitemLocation/index.ts
index 5f5a2e81b..053b7b10f 100644
--- a/src/api/wms/spareitemLocation/index.ts
+++ b/src/api/wms/spareitemLocation/index.ts
@@ -50,4 +50,10 @@ export const exportSpareitemLocation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/spareitem-location/get-import-template' })
-}
\ No newline at end of file
+}
+
+
+// 自动推荐库位
+export const queryItemLocation = async (data) => {
+  return await request.post({ url: `/wms/spareitem-location/queryItemLocation`, data })
+}
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
index 7dd585274..beeda28e4 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue
@@ -108,6 +108,7 @@ import {
 } from './sparepartReturnRequestMain.data'
 import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain'
 import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail'
+import * as SpareitemLocationApi from '@/api/wms/spareitemLocation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItembasicApi from "@/api/wms/itembasic";
 import { formatTime } from '@/utils/index'
@@ -170,6 +171,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           message.warning('不能同时选择可制造和可采购的物料')
         }
         newVal = newVal.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code']))
+
+        
+        let locationList = await SpareitemLocationApi.queryItemLocation({
+          "itemCodeList":newVal.map(item=>(item['code']))
+        })
+        console.log('locationList',locationList)
+
         newVal.forEach(item=>{
           let tfk = JSON.parse(JSON.stringify(tableFormKeys))
           tfk.batch = formatTime(new Date(), 'yyyyMMdd')
@@ -179,6 +187,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           tfk['itemCode'] = item['code']
           tfk['uom'] = item['uom']
           tfk['validityDays'] = item['validityDays']
+          let locationItem = locationList.find(location=>location['itemCode'] == item['code'])
+          if(locationItem){
+            tfk['toLocationCode'] = locationItem['locationCode']
+          }
           tableData.value.push(tfk)
         })
       } else if(formField === 'costcentreCode'){
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
index 9638264f6..956c6b76d 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -639,7 +639,7 @@ export const UnplannedreceiptRequestMainRules = reactive({
     { required: false, message: '请输入项目代码', trigger: 'blur' }
   ],
   toWarehouseCode: [
-    { required: true, message: '请输入到库位代码', trigger: 'blur' }
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index b6bdf9697..0c99e0a8f 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -126,6 +126,7 @@ import {
  } from './sparereceiptRequestMain.data'
 import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
 import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as SpareitemLocationApi from '@/api/wms/spareitemLocation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
@@ -223,7 +224,7 @@ const onEnter = async (field,value)=>{
   formRef.value.setDefaultBlurValue(field,value)
   // getSearchTableData(value,true)
 }
-const updateTableData = (tableList)=>{
+const updateTableData = async (tableList)=>{
   console.log('tableList',tableList)
   let itemCodes = tableList.filter(item=>tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
   console.log('itemCodes',itemCodes)
@@ -234,6 +235,10 @@ const updateTableData = (tableList)=>{
   }
   tableList = tableList.filter(item=>!tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))
   if(tableList.length==0) return
+  let locationList = await SpareitemLocationApi.queryItemLocation({
+    "itemCodeList":tableList.map(item=>(item.itemCode))
+  })
+  console.log('locationList',locationList)
   tableList.forEach(row=>{
     const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
     newRow['poLine'] = row['lineNumber']
@@ -249,7 +254,10 @@ const updateTableData = (tableList)=>{
     newRow['arriveDate'] = dayjs().valueOf()
     //批次
     newRow['batch'] = formatDate(newRow['produceDate'],'YYYYMMDD');
-    newRow['defaultToLocationCode'] =row['defaultLocation']
+    let locationItem = locationList.find(location=>location['itemCode'] == row['itemCode'])
+    if(locationItem){
+      newRow['defaultToLocationCode'] = locationItem['locationCode']
+    }
     if(!tableData.value.find((item:object)=>item.poNumber == newRow.poNumber&&item.itemCode == newRow.itemCode&&item.poLine == newRow.poLine&&item.batch == newRow.batch)){
       tableData.value.push(newRow)
     }
@@ -288,7 +296,9 @@ const getSearchTableData = async (number,isEnter=false)=>{
   }).then((res)=>{
     res.list.forEach((item,index)=>{
       const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
-      findItem['expireTime'] = item['expireTime']
+      if(findItem){
+        findItem['expireTime'] = item['expireTime']
+      }
     })
   })
 }

From 5d8873b6c1acd260445ecdd2665adc5ef70466a7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 14:21:47 +0800
Subject: [PATCH 175/225] =?UTF-8?q?FWHL-106WMS=20=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E8=AE=B0=E5=BD=95=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=20=E6=B8=85=E7=A9=BA=E4=BB=8E=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=8E=E7=BB=86=E4=B9=9F=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRecordMainNew/index.vue             | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index ccc5db4e6..38e2281b2 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -61,7 +61,8 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
-  />
+    @clearSearchInput="clearSearchInput"
+    />
 
 
   <!-- 详情 -->
@@ -373,6 +374,13 @@ const submitForm = async (formType, submitData) => {
     formRef.value.formLoading = false
   }
 }
+const clearSearchInput = (field)=>{
+  console.log('field',field)
+  if('fromLocationCode' == field){
+    //从库位代码
+    tableData.value = []
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   console.log('searchTableSuccess',formField, searchField, val, formRef, type, row)
@@ -415,6 +423,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField=='fromLocationCode'){
         //从库位代码
         setV['fromWarehouseCode'] = val[0]['warehouseCode']
+        tableData.value = []
+
       }else if(formField=='toLocationCode'){
         //到库位代码
         setV['toWarehouseCode'] = val[0]['warehouseCode']

From 7e11648e02d9e68321e455be7035f11f219f2c47 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 10 Dec 2024 14:38:52 +0800
Subject: [PATCH 176/225] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index cb744daa7..41057a8b6 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -239,15 +239,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    {
-      label: '线边盘点',
-      name: 'lineTypeImport',
-      hide: !(row.status==2&&row.lineType==true),
-      type: 'success',
-      color: '',
-      link: true, //文本展现按钮
-      hasPermi: '' // wms:count-job-main:lineTypeImport
-    },
+    // {
+    //   label: '线边盘点',
+    //   name: 'lineTypeImport',
+    //   hide: !(row.status==2&&row.lineType==true),
+    //   type: 'success',
+    //   color: '',
+    //   link: true, //文本展现按钮
+    //   hasPermi: '' // wms:count-job-main:lineTypeImport
+    // },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',

From 93de8502f883deb3cc6fbedd6270cc0a9f97e665 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 15:05:47 +0800
Subject: [PATCH 177/225] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts             | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 373a1ed42..c0c58e367 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1087,6 +1087,13 @@ export const ProductionscrapRequestMain = useCrudSchemas(
         searchTitle: '选择项目代码',
         searchAllSchemas: QadProject.allSchemas,
         searchPage: QadProjectApi.getQadProjectPage,
+        searchCondition: [
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ],
         verificationParams: [{
           key: 'projectCode',
           action: '==',
@@ -1106,6 +1113,13 @@ export const ProductionscrapRequestMain = useCrudSchemas(
           searchTitle: '选择项目代码', // 查询弹窗标题
           searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
           searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ],
           verificationParams: [{
             key: 'projectCode',
             action: '==',

From e990587bb2450188b59a47b4e10fd9fe5c882807 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 10 Dec 2024 15:59:40 +0800
Subject: [PATCH 178/225] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80404?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasereturnJobMain/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts
index 1e5a4a5ce..fbce68aa0 100644
--- a/src/api/wms/purchasereturnJobMain/index.ts
+++ b/src/api/wms/purchasereturnJobMain/index.ts
@@ -109,5 +109,5 @@ export const abandonPurchasereturnJobMain = (id: number) => {
 
 // 更新任务配置
 export const updatePurchasereturnJobConfig = () => {
-  return request.put({ url: '/wms/purchasereceipt-job-main/updatePurchasereturnJobConfig'})
+  return request.put({ url: '/wms/purchasereturn-job-main/updatePurchasereturnJobConfig'})
 }
\ No newline at end of file

From 9d536b489d5d802125b749342d9fb727eddf5021 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 16:11:03 +0800
Subject: [PATCH 179/225] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LabelForm/src/LabelForm.vue    |  6 +--
 .../SearchTable/src/SearchTable.vue           |  4 +-
 src/components/Table/src/Table.vue            |  2 +-
 src/locales/en-US.ts                          | 34 +++++++++++-
 src/locales/zh-CN.ts                          | 31 ++++++++++-
 .../purchasereceiptRequestMain/index.vue      |  6 +--
 .../supplierdeliverRequestMain/index.vue      |  8 +--
 .../supplierdeliverRequestMain/labelForm.vue  | 52 +++++++++----------
 .../supplierdeliverRequestMain.data.ts        |  8 +--
 9 files changed, 106 insertions(+), 45 deletions(-)

diff --git a/src/components/LabelForm/src/LabelForm.vue b/src/components/LabelForm/src/LabelForm.vue
index a51ca0c70..f4acd8cba 100644
--- a/src/components/LabelForm/src/LabelForm.vue
+++ b/src/components/LabelForm/src/LabelForm.vue
@@ -68,7 +68,7 @@
                                 1
                               )
                             "
-                            >移出</el-button
+                            >{{ t('ts.移出') }}</el-button
                           >
                         </template>
                       </el-table-column>
@@ -97,7 +97,7 @@
                     type="warning"
                     link
                     @click="removeT(scope.row, scope.$index, scope1.row, scope1.$index)"
-                    >移出</el-button
+                    >{{ t('ts.移出') }}</el-button
                   >
                 </template>
               </el-table-column>
@@ -143,7 +143,7 @@
                       @click="
                         removeX(scope.row, scope.$index, item, index, scope1.row, scope1.$index)
                       "
-                      >移出</el-button
+                      >{{ t('ts.移出') }}</el-button
                     >
                   </template>
                 </el-table-column>
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index b32d0d271..1742328a6 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -39,8 +39,8 @@
     <template #footer>
       <div class="flex items-center">
         <slot :name="'selectionsActions'+formFieldRef" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-        <el-button @click="searchDialogVisible = false">取 消</el-button>
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">{{ t(`ts.${'确 定'}`) }}</el-button>
+        <el-button @click="searchDialogVisible = false">{{ t(`ts.${'取 消'}`) }}</el-button>
 
         <slot name="actions"></slot>
       </div>
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index e3499a988..6cf207ac3 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -423,7 +423,7 @@ export default defineComponent({
           }}
         </ElTable>
         {unref(getProps).selectionTotal ? (
-          <div class="mt-15px float-left" style='height:32px;line-height:32px'>已选{selections.value.length}条数据</div>
+          <div class="mt-15px float-left" style='height:32px;line-height:32px'>{t('ts.已选')}{selections.value.length}{t('ts.条数据')}</div>
         ):undefined}
         {unref(getProps).pagination ? (
           // update by 芋艿：保持和 Pagination 组件一致
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 5a40b7e19..f72b8b053 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1349,7 +1349,39 @@ export default {
     请选择日: 'Please select day',
     回调函明细: 'Details of callback letter',
     履历表: 'Resume',
-    更多: 'more'
+    更多: 'more',
+    要求到货时间: 'Request arrival time',
+    发货联系人姓名: 'Shipping contact name',
+    发货联系人电话: 'Shipping contact number',
+    申请发货数量: 'Application for shipment quantity',
+    发货批次: 'Batch of shipment',
+    在途数量: 'Number in transit',
+    空运: 'Air transport',
+    海运: 'Sea freight',
+    陆运: 'Land transport',
+    '请填写要货计划单号！':'Please fill in the requisition plan number!',
+    箱规格: 'Specification of case',
+    箱规格数量: 'Specifications and quantity of boxes',
+    托规格: 'Gauge of support',
+    托规格数量: 'Specification and quantity',
+    '重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！': 'After regenerating the label, the original label must be torn, print and paste the new label, if the label is wrong, the goods will be rejected!!',
+    移出: 'Move out',
+    标签: 'Labels',
+    箱行号: 'Packing line number',
+    添加箱: 'Add box',
+    托行号: 'Trustee number',
+    箱个数: 'Number of bins',
+    添加托: 'Add a tray',
+    托个数: 'Number of brackets',
+    托数量: 'Quantity of consignment',
+    箱数量: 'Number of boxes',
+    已选: 'selected ',
+    条数据: ' data',
+    是否已读: 'Yes or no read',
+    采购订单类型: 'Purchase Order Type',
+    // 数量: '',
+    // 数量: '',
+    // 数量: '',
 
   },
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index fb1be92aa..c04c5a13e 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1347,7 +1347,36 @@ export default {
     请选择日: '请选择日',
     回调函明细: '回调函明细',
     履历表: '履历表',
-    更多: '更多'
+    更多: '更多',
+    要求到货时间: '要求到货时间',
+    发货联系人姓名: '发货联系人姓名',
+    发货联系人电话: '发货联系人电话',
+    申请发货数量: '申请发货数量',
+    发货批次: '发货批次',
+    在途数量: '在途数量',
+    空运: '空运',
+    海运: '海运',
+    陆运: '陆运',
+    '请填写要货计划单号！':'请填写要货计划单号！',
+    箱规格: '箱规格',
+    箱规格数量: '箱规格数量',
+    托规格: '托规格',
+    托规格数量: '托规格数量',
+    '重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！': '重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！',
+    移出: '移出',
+    标签: '标签',
+    箱行号: '箱行号',
+    添加箱: '添加箱',
+    托行号: '托行号',
+    箱个数: '箱个数',
+    添加托: '添加托',
+    托个数: '托个数',
+    托数量: '托数量',
+    箱数量: '箱数量',
+    已选: '已选 ',
+    条数据: ' 条数据',
+    是否已读: '是否已读d',
+    采购订单类型: '采购订单类型',
 
   },
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 68090068d..995b51cce 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -497,11 +497,11 @@ const buttonTableClick = async (val, row) => {
     tableObject.loading = true
     ElMessageBox.confirm(
       `<div>
-    <strong style="color:red;font-size:18px">重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！</strong>
+    <strong style="color:red;font-size:18px">${t(`ts.${'重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！'}`)}</strong>
     <br>
-    <span>重新生成标签会删除上次生成的标签，是否确认继续？</span>
+    <span>${t(`ts.${'重新生成标签会删除上次生成的标签，是否确认继续？'}`)}</span>
     </div>`,
-      '提示',
+      t('ts.提示'),
       {
         confirmButtonText: t('ts.确 认'),
         cancelButtonText: t('ts.取 消'),
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 1333b3e35..bb821346e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -665,12 +665,12 @@ const buttonTableClick = async (val, row) => {
     tableObject.loading = true
     ElMessageBox.confirm(
       `<div>
-    <strong style="color:red;font-size:18px">重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！</strong>
+    <strong style="color:red;font-size:18px">${t(`ts.${'重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！'}`)}</strong>
     <br>
-    <span>重新生成标签会删除上次生成的标签，是否确认继续？</span>
+    <span>${t(`ts.${'重新生成标签会删除上次生成的标签，是否确认继续？'}`)}</span>
     </div>`,
-      '提示',
-      {
+      t('ts.提示'),
+    {
         confirmButtonText: t('ts.确 认'),
         cancelButtonText: t('ts.取 消'),
         dangerouslyUseHTMLString: true
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 256066df1..ed0e39560 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="dialogTableVisible" title="标签" width="1100">
+  <el-dialog v-model="dialogTableVisible" :title="t('ts.标签')" width="1100">
     <div  v-loading="isLoading">
 <el-table
       :data="showTableData()"
@@ -31,12 +31,12 @@
                 <template #default="scope1">
                   <div style="margin-left: 150px; margin-top: -8px; margin-bottom: -8px">
                     <el-table :data="scope1.row.children" border style="width: 300px" row-key="id">
-                      <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center">
+                      <el-table-column :label="t('ts.箱行号')" width="100" prop="xPoNumber" align="center">
                         <template #default="scope2">
                           {{ scope2.$index + 1 }}
                         </template>
                       </el-table-column>
-                      <el-table-column label="数量" width="100" prop="qtyTwo" align="center">
+                      <el-table-column :label="t('ts.数量')" width="100" prop="qtyTwo" align="center">
                         <template #default="scope2">
                           <el-input
                             v-model="scope2.row.qtyTwo"
@@ -44,7 +44,7 @@
                           />
                         </template>
                       </el-table-column>
-                      <el-table-column label="添加箱" width="100" prop="add" align="center">
+                      <el-table-column :label="t('ts.添加箱')" width="100" prop="add" align="center">
                         <template #header>
                           <el-button
                             type="primary"
@@ -68,7 +68,7 @@
                                 1
                               )
                             "
-                            >移出</el-button
+                            >{{ t('ts.移出') }}</el-button
                           >
                         </template>
                       </el-table-column>
@@ -76,12 +76,12 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="托行号" width="100" prop="tPoNumber" align="center">
+              <el-table-column :label="t('ts.托行号')" width="100" prop="tPoNumber" align="center">
                 <template #default="scope">
                   {{ scope.$index + 1 }}
                 </template>
               </el-table-column>
-              <el-table-column label="箱个数" width="100" prop="xNumber" align="center">
+              <el-table-column :label="t('ts.箱个数')" width="100" prop="xNumber" align="center">
                 <template #default="scope1">
                   <el-input
                     v-model="scope1.row.xNumber"
@@ -90,20 +90,20 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column label="数量" width="100" prop="qtyOne" align="center" />
-              <el-table-column label="操作" width="100" prop="action" align="center">
+              <el-table-column :label="t('ts.数量')" width="100" prop="qtyOne" align="center" />
+              <el-table-column :label="t('ts.操作')" width="100" prop="action" align="center">
                 <template #default="scope1">
                   <el-button
                     type="warning"
                     link
                     @click="removeT(scope.row, scope.$index, scope1.row, scope1.$index)"
-                    >移出</el-button
+                    >{{ t('ts.移出') }}</el-button
                   >
                 </template>
               </el-table-column>
-              <el-table-column label="添加托" width="100" prop="add" align="center">
+              <el-table-column :label="t('ts.添加托')" width="100" prop="add" align="center">
                 <template #header>
-                  <el-button type="primary" link @click="addT(scope.row)">添加托</el-button>
+                  <el-button type="primary" link @click="addT(scope.row)">{{t('ts.添加托')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -114,12 +114,12 @@
           >
             <div v-for="(item, index) in scope.row.packageList" :key="index">
               <el-table :data="item.children" border style="width: 300px" row-key="id">
-                <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center">
+                <el-table-column :label="t('ts.箱行号')" width="100" prop="xPoNumber" align="center">
                   <template #default="scope1">
                     {{ scope1.$index + 1 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="数量" width="100" prop="qtyOne" align="center">
+                <el-table-column :label="t('ts.数量')" width="100" prop="qtyOne" align="center">
                   <template #default="scope1">
                     <el-input
                       v-model="scope1.row.qtyTwo"
@@ -127,13 +127,13 @@
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="添加箱" width="100" prop="add" align="center">
+                <el-table-column :label="t('ts.添加箱')" width="100" prop="add" align="center">
                   <template #header>
                     <el-button
                       type="primary"
                       link
                       @click="addX(scope.row, scope.$index, item, index)"
-                      >添加箱</el-button
+                      >{{t('ts.添加箱')}}</el-button
                     >
                   </template>
                   <template #default="scope1">
@@ -143,7 +143,7 @@
                       @click="
                         removeX(scope.row, scope.$index, item, index, scope1.row, scope1.$index)
                       "
-                      >移出</el-button
+                      >{{ t('ts.移出') }}</el-button
                     >
                   </template>
                 </el-table-column>
@@ -152,17 +152,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
-      <el-table-column label="批次" width="150" prop="batch" align="center" />
-      <el-table-column label="数量" width="100" prop="qty" align="center" />
-      <el-table-column label="计量单位" width="100" prop="uom" align="center">
+      <el-table-column :label="t('ts.物料代码')" width="150" prop="itemCode" align="center" />
+      <el-table-column :label="t('ts.批次')" width="150" prop="batch" align="center" />
+      <el-table-column :label="t('ts.数量')" width="100" prop="qty" align="center" />
+      <el-table-column :label="t('ts.计量单位')" width="100" prop="uom" align="center">
         <template #default="scope"> {{ uomLabel(scope.row) }}</template>
       </el-table-column>
-      <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
-      <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
-      <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" />
-      <el-table-column label="箱规格" width="100" prop="packUnit" align="center" />
-      <el-table-column label="箱数量" width="100" prop="packQty" align="center" />
+      <el-table-column :label="t('ts.托个数')" width="100" prop="allTuoQty" align="center" />
+      <el-table-column :label="t('ts.托规格')" width="100" prop="secondPackUnit" align="center" />
+      <el-table-column :label="t('ts.托数量')" width="100" prop="secondPackQty" align="center" />
+      <el-table-column :label="t('ts.托数量')" width="100" prop="packUnit" align="center" />
+      <el-table-column :label="t('ts.托数量')" width="100" prop="packQty" align="center" />
     </el-table>
     <el-pagination
       v-show="tableData.length > 10"
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 6f9d5991a..d08f30be8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1047,7 +1047,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           {
             key: 'number',
             value: 'ppNumber',
-            message: '请填写要货计划单号！',
+            message: t(`ts.${'请填写要货计划单号！'}`),
             isMainValue: true
           },
           {
@@ -1081,7 +1081,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         {
           key: 'number',
           value: 'ppNumber',
-          message: '请填写要货计划单号！',
+          message: t(`ts.${'请填写要货计划单号！'}`),
           isMainValue: true
         },
         {
@@ -1468,7 +1468,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
           {
             key: 'number',
             value: 'ppNumber',
-            message: '请填写要货计划单号！',
+            message: t(`ts.${'请填写要货计划单号！'}`),
             isMainValue: true
           },
           {
@@ -1492,7 +1492,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         {
           key: 'number',
           value: 'ppNumber',
-          message: '请填写要货计划单号！',
+          message: t(`ts.${'请填写要货计划单号！'}`),
           isMainValue: true
         },
         {

From 17a11770b9ade41237bc68a2f05d5fd323192649 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 17:26:11 +0800
Subject: [PATCH 180/225] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  2 +-
 .../SearchTable/src/SearchTable.vue           |  2 +-
 .../SearchTableCount/src/SearchTableCount.vue |  4 +-
 .../SearchTableV2/src/SearchTableV2.vue       |  4 +-
 src/locales/en-US.ts                          | 52 ++++++++++++++++++-
 src/locales/zh-CN.ts                          | 45 ++++++++++++++++
 src/views/login/components/QRCodePDA.vue      |  3 +-
 .../supplierUser/supplierUser.data.ts         |  8 +--
 .../purchaseDiscreteOrderMain/index.vue       |  8 +--
 .../supplierinvoiceRecordMain/index.vue       |  8 +--
 .../supplierinvoiceRequestMain/index.vue      | 10 ++--
 .../index.vue                                 |  6 +--
 12 files changed, 123 insertions(+), 29 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 618f4c084..fbc4bb175 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -808,7 +808,7 @@ const submitForm = async () => {
       const validateForm = await tableFormRef.value.validateForm()
       if (!validateForm && props.tableFormDataLength) {
         if (props.tableData.length == 0) {
-          message.warning('请填写明细信息！')
+          message.warning(t(`ts.${'请填写明细信息！'}`))
           formLoading.value = false
           return
         }
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 1742328a6..0483631d5 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -269,7 +269,7 @@ const submitForm = async () => {
     // 多选
   } else {
     if (selections.length == 0) {
-      message.warning('至少选择一条数据！')
+      message.warning(t(`ts.${'至少选择一条数据！'}`))
       formLoading.value = false
       return
     }
diff --git a/src/components/SearchTableCount/src/SearchTableCount.vue b/src/components/SearchTableCount/src/SearchTableCount.vue
index d49c81f67..754fa0223 100644
--- a/src/components/SearchTableCount/src/SearchTableCount.vue
+++ b/src/components/SearchTableCount/src/SearchTableCount.vue
@@ -70,7 +70,7 @@
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// const { t } = useI18n() // 国际化
+const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const radioListType = ref(1)
 
@@ -193,7 +193,7 @@ const submitForm = async () => {
       // 多选
     } else {
       if (selections.length == 0) {
-        message.warning('至少选择一条数据！')
+        message.warning(t(`ts.${'至少选择一条数据！'}`))
         formLoading.value = false
         return
       }
diff --git a/src/components/SearchTableV2/src/SearchTableV2.vue b/src/components/SearchTableV2/src/SearchTableV2.vue
index cfee305e9..f39c1a3f0 100644
--- a/src/components/SearchTableV2/src/SearchTableV2.vue
+++ b/src/components/SearchTableV2/src/SearchTableV2.vue
@@ -38,7 +38,7 @@
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// const { t } = useI18n() // 国际化
+const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const route = useRoute() // 路由信息
@@ -168,7 +168,7 @@ const submitForm = async () => {
     // 多选
   }else{
     if(selections.length == 0) {
-      message.warning('至少选择一条数据！')
+      message.warning(t(`ts.${'至少选择一条数据！'}`))
       formLoading.value = false
       return
     }
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index f72b8b053..e2503cc97 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1379,8 +1379,56 @@ export default {
     条数据: ' data',
     是否已读: 'Yes or no read',
     采购订单类型: 'Purchase Order Type',
-    // 数量: '',
-    // 数量: '',
+    PDA安装程序下载链接:'PDA installer download link',
+    ASN直接收货: 'The ASN receives the goods directly',
+    ASN外部收货: 'ASN external receipt',
+    备件收货: 'Receiving spare parts',
+    目标库位: 'Target location',
+    是否已发送检验申请: 'Has the inspection application been sent',
+    是否已生成上架申请: 'Whether the shelf application has been generated',
+    物料类型: 'Item Type',
+    明细备注: 'Detailed remarks',
+    应收: 'Accounts receivable',
+    实收: 'Paid in',
+    缺收: 'Lack of harvest',
+    Q2通知单: 'Q2 Notice',
+    Q2通知单号: 'Q2 Advice No',
+    退货原因: 'Reasons for return',
+    退货原因描述: 'Description of reasons for return',
+    返利税额: 'Tax rebate',
+    返利价税合计: 'Total rebate value and tax',
+    单价差额: 'Unit price difference',
+    到货数量: 'Quantity of goods arriving',
+    返利未税金额: 'Rebate the amount of unpaid tax',
+    发票号码: 'Invoice number',
+    尾差: 'Difference of tail',
+    采购价格审批时间: 'Purchase price approval time',
+    价差通过说明: 'The spread is explained',
+    财务过账日期: 'Financial Posting date',
+    工厂地点: 'Factory location',
+    参考凭证描述: 'Reference credential Description',
+    汇总信息: 'Summary information',
+    含返利合计: 'Total rebate included',
+    含返利未税: 'Including rebate without tax',
+    含返利税额: 'Including rebate tax',
+    物料描述: 'Material description',
+    合同金额: 'Amount of contract',
+    采购金额: 'Amount of purchase',
+    '至少选择一条数据！':'Select at least one piece of data!',
+    '请填写明细信息！':'Please fill in the details!',
+    请选择采购员: 'Please select buyer',
+    请选择用户信息: 'Please select user information',
+    请选择供应商信息: 'Please select supplier information',
+    请选择采购订单: 'Please select Purchase order',
+    是否允许超发: 'Whether excessive hair is allowed',
+    请选择库区代码: 'Please select the library code',
+    请选择仓库代码: 'Please select the repository code',
+    请选择库位组代码: 'Select the library bit group code',
+    // 物料描述: '',
+    // 返利未税金额: '',
+    // 财务过账日期: '',
+    // Q2通知单: '',
+    // ASN外部收货: '',
     // 数量: '',
 
   },
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index c04c5a13e..553b9db87 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1377,6 +1377,51 @@ export default {
     条数据: ' 条数据',
     是否已读: '是否已读d',
     采购订单类型: '采购订单类型',
+    PDA安装程序下载链接:'PDA安装程序下载链接',
+    ASN直接收货: 'ASN直接收货',
+    ASN外部收货: 'ASN外部收货',
+    备件收货: '备件收货',
+    目标库位: '目标库位',
+    是否已发送检验申请: '是否已发送检验申请',
+    是否已生成上架申请: '是否已生成上架申请',
+    物料类型: '物料类型',
+    明细备注: '明细备注',
+    应收: '应收',
+    实收: '实收',
+    缺收: '缺收',
+    Q2通知单: 'Q2通知单',
+    Q2通知单号: 'Q2通知单号',
+    退货原因: '退货原因',
+    退货原因描述: '退货原因描述',
+    返利税额: '返利税额',
+    返利价税合计: '返利价税合计',
+    单价差额: '单价差额',
+    到货数量: '到货数量',
+    返利未税金额: '返利未税金额',
+    发票号码: '发票号码',
+    尾差: '尾差',
+    采购价格审批时间: '采购价格审批时间',
+    价差通过说明: '价差通过说明',
+    财务过账日期: '财务过账日期',
+    工厂地点: '工厂地点',
+    参考凭证描述: '参考凭证描述',
+    汇总信息: '汇总信息',
+    含返利合计: '含返利合计',
+    含返利未税: '含返利未税',
+    含返利税额: '含返利税额',
+    物料描述: '物料描述',
+    合同金额: '合同金额',
+    采购金额: '采购金额',
+    '至少选择一条数据！':'至少选择一条数据！',
+    '请填写明细信息！':'请填写明细信息！',
+    请选择采购员: '请选择采购员',
+    请选择用户信息: '请选择用户信息',
+    请选择供应商信息: '请选择供应商信息',
+    请选择采购订单: '请选择采购订单',
+    是否允许超发: '是否允许超发',
+    请选择库区代码: '请选择库区代码',
+    请选择仓库代码: '请选择仓库代码',
+    请选择库位组代码: '请选择库位组代码',
 
   },
 
diff --git a/src/views/login/components/QRCodePDA.vue b/src/views/login/components/QRCodePDA.vue
index d8d3b05fc..762af66da 100644
--- a/src/views/login/components/QRCodePDA.vue
+++ b/src/views/login/components/QRCodePDA.vue
@@ -5,12 +5,13 @@
       <!-- <vue-qr bgSrc='https://img2.baidu.com/it/u=1188690822,3145215011&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1038' logoSrc="https://img1.baidu.com/it/u=605875105,1314303687&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500" text="Hello world!" :size="200"></vue-qr> -->
       <vue-qr :text="apkUrl" :size="200" ></vue-qr>
     </div>
-    <el-button type="primary" v-if="pdaUrl" link @click="handleClose">PDA安装程序下载链接</el-button>
+    <el-button type="primary" v-if="pdaUrl" link @click="handleClose">{{ t('ts.PDA安装程序下载链接') }}</el-button>
   </div>
 </template>
 <script setup lang="ts">
 import { downloadApk } from "@/api/login";
 import { getPDAUrl,getNeedCode } from '@/utils/systemParam'
+const { t } = useI18n() // 国际化
 
 // import logoImg from '@/assets/imgs/logo_white_blue.png'
 
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index e3d030079..a36326ea3 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -105,7 +105,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选用户信息',
+      searchListPlaceholder: '请选择用户信息',
       searchField: 'username',
       searchTitle: '用户信息',
       searchAllSchemas: User.allSchemas,
@@ -117,7 +117,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
         enterSearch: true,
         dialogWidth:'1025px',//搜索出来弹窗的宽度
         isSearchList: true,
-        searchListPlaceholder: '请选用户信息',
+        searchListPlaceholder: '请选择用户信息',
         searchField: 'username',
         searchTitle: '用户信息',
         searchAllSchemas: User.allSchemas,
@@ -148,7 +148,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选供应商信息',
+      searchListPlaceholder: '请选择供应商信息',
       searchField: 'code',
       searchTitle: '供应商信息',
       searchAllSchemas: Supplier.allSchemas,
@@ -159,7 +159,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isSearchList: true,
-        searchListPlaceholder: '请选供应商信息',
+        searchListPlaceholder: '请选择供应商信息',
         searchField: 'code',
         searchTitle: '供应商信息',
         searchAllSchemas: Supplier.allSchemas,
diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
index 23e035f6c..56c4bcb3e 100644
--- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue
@@ -142,15 +142,15 @@
     >
       <!-- 价税合计尾差 -->
       <template #Descriptions_totalTaxDiffAmount="{ row }">
-        <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
+        <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利合计')}}:{{ row['rebateTotal'] }})</span></span>
       </template>
       <!-- 未税尾差 -->
       <template #Descriptions_beforeTaxDiffAmount="{ row }">
-        <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
+        <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利未税')}}:{{ row['discountAmount1'] }})</span></span>
       </template>
       <!-- 税额尾差 -->
       <template #Descriptions_taxAmountDiff="{ row }">
-        <span>{{row['taxAmountDiff']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
+        <span>{{row['taxAmountDiff']}}<span class="red-text"> ({{t('ts.含返利税额')}}:{{ row['rebateTax'] }})</span></span>
       </template>
       <template #differencePrice="{row}">
         <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
@@ -244,7 +244,7 @@
       rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
     })
     if(rows.length==0){
-      message.warning('至少选择一条数据！')
+      message.warning(t(`ts.${'至少选择一条数据！'}`))
       return
     }
     console.log('批量打印',rows.join(','))
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index e35619051..c5a62bd99 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -142,15 +142,15 @@
   >
     <!-- 价税合计尾差 -->
     <template #Descriptions_totalTaxDiffAmount="{ row }">
-      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利合计')}}:{{ row['rebateTotal'] }})</span></span>
     </template>
     <!-- 未税尾差 -->
     <template #Descriptions_beforeTaxDiffAmount="{ row }">
-      <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
+      <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利未税')}}:{{ row['discountAmount1'] }})</span></span>
     </template>
     <!-- 税额尾差 -->
     <template #Descriptions_taxAmountDiff="{ row }">
-      <span>{{row['taxAmountDiff']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
+      <span>{{row['taxAmountDiff']}}<span class="red-text"> ({{t('ts.含返利税额')}}:{{ row['rebateTax'] }})</span></span>
     </template>
     <template #differencePrice="{row}">
       <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
@@ -241,7 +241,7 @@ const handleSelectionPoint = async ()=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
   })
   if(rows.length==0){
-    message.warning('至少选择一条数据！')
+    message.warning(t(`ts.${'至少选择一条数据！'}`))
     return
   }
   console.log('批量打印',rows.join(','))
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index abc916b67..0075424f1 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -182,7 +182,7 @@
   >
     <template #selectionsActionspoLine="{ selections }">
       <div style="text-align: left; margin-right: 10px">
-        系统未税金额:{{
+        {{t('ts.系统未税金额')}}:{{
           Number(
             selections.reduce(
               (prev, item) =>
@@ -321,15 +321,15 @@
   >
     <!-- 价税合计尾差 -->
     <template #Descriptions_totalTaxDiffAmount="{ row }">
-      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利合计')}}:{{ row['rebateTotal'] }})</span></span>
     </template>
     <!-- 未税尾差 -->
     <template #Descriptions_beforeTaxDiffAmount="{ row }">
-      <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
+      <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利未税')}}:{{ row['discountAmount1'] }})</span></span>
     </template>
     <!-- 税额尾差 -->
     <template #Descriptions_taxAmountDiff="{ row }">
-      <span>{{row['taxAmountDiff']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
+      <span>{{row['taxAmountDiff']}}<span class="red-text"> ({{t('ts.含返利税额')}}:{{ row['rebateTax'] }})</span></span>
     </template>
     <template #differencePrice="{ row }">
       <span :class="{ 'red-text': row.differencePrice != 0 }">{{ row.differencePrice }}</span>
@@ -1549,7 +1549,7 @@ const handleSelectionPoint = async () => {
     rows = [...rows, ...item.selectionRows.map((item1) => item1.id)]
   })
   if (rows.length == 0) {
-    message.warning('至少选择一条数据！')
+    message.warning(t(`ts.${'至少选择一条数据！'}`))
     return
   }
   console.log('批量打印', rows.join(','))
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index b5ea4f98a..09c061293 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -122,15 +122,15 @@
   >
     <!-- 价税合计尾差 -->
     <template #Descriptions_totalTaxDiffAmount="{ row }">
-      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> (含返利合计:{{ row['rebateTotal'] }})</span></span>
+      <span>{{row['totalTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利合计')}}:{{ row['rebateTotal'] }})</span></span>
     </template>
     <!-- 未税尾差 -->
     <template #Descriptions_beforeTaxDiffAmount="{ row }">
-      <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> (含返利未税:{{ row['discountAmount1'] }})</span></span>
+      <span>{{row['beforeTaxDiffAmount']}}<span class="red-text"> ({{t('ts.含返利未税')}}:{{ row['discountAmount1'] }})</span></span>
     </template>
     <!-- 税额尾差 -->
     <template #Descriptions_taxAmountDiff="{ row }">
-      <span>{{row['taxAmountDiff']}}<span class="red-text"> (含返利税额:{{ row['rebateTax'] }})</span></span>
+      <span>{{row['taxAmountDiff']}}<span class="red-text"> ({{t('ts.含返利税额')}}:{{ row['rebateTax'] }})</span></span>
     </template>
     <template #differencePrice="{row}">
       <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>

From 94664497d7ce871cf7c595fa6b6234ca71969789 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 09:35:43 +0800
Subject: [PATCH 181/225] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XButton/src/ButtonBaseMore.vue                | 2 +-
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue
index 9a4e459e2..0be296e6e 100644
--- a/src/components/XButton/src/ButtonBaseMore.vue
+++ b/src/components/XButton/src/ButtonBaseMore.vue
@@ -89,7 +89,7 @@ const getMoreList = computed(()=>{
 })
 const getButtonList = computed(()=>{
   let list = showList()
-  if(list.length>3){
+  if(list.length>props.showMoreLength){
     console.log('list===',list)
     return list.slice(0, props.showMoreLength)
   }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index c5a62bd99..51c0e2cc5 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -39,7 +39,10 @@
         <span :class="{'red-text':row.differencePrice!=0}">{{ row.differencePrice }}</span>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore v-if="wsCache.get('lang')=='en-US'" :showMoreLength="1"
+           :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)"
+        />
+        <ButtonBase v-else :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

From fd646cae8bb4b0acc177c9927ef096be4836354a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 10:13:30 +0800
Subject: [PATCH 182/225] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95.=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymove/inventorymoveRecordMainNew/index.vue     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index 38e2281b2..325922058 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -205,6 +205,7 @@ const searchTableRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等
 //获取类型
 const getLabelType = async (row,useToPackingNumber)=>{
+  labelType.value = ''
   let resType = await PackageApi.getPackagePage(useToPackingNumber?{
     number: row.toPackingNumber
   }:{
@@ -217,8 +218,11 @@ const getLabelType = async (row,useToPackingNumber)=>{
     } else {
       labelType.value = 'cg'
     }
+    console.log('labelType',labelType.value)
+    await getLabelDetailPage(row,false)
+
   }else{
-    getLabelType(row,true)
+    await getLabelType(row,true)
   }
 }
 const getLabelDetailPage = async (row,useToPackingNumber)=>{
@@ -250,7 +254,6 @@ const labelPrint = async (row) => {
   tableObject.loading = true
   //获取类型
   await getLabelType(row,false)
-  await getLabelDetailPage(row,false)
   
 }
 // 批量打印--预生产收货

From 2160ac0126891a4ba5f212af42099a08885469e4 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 11:44:25 +0800
Subject: [PATCH 183/225] =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../putawayRequestMain/putawayRequestMain.data.ts    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index f68e002e1..ea6478dcf 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -14,12 +14,10 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
-import * as PurchaseDetail from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 
-import * as PurchaseMain from '@/api/wms/purchaseMain'
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
-
+import { PurchaseDetail } from '@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data'
 
 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
@@ -657,7 +655,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'number',
         searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseMainPage
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
       }
     },
     tableForm: {
@@ -666,7 +664,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'number',
       searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
     }
   },
   {
@@ -1040,7 +1038,7 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
         searchField: 'number',
         searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseMainPage
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage
       }
     },
     tableForm: {
@@ -1050,7 +1048,7 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
       searchField: 'number',
       searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage
     }
   },
   {

From 7add563198c358f8ab5f58e8685f034602a893a7 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 13:12:08 +0800
Subject: [PATCH 184/225] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierinvoiceInvoiced/index.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts
index 2be01466c..b6a93d12c 100644
--- a/src/api/wms/supplierinvoiceInvoiced/index.ts
+++ b/src/api/wms/supplierinvoiceInvoiced/index.ts
@@ -74,13 +74,25 @@ export const deleteSupplierinvoiceInvoiced = async (id: number) => {
 
 // 导出待开票 Excel
 export const exportSupplierinvoiceInvoicedSchedule = async (params) => {
-  return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-schedule`, params })
+
+
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplierinvoice-invoiced/export-excel-schedule-senior`, data })
+  }else{
+    return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-schedule`, params })
+  }
 }
 
 
 // 导出待开票 Excel
 export const exportSupplierinvoiceInvoicedDiscrete = async (params) => {
-  return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-discrete`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplierinvoice-invoiced/export-excel-discrete-senior`, data })
+  }else{
+    return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-discrete`, params })
+  }
 }
 
 // 下载用户导入模板

From 276eb58bd73d852c2ef3f6908dddae9d3fb74fca Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 12 Dec 2024 13:57:28 +0800
Subject: [PATCH 185/225] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index 41057a8b6..cb744daa7 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -239,15 +239,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    // {
-    //   label: '线边盘点',
-    //   name: 'lineTypeImport',
-    //   hide: !(row.status==2&&row.lineType==true),
-    //   type: 'success',
-    //   color: '',
-    //   link: true, //文本展现按钮
-    //   hasPermi: '' // wms:count-job-main:lineTypeImport
-    // },
+    {
+      label: '线边盘点',
+      name: 'lineTypeImport',
+      hide: !(row.status==2&&row.lineType==true),
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:lineTypeImport
+    },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',

From daaeb8a9d4a5b4b8f1422bace3b8d365c67cd42b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 15:55:51 +0800
Subject: [PATCH 186/225] =?UTF-8?q?FWHL-123=E5=8F=AB=E6=96=99=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E8=8F=9C=E5=8D=95=E4=B8=AD=EF=BC=8C=E5=8F=AB=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 1feed5668..0b7baf7e0 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -355,7 +355,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '叫料库位',
     field: 'location',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150

From 400dff0cec7302f1a8a28328548e6912ba261f86 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Dec 2024 17:06:39 +0800
Subject: [PATCH 187/225] =?UTF-8?q?=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.wyf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.env.wyf b/.env.wyf
index d3ace2edb..6869a701f 100644
--- a/.env.wyf
+++ b/.env.wyf
@@ -63,6 +63,12 @@ VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload'
 # # 上传路径
 # VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload'
 
+# VITE_BASE_URL='http://172.21.32.16/api'
+# # 上传路径
+# VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload'
+
+
+
 # # 请求路径
 # VITE_BASE_URL='http://172.21.32.13/api'
 # # 上传路径

From ee48876b357aedf1ce701efc12a92abbe78be451 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Fri, 13 Dec 2024 16:40:46 +0800
Subject: [PATCH 188/225] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8F=96=E6=B6=88=E6=9C=80=E5=A4=A7=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrap/productionscrapRequestMain/index.vue        | 1 -
 .../productionscrapRequestMain.data.ts                          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index a047c09ed..1b7347a90 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -261,7 +261,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           } else {
             row['batch'] = '000000'
           }
-          row['maxQty'] = val[0]['qty']
           let param = {'itemCodes':val[0]['itemCode']}
           let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param)
           console.log('resyStdcost',resyStdcost)
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index c0c58e367..a7927d5cd 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1822,7 +1822,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'InputNumber',
       min: 0,
       precision: 2,
-      maxField:'maxQty'
+      // maxField:'maxQty'
     }
   },
   {

From bc1f22e0affa49132515d5a8906c047b69a67dc9 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 16 Dec 2024 09:01:21 +0800
Subject: [PATCH 189/225] FWHL-127

---
 .../productionreturnRequestMainNo/index.vue   | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index f08808159..ed50e9723 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -424,6 +424,8 @@ const butttondata = (row,$index) => {
     ]
 }
 
+const enableMake = ref('')
+
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
@@ -515,6 +517,7 @@ const buttonTableClick = async (val, row) => {
         by: 'ASC',
       }).then(res => {
         if (res.list.length > 0) {
+          enableMake.value = res.list[0].enableMake
           // 判断物料 可采购 可制造
           if (res.list[0].enableMake == "FALSE") {
             // 修改 tableform 属性
@@ -547,6 +550,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
+          enableMake.value = ''
           message.warning('没有查询到物料代码：【' + item.itemCode + '】')
           return
         }
@@ -724,17 +728,22 @@ const submitFormLabel = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  let flag = true
-  detatableData.tableList.forEach(item => {
-    if(!item.supplierItemCode){
-      flag = false
+  alert(enableMake.value)
+
+  // 判断物料 可采购 可制造
+  if (enableMake.value == "FALSE") {
+    
+    let flag = true
+    detatableData.tableList.forEach(item => {
+      if(!item.supplierItemCode){
+        flag = false
+      }
+    });
+    if(!flag){
+      message.error('请填写供应商代码')
+      return
     }
-  });
-  if(!flag){
-    message.error('请填写供应商代码')
-    return
   }
-  
   try {
     detatableData.tableList.forEach(async (item) => {
       await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {

From edb7f2dcd67f236b7e777f53fbf651462f0b8f1c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 16 Dec 2024 09:30:31 +0800
Subject: [PATCH 190/225] =?UTF-8?q?=E5=8E=BB=E6=8E=89alert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturn/productionreturnRequestMainNo/index.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index ed50e9723..c5f36326f 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -728,7 +728,6 @@ const submitFormLabel = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  alert(enableMake.value)
 
   // 判断物料 可采购 可制造
   if (enableMake.value == "FALSE") {

From 27cb9e1669a0d3e9f0882e1baeb0d7997fd323ac Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 16 Dec 2024 09:43:29 +0800
Subject: [PATCH 191/225] =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index a7927d5cd..349a57f65 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -2207,7 +2207,14 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm:false,
   }
 ]))
-
+const validateQty = (rule: any, value: any, callback: any,a,b) => {
+  console.log('validateQty',rule, value,a,b)
+  if (!value) {
+      callback(new Error('数量必须大于0'));
+  } else {
+      callback();
+  }
+}  
 //表单校验
 export const ProductionscrapRequestDetailRules = reactive({
   workStationCode: [
@@ -2225,6 +2232,10 @@ export const ProductionscrapRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  qty:  [
+    { validator: validateQty, trigger: 'change' }
+  ],
+  
   // packUnit: [
   //   { required: true, message: '请选择包装规格', trigger: 'blur' }
   // ]

From de20d92dbf2ae5fd04de24053588aeae6a6f8953 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 16 Dec 2024 10:07:46 +0800
Subject: [PATCH 192/225] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 9177e12a6..7283b1cd1 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -749,7 +749,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       disabled:true,
       // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法

From 133e0a8a938fe799b6a81a0a1ef0ce479af35042 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 16 Dec 2024 13:56:17 +0800
Subject: [PATCH 193/225] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AFWHL-49?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countadjust/countadjustRequestMain/index.vue       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 5779e163c..cf39ad414 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -196,11 +196,11 @@ const butttondata = (row,$index) => {
 
     return [
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
+    // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
     ]
 }
 // 列表-操作按钮事件

From 5820f94d112b6ad27a49c3060216d21ade5ae7f2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 08:56:52 +0800
Subject: [PATCH 194/225] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                          | 43 ++++++++++++++
 src/locales/zh-CN.ts                          | 58 +++++++++++++++++++
 .../areabasic/areabasic.data.ts               |  2 +-
 .../factoryModeling/location/location.data.ts | 26 ++++-----
 .../locationgroup/locationgroup.data.ts       | 10 ++--
 .../arrivalInspectionStrategy/AddForm.vue     |  8 +--
 .../strategy/batchStrategy/AddForm.vue        | 10 ++--
 .../strategy/downShelfStrategy/AddForm.vue    |  8 +--
 .../strategy/inspectStrategy/AddForm.vue      | 16 ++---
 .../manageAccuracyStrategy/AddForm.vue        |  8 +--
 .../purchaseReceiptStrategy/AddForm.vue       |  8 +--
 .../repairMaterialStrategy/AddForm.vue        |  8 +--
 .../storageCapacityStrategy/AddForm.vue       |  8 +--
 .../supplieDeliveryStrategy/AddForm.vue       | 12 ++--
 .../strategy/upShelfStrategy/AddForm.vue      |  8 +--
 .../utensilCapacityStrategy/AddForm.vue       |  8 +--
 .../warehouseStorageStrategy/AddForm.vue      |  8 +--
 .../supplierCycle/supplierCycle.data.ts       | 17 +++---
 .../demandforecastingSupplierMain/index.vue   |  2 +-
 .../purchasePlanMain/index.vue                |  2 +-
 .../supplierApbalanceCalendar/index.vue       |  4 +-
 .../supplierApbalanceCalendar.data.ts         |  3 +-
 .../supplierinvoiceRequestMain/index.vue      |  2 +-
 23 files changed, 191 insertions(+), 88 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index e2503cc97..49ab72929 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1424,6 +1424,49 @@ export default {
     请选择库区代码: 'Please select the library code',
     请选择仓库代码: 'Please select the repository code',
     请选择库位组代码: 'Select the library bit group code',
+    请选择管理精度: 'Select Manage Precision',
+    '计划数量包含0':'The number of plans contains 0',
+    自动完成:'autocomplete',
+    允许修改库位:'Allow to modify the location of the library',
+    允许修改数量:'Allow to modify the location of the library',
+    允许大于推荐数量:'Greater than the recommended number is allowed',
+    允许小于推荐数量:'Less than the recommended amount is allowed',
+    允许修改库存状态:'Allows modification of inventory status',
+    允许连续扫描:'Allows continuous scanning',
+    允许部分完成:'Allow partial completion',
+    允许修改批次:'Allow modification of batches',
+    允许修改箱码:'Allow to modify the box code',
+    岗位:'Position',
+    承接人:'Take on',
+    优先级增量:'Priority increment',
+    承接时间:'Time of acceptance',
+    完成人:'Adult of completion',
+    完成时间:'Completion time',
+    过期时间:'Expiration time',
+    要求截止时间:'Request a deadline',
+    调整账代码:'Adjustment account code',
+    冲销日记帐:'Write off the journal',
+    请输入仓库代码:'Please enter the repository code',
+    请输入库区代码:'Please enter the library code',
+    不得超过50个字符:'Must not exceed 50 characters',
+    请选择是否可用:'Please select if available',
+    请输入正确的代码:'Please enter the correct code',
+    请QAD库位代码:'Please QAD library bit code',
+    请输入库位组代码:'Please enter the library bit group code',
+    请输入备货优先级:'Please enter the warehouse location group code. Please enter the stock priority',
+    请输入名字:'Please enter your name',
+    规则配置请填写完全:'Please complete the rule configuration',
+    抽奖规则请填写完全:'Please fill in the lottery rules completely',
+    有价差:'Have a price difference',
+    请输入正确格式的电话:'Please enter the phone number in the correct format',
+    不得超过11个字符:'Must not exceed 11 characters',
+    当前阶段:'Current stage',
+    是否寄存订单:'Whether to deposit the order',
+    请选择结束日期:'Please select an end date',
+    请选择开始日期:'Please select a start date',
+    请选择月份:'Please select month',
+    同步周期:'Period of synchronization',
+    供应商代码不能为空:'The vendor code cannot be empty',
     // 物料描述: '',
     // 返利未税金额: '',
     // 财务过账日期: '',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 553b9db87..463e116db 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1422,6 +1422,64 @@ export default {
     请选择库区代码: '请选择库区代码',
     请选择仓库代码: '请选择仓库代码',
     请选择库位组代码: '请选择库位组代码',
+    请选择管理精度: '请选择管理精度',
+    '计划数量包含0':'计划数量包含0',
+    自动完成:'自动完成',
+    允许修改库位:'允许修改库位',
+    允许修改数量:'允许修改数量',
+    允许大于推荐数量:'允许大于推荐数量',
+    允许小于推荐数量:'允许小于推荐数量',
+    允许修改库存状态:'允许修改库存状态',
+    允许连续扫描:'允许连续扫描',
+    允许部分完成:'允许部分完成',
+    允许修改批次:'允许修改批次',
+    允许修改箱码:'允许修改箱码',
+    岗位:'岗位',
+    承接人:'承接人',
+    优先级增量:'优先级增量',
+    承接时间:'承接时间',
+    完成人:'完成人',
+    完成时间:'完成时间',
+    过期时间:'过期时间',
+    要求截止时间:'要求截止时间',
+    调整账代码:'调整账代码',
+    冲销日记帐:'冲销日记帐',
+    请输入仓库代码:'请输入仓库代码',
+    请输入库区代码:'请输入库区代码',
+    不得超过50个字符:'不得超过50个字符',
+    请选择是否可用:'请选择是否可用',
+    请输入正确的代码:'请输入正确的代码',
+    请QAD库位代码:'请QAD库位代码',
+    请输入库位组代码:'请输入库位组代码',
+    请输入备货优先级:'请输入备货优先级',
+    请输入名字:'请输入名字',
+    规则配置请填写完全:'规则配置请填写完全',
+    抽奖规则请填写完全:'抽奖规则请填写完全',
+    有价差:'有价差',
+    请输入正确格式的电话:'请输入正确格式的电话',
+    不得超过11个字符:'不得超过11个字符',
+    当前阶段:'当前阶段',
+    是否寄存订单:'是否寄存订单',
+    请选择结束日期:'请选择结束日期',
+    请选择开始日期:'请选择开始日期',
+    请选择月份:'请选择月份',
+    同步周期:'同步周期',
+    供应商代码不能为空:'供应商代码不能为空',
+
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+
+    
+    
+    
+    
+
 
   },
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 257a5f71a..5e1f25d80 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -280,7 +280,7 @@ export const AreaRules = reactive({
     { required: true, message: '请选择类型', trigger: 'change' }
   ],
   manageMode: [
-    { required: true, message: '请选择管理精度', trigger: 'change' }
+    { required: true, message: t('ts.请选择管理精度'), trigger: 'change' }
   ]
 })
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index 07ef0409c..ba9c1c24c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -435,33 +435,33 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const LocationRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
+    { max: 50, message:  t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validator:validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur'}
   ],
   name: [
-    {required: true, max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    {required: true, max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   aisle: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   shelf: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   warehouseCode: [
-    { required: true, message: '请输入仓库代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入仓库代码'), trigger: 'change' }
   ],
   qadLocationCode: [
-    { required: true, message: '请QAD库位代码', trigger: 'change' }
+    { required: true, message: t('ts.请QAD库位代码'), trigger: 'change' }
   ],
   areaCode: [
-    { required: true, message: '请输入库区代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入库区代码'), trigger: 'change' }
   ],
   locationGroupCode: [
-    { required: true, message: '请输入库位组代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入库位组代码'), trigger: 'change' }
   ],
   // erpLocationCode: [
   //   { required: true, message: '请选择ERP库位类型', trigger: 'change' }
@@ -470,9 +470,9 @@ export const LocationRules = reactive({
   //   { required: true, message: '请选择类型', trigger: 'change' }
   // ],
   pickPriority: [
-    { required: true, message: '请输入备货优先级', trigger: 'blur' }
+    { required: true, message: t('ts.请输入备货优先级'), trigger: 'blur' }
   ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index 70ee060af..c028411a7 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -257,7 +257,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const LocationgroupRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' },
+    { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
@@ -265,15 +265,15 @@ export const LocationgroupRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   warehouseCode: [
-    { required: true, message: '请输入仓库代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入仓库代码'), trigger: 'change' }
   ],
   areaCode: [
-    { required: true, message: '请输入库区代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入库区代码'), trigger: 'change' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
index 09130a81b..b96dc2c64 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -193,10 +193,10 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符') trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
index 4ab25e524..08e919ccb 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@@ -315,11 +315,11 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  configurationRules: [{ required: true, message: '规则配置请填写完全', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }],
+  configurationRules: [{ required: true, message: t('ts.规则配置请填写完全'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 8f32d6a8b..efef357fc 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -745,10 +745,10 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
index 9bb1b7f21..f322fd1b3 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@@ -307,19 +307,19 @@ const formData = ref({
 // 验证规则
 const rules = ref({
   strategyCode: [
-    { required: true, message: '请输入代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   name: [
-    { required: true, message: '请输入名字', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, message: t('ts.请输入名字'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   description: [
-    { required: true, message: '请输入描述', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, message: t('ts.请输入描述'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  configurationRules: [{ required: true, message: '抽奖规则请填写完全', trigger: 'blur' }]
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }],
+  configurationRules: [{ required: true, message: t('ts.抽奖规则请填写完全'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
index 23d8aed20..87b7eb6a6 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
@@ -358,10 +358,10 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message:t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index 4d0d16171..194518b4b 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -211,10 +211,10 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
index fe388bd81..7a9fe7bd6 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -328,10 +328,10 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符)', trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
index ee2404bc0..cbba05241 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@@ -339,10 +339,10 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index c26857885..ada9cbb72 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -318,12 +318,12 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  'configuration.PhoneNumber': [{ max: 11, message: '不得超过11个字符', trigger: 'blur' },
-  {message: '请输入正确格式的电话', trigger: 'blur' ,validator:validateHanset}]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }],
+  'configuration.PhoneNumber': [{ max: 11, message: t('ts.不得超过11个字符'), trigger: 'blur' },
+  {message: t('ts.请输入正确格式的电话'), trigger: 'blur' ,validator:validateHanset}]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 82eabc696..ec233a569 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -720,10 +720,10 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }],
   // warehouse: [{ required: true, message: '请选择规则配置', trigger: 'blur' }],
   
 })
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
index 79eef8e74..5bf6904f9 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
@@ -254,10 +254,10 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
index 406431817..8c14b0d5d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@@ -302,10 +302,10 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
+  priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
index a650b8ced..44f79d7bc 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -3,6 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 // 表单校验
+const { t } = useI18n() // 国际化
 
 
 export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
@@ -143,13 +144,13 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
       component:'Checkbox',
       componentProps: {
         options: [
-          {label:'星期一',value:'monday'},
-          {label:'星期二',value:'tuesday'},
-          {label:'星期三',value:'wednesday'},
-          {label:'星期四',value:'thursday'},
-          {label:'星期五',value:'friday'},
-          {label:'星期六',value:'saturday'},
-          {label:'星期日',value:'sunday'}
+          {label:t('ts.星期一'),value:'monday'},
+          {label:t('ts.星期二'),value:'tuesday'},
+          {label:t('ts.星期三'),value:'wednesday'},
+          {label:t('ts.星期四'),value:'thursday'},
+          {label:t('ts.星期五'),value:'friday'},
+          {label:t('ts.星期六'),value:'saturday'},
+          {label:t('ts.星期日'),value:'sunday'}
         ]
       },
     }
@@ -204,6 +205,6 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
 ]))
 export const SupplierCycleRules = reactive({
   supplierCode: [
-    { required: true, message: '供应商代码不能为空', trigger: 'blur' },
+    { required: true, message: t('ts.供应商代码不能为空'), trigger: 'blur' },
   ],
 })
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index 49eb20d07..f2d75307b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -31,7 +31,7 @@
     >
     <template #isRead="{row}" >
       <el-button v-show="row.isRead!=2" :type="row.isRead==1?'info':'primary'" link  @click="readHandle(row,false)">
-          <span>{{ row.isRead==1?'已读':'未读' }}</span>
+          <span>{{ row.isRead==1?t('ts.已读'):t('ts.未读') }}</span>
       </el-button>
     </template>
     <template v-for="name in tableObjectHead.tableList" :key="name" #[name]="{row}">
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 11e85365c..7a2429656 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -10,7 +10,7 @@
     :allSchemas="PurchasePlanMain.allSchemas" :detailAllSchemas="PurchasePlanDetail.allSchemas">
     <template #rightBtn_left>
       <div style="display:flex;justify-content: center;align-items: center">
-        <span style="color:var(--el-text-color-regular)">计划数量包含0</span>
+        <span style="color:var(--el-text-color-regular)">{{t('ts.计划数量包含0')}}</span>
         <el-switch v-model="isZero" style="margin:0 5px" @change="zeroChange"/>
       </div>
     </template>
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
index 41e495da9..1a988062c 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/index.vue
@@ -51,12 +51,12 @@
     :isBusiness="false"
   >
   <template #beginDay>
-    <el-select v-model="beginDay" placeholder="请选择开始日期" @change="(value)=>selectChange(value,'beginDay')">
+    <el-select v-model="beginDay" :placeholder="t('ts.请选择开始日期')" @change="(value)=>selectChange(value,'beginDay')">
       <el-option v-for="dict in daysInMonths" :key="dict.value" :label="dict.label" :value="dict.value"/>
     </el-select>
   </template>
   <template #endDay>
-    <el-select v-model="endDay" placeholder="请选择结束日期" @change="(value)=>selectChange(value,'endDay')">
+    <el-select v-model="endDay" :placeholder="t('ts.请选择结束日期')" @change="(value)=>selectChange(value,'endDay')">
       <el-option v-for="dict in daysInMonths" :key="dict.value" :label="dict.label" :value="dict.value"/>
     </el-select>
   </template>
diff --git a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
index 91b17d3b4..8ad50f5df 100644
--- a/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalanceCalendar/supplierApbalanceCalendar.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
 
 // 表单校验
 export const SupplierApbalanceCalendarRules = reactive({
@@ -33,7 +34,7 @@ export const SupplierApbalanceCalendar = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select',
       componentProps: {
         options: months,
-        placeholder: '请选择月份',
+        placeholder: t('ts.请选择月份'),
       }
     },
   },
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 0075424f1..ea534c889 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -772,7 +772,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     if (row.balanceStatementStatus) {
-      formPurchasePassRef.value.open('update', row, null, '采购审批通过', '采购审批通过')
+      formPurchasePassRef.value.open('update', row, null, t('ts.采购审批通过'), t('ts.采购审批通过'))
     } else {
       submitPurchasePass(row.id)
     }

From 0d5d0cecae31bb935e7ac244128c90002f42e153 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 11:04:13 +0800
Subject: [PATCH 195/225] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/DetailLedger.vue    |  2 +-
 .../ImportForm/src/ImportDetailForm.vue       | 15 ++--
 src/components/ImportForm/src/ImportForm.vue  | 14 ++--
 src/components/UploadFile/src/UploadFile.vue  |  2 +-
 src/locales/en-US.ts                          | 76 +++++++++++++++++
 src/locales/zh-CN.ts                          | 82 +++++++++++++++++--
 src/views/login/updatePasswordNewTips.vue     | 18 ++--
 .../factoryModeling/location/location.data.ts |  4 +-
 .../locationgroup/locationgroup.data.ts       |  2 +-
 .../itempackage/itempackage.data.ts           |  2 +-
 .../purchaseprice/purchaseprice.data.ts       | 22 ++---
 .../purchasePlanMain/purchasePlanMain.data.ts | 58 ++++++-------
 .../supplierdeliverRecordMain.data.ts         |  5 +-
 .../supplierdeliverRequestMain.data.ts        |  6 +-
 .../purchaseclaimRequestMain.data.ts          |  2 +-
 .../supplierApbalanceMain/index.vue           |  4 +-
 16 files changed, 231 insertions(+), 83 deletions(-)

diff --git a/src/components/Detail/src/DetailLedger.vue b/src/components/Detail/src/DetailLedger.vue
index 5e0964f3e..8b09180d9 100644
--- a/src/components/Detail/src/DetailLedger.vue
+++ b/src/components/Detail/src/DetailLedger.vue
@@ -1162,7 +1162,7 @@ const dialogTitle = ref()
 const dialogAllSchemasRef = ref()
 const dialogTableObjectRef = ref()
 const dialogTableMethodsRef = ref()
-const dialogUploadTitle = ref('文件上传')
+const dialogUploadTitle = ref(t('ts.文件上传'))
 const dialogUploadVisible = ref(false)
 const dialogUploadNumber = ref()
 const dialogUploadBusiCode = ref()
diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue
index 757a7409a..0f5b79774 100644
--- a/src/components/ImportForm/src/ImportDetailForm.vue
+++ b/src/components/ImportForm/src/ImportDetailForm.vue
@@ -76,7 +76,7 @@
             <div
               class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
               style="line-height: 32px"
-              >是否外部资源</div
+              >{{t('ts.是否外部资源')}}</div
             >
             <div class="">
               <div class="switch">
@@ -238,7 +238,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const submitForm = async () => {
   if (fileList.value.length == 0) {
-    message.error('请上传文件')
+    message.error(t('ts.请上传文件'))
     return
   }
   file.value = fileList.value[0].name
@@ -259,12 +259,12 @@ const submitFormSuccess = (response: any) => {
   if (response) {
     if (response.code == 500) {
       uploadRef.value!.clearFiles()
-      message.error('导入失败')
+      message.error(t('ts.导入失败'))
       formLoading.value = false
       return
     } else if (response.code == 0) {
       if (response.data.errorCount > 0) {
-        message.confirm('文件中有部分数据导入失败，是否下载失败数据？').then(() => {
+        message.confirm(t(`ts.${'文件中有部分数据导入失败，是否下载失败数据？'}`).replace('ts.','')).then(() => {
           // download.excel(file, 'file_' + new Date().getTime())
           // 通过url下载文件
           // const downloadElement = document.createElement('a')
@@ -279,7 +279,7 @@ const submitFormSuccess = (response: any) => {
           // downloadElement.click()
         })
       } else {
-        message.success('导入成功')
+        message.success(t('ts.导入成功'))
       }
     }else if(response.data == null){
         message.error(response.msg)
@@ -318,7 +318,7 @@ const submitFormSuccess = (response: any) => {
 }
 /** 上传错误提示 */
 const submitFormError = (): void => {
-  message.error('上传失败，请您重新上传！')
+  message.error(t(`ts.${'上传失败，请您重新上传！'}`))
   formLoading.value = false
 }
 
@@ -332,7 +332,8 @@ const resetForm = () => {
 
 /** 文件数超出提示 */
 const handleExceed = (): void => {
-  message.error('最多只能上传一个文件！')
+  message.error(t(`ts.${'最多只能上传一个文件！'}`))
+
 }
 
 /** 下载模板操作 */
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index 7276097b4..ae6b895d7 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -89,7 +89,7 @@
             <div
               class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right"
               style="line-height: 32px"
-              >是否外部资源</div
+              >{{t('ts.是否外部资源')}}</div
             >
             <div class="">
               <div class="switch">
@@ -253,7 +253,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const submitForm = async () => {
   if (fileList.value.length == 0) {
-    message.error('请上传文件')
+    message.error(t('ts.请上传文件'))
     return
   }
   file.value = fileList.value[0].name
@@ -274,12 +274,12 @@ const submitFormSuccess = (response: any) => {
   if (response) {
     if (response.code == 500) {
       uploadRef.value!.clearFiles()
-      message.error('导入失败')
+      message.error(t('ts.导入失败'))
       formLoading.value = false
       return
     } else if (response.code == 0) {
       if (response.data.errorCount > 0) {
-        message.confirm('文件中有部分数据导入失败，是否下载失败数据？').then(() => {
+        message.confirm(t(`ts.${'文件中有部分数据导入失败，是否下载失败数据？'}`).replace('ts.','')).then(() => {
           // download.excel(file, 'file_' + new Date().getTime())
           // 通过url下载文件
           // const downloadElement = document.createElement('a')
@@ -294,7 +294,7 @@ const submitFormSuccess = (response: any) => {
           // downloadElement.click()
         })
       } else {
-        message.success('导入成功')
+        message.success(t('ts.导入成功'))
       }
     }else if(response.data == null){
         message.error(response.msg)
@@ -333,7 +333,7 @@ const submitFormSuccess = (response: any) => {
 }
 /** 上传错误提示 */
 const submitFormError = (): void => {
-  message.error('上传失败，请您重新上传！')
+  message.error(t(`ts.${'上传失败，请您重新上传！'}`))
   formLoading.value = false
 }
 
@@ -347,7 +347,7 @@ const resetForm = () => {
 
 /** 文件数超出提示 */
 const handleExceed = (): void => {
-  message.error('最多只能上传一个文件！')
+  message.error(t(`ts.${'最多只能上传一个文件！'}`))
 }
 
 /** 下载模板操作 */
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index bb3677817..7d64b8633 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -20,7 +20,7 @@
       :on-preview="handlePreview"
       class="upload-file-uploader"
     >
-      <el-button type="primary"><Icon icon="ep:upload-filled" />{{ title }}</el-button>
+      <el-button type="primary"><Icon icon="ep:upload-filled" />{{ t(`ts.${title}`).replace('ts.','') }}</el-button>
       <template v-if="isShowTip" #tip>
         <div style="font-size: 8px;margin-top: 10px;line-height: initial;">
           {{t('ts.大小不超过')}} <b style="color: #f56c6c">{{ fileSize }}MB</b>
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 49ab72929..5023775f3 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -755,6 +755,8 @@ export default {
     物料名称:'Material Name',
     物料描述1:'Material Description1',
     物料描述2:'Material Description2',
+    描述1:'Description1',
+    描述2:'Description2',
     项目代码:'Item Code',
     质检明细:'Quality inspection details',
     履历表明细:'Details of your resume',
@@ -1467,6 +1469,80 @@ export default {
     请选择月份:'Please select month',
     同步周期:'Period of synchronization',
     供应商代码不能为空:'The vendor code cannot be empty',
+    请选择采购订单号:'Please select Purchase order number',
+    请选择送达时间:'Please select a delivery time',
+    请选择状态:'Please select status',
+    请输入单据号:'Please enter the document number',
+    请输入业务类型:'Please enter the service type',
+    请输入已发货数量:'Please enter the shipped quantity',
+    计划数量不能小于0:'The number of plans cannot be less than 0',
+    请选择计量单位:'Please select the unit of measurement',
+    请输入计划数量:'Please enter the number of plans',
+    '请填写订单号！':'Please fill in the order number!',
+    请选择订单行:'Please select the order line',
+    是否标包:'Package or not',
+    临期提醒天数:'Expiration date reminder days',
+    是否脱离ERP管理:'Whether to disengage from ERP management',
+    ABC类:'ABC class',
+    产品类:'Product Category',
+    种类:'Kinds',
+    分组:'Grouping',
+    颜色:'Color',
+    配置:'Configuration',
+    替代计量单位:'Alternative unit of measurement',
+    可采购:'Available for purchase',
+    可制造:'manufacturable',
+    可委外加工:'Can outsource processing',
+    回收件:'Recovery of parts',
+    虚零件:'Virtual part',
+    结算方式:'Method of settlement',
+    项目:'Project',
+    质量等级:'Grade of quality',
+    有效天数:'Days of validity',
+    请输入供应商代码:'Please enter the vendor code',
+    请输入物料代码:'Please enter the material code',
+    请选择货币:'Please select currency',
+    请输入价格:'Please enter the price',
+    请输入要货计划单号:'Please enter the order number',
+    请输入计划到货时间:'Please enter the scheduled arrival time',
+    文件上传:'File upload',
+    客户包装:'Customer packaging',
+    厂内包装:'Inside factory packing',
+    供应商包装:'Supplier packaging',
+    '请填写仓库代码！':'Please fill in the repository code!',
+    待检:'To be inspected',
+    原料:'Raw material',
+    半成品:'Semi-finished product',
+    成品:'Finished product',
+    线边:'Line edge',
+    隔离:'Quarantine',
+    报废:'Scrap',
+    不合格:'Unqualified',
+    客户:'Client',
+    '请填写库区代码！':'Please fill in the library code!',
+    仓库信息:'Warehouse information',
+    库区信息:'Reservoir area information',
+    库位组信息:'Library location group information',
+    '文件中有部分数据导入失败，是否下载失败数据？':'Some data in the file failed to import. Do you want to download the failed data?',
+    导入失败:'Import failure',
+    导入成功:'Import successfully',
+    请上传文件:'Please upload the file',
+    '上传失败，请您重新上传！':'Upload failed, please upload again!',
+    '最多只能上传一个文件！':'You can only upload one file at most!',
+    请选择日期后再点击询证:'Please select the date before clicking confirmation',
+    '发票TC余额':'Invoice TC balance',
+    '发票BC余额':'Invoice BC balance',
+    凭证日期:'Credential date',
+    账户类型:'Account type',
+    父ID:'Parent ID',
+    重置密码:'Reset Password',
+    请输入旧密码:'Please enter the old password',
+    旧密码:'Old password',
+    新密码:'New password',
+    请输入新密码:'Please enter a new password',
+    确认新密码:'Confirm new password',
+    请再次输入新密码:'Please enter a new password again',
+    '两次输入的密码不一致，请重新输入!':'The password you entered twice is different, please enter it again!',
     // 物料描述: '',
     // 返利未税金额: '',
     // 财务过账日期: '',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 463e116db..a6683633a 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -757,6 +757,8 @@ export default {
     物料名称:'物料名称',
     物料描述1:'物料描述1',
     物料描述2:'物料描述2',
+    描述1:'描述1',
+    描述2:'描述2',
     项目代码:'项目代码',
     质检明细:'质检明细',
     履历表明细:'履历表明细',
@@ -1465,12 +1467,80 @@ export default {
     请选择月份:'请选择月份',
     同步周期:'同步周期',
     供应商代码不能为空:'供应商代码不能为空',
-
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    请选择采购订单号:'请选择采购订单号',
+    请选择送达时间:'请选择送达时间',
+    请选择状态:'请选择状态',
+    请输入单据号:'请输入单据号',
+    请输入业务类型:'请输入业务类型',
+    请输入已发货数量:'请输入已发货数量',
+    计划数量不能小于0:'计划数量不能小于0',
+    请选择计量单位:'请选择计量单位',
+    请输入计划数量:'请输入计划数量',
+    '请填写订单号！':'请填写订单号！',
+    请选择订单行:'请选择订单行',
+    是否标包:'是否标包',
+    临期提醒天数:'临期提醒天数',
+    是否脱离ERP管理:'是否脱离ERP管理',
+    ABC类:'ABC类',
+    产品类:'产品类',
+    种类:'种类',
+    分组:'分组',
+    颜色:'颜色',
+    配置:'配置',
+    替代计量单位:'替代计量单位',
+    可采购:'可采购',
+    可制造:'可制造',
+    可委外加工:'可委外加工',
+    回收件:'回收件',
+    虚零件:'虚零件',
+    结算方式:'结算方式',
+    项目:'项目',
+    质量等级:'质量等级',
+    有效天数:'有效天数',
+    请输入供应商代码:'请输入供应商代码',
+    请输入物料代码:'请输入物料代码',
+    请选择货币:'请选择货币',
+    请输入价格:'请输入价格',
+    请输入要货计划单号:'请输入要货计划单号',
+    请输入计划到货时间:'请输入计划到货时间',
+    文件上传:'文件上传',
+    客户包装:'客户包装',
+    厂内包装:'厂内包装',
+    供应商包装:'供应商包装',
+    '请填写仓库代码！':'请填写仓库代码！',
+    待检:'待检',
+    原料:'原料',
+    半成品:'半成品',
+    成品:'成品',
+    线边:'线边',
+    隔离:'隔离',
+    报废:'报废',
+    不合格:'不合格',
+    客户:'客户',
+    '请填写库区代码！':'请填写库区代码！',
+    仓库信息:'仓库信息',
+    库区信息:'库区信息',
+    库位组信息:'库位组信息',
+    '文件中有部分数据导入失败，是否下载失败数据？':'文件中有部分数据导入失败，是否下载失败数据？',
+    导入失败:'导入失败',
+    导入成功:'导入成功',
+    请上传文件:'请上传文件',
+    '上传失败，请您重新上传！':'上传失败，请您重新上传！',
+    '最多只能上传一个文件！':'最多只能上传一个文件！',
+    请选择日期后再点击询证:'请选择日期后再点击询证',
+    '发票TC余额':'发票TC余额',
+    '发票BC余额':'发票BC余额',
+    凭证日期:'凭证日期',
+    账户类型:'账户类型',
+    父ID:'父ID',
+    重置密码:'重置密码',
+    请输入旧密码:'请输入旧密码',
+    旧密码:'旧密码',
+    新密码:'新密码',
+    请输入新密码:'请输入新密码',
+    确认新密码:'确认新密码',
+    请再次输入新密码:'请再次输入新密码',
+    '两次输入的密码不一致，请重新输入!':'两次输入的密码不一致，请重新输入!',
     // 抽奖规则请填写完全:'抽奖规则请填写完全',
     // 抽奖规则请填写完全:'抽奖规则请填写完全',
     // 抽奖规则请填写完全:'抽奖规则请填写完全',
diff --git a/src/views/login/updatePasswordNewTips.vue b/src/views/login/updatePasswordNewTips.vue
index 65747f425..6d8ca60e5 100644
--- a/src/views/login/updatePasswordNewTips.vue
+++ b/src/views/login/updatePasswordNewTips.vue
@@ -1,11 +1,11 @@
 <template>
   <div v-loading="loading"  class="box">
     <el-form ref="formSmsLogin" :model="loginData" :rules="rules" label-width="130px" label-position="top" size="large">
-      <div class="title" style="font-size:25px" margin-left="0px">重置密码</div>
+      <div class="title" style="font-size:25px" margin-left="0px">{{t('ts.重置密码')}}</div>
       <el-row type="flex" justify="center" align="middle">
         <el-col>
-          <el-form-item label="旧密码" prop="oldPassword" align="center">
-            <el-input v-model="loginData.oldPassword" placeholder="请输入旧密码" :type="isShowOldPassword?'text':'password'"/>
+          <el-form-item :label="t('ts.旧密码')" prop="oldPassword" align="center">
+            <el-input v-model="loginData.oldPassword" :placeholder="t('ts.请输入旧密码')" :type="isShowOldPassword?'text':'password'"/>
             <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowOldPassword = !isShowOldPassword">
               <View v-if="!isShowOldPassword"/>
               <Hide v-if="isShowOldPassword"/>
@@ -13,8 +13,8 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="新密码" prop="password" align="center">
-            <el-input v-model="loginData.password" placeholder="请输入新密码" :type="isShowPassword?'text':'password'"/>
+          <el-form-item :label="t('ts.新密码')" prop="password" align="center">
+            <el-input v-model="loginData.password" :placeholder="t('ts.请输入新密码')" :type="isShowPassword?'text':'password'"/>
             <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowPassword = !isShowPassword">
               <View v-if="!isShowPassword"/>
               <Hide v-if="isShowPassword"/>
@@ -22,8 +22,8 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="确认新密码" prop="againPassword">
-            <el-input v-model="loginData.againPassword" placeholder="请再次输入新密码"  :type="isShowAgainPassword?'text':'password'"/>
+          <el-form-item :label="t('ts.确认新密码')" prop="againPassword">
+            <el-input v-model="loginData.againPassword" :placeholder="t('ts.请再次输入新密码')"  :type="isShowAgainPassword?'text':'password'"/>
             <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowAgainPassword = !isShowAgainPassword">
               <View v-if="!isShowAgainPassword"/>
               <Hide v-if="isShowAgainPassword"/>
@@ -34,7 +34,7 @@
     </el-form>
 <!--    <div class="tips">温馨提示：<span>密码长度通常需要在8-20个字符之间。</span></div>-->
     <div class="dialog-footer">
-      <el-button type="primary" @click="submitForm" style="width: 100%;height: 40px;line-height: 40px;">确 定</el-button>
+      <el-button type="primary" @click="submitForm" style="width: 100%;height: 40px;line-height: 40px;">{{ t(`ts.${'确 定'}`) }}</el-button>
     </div>
   </div>
 </template>
@@ -76,7 +76,7 @@
     try {
       loginData.mailKey = route.query.mailKey;
       if (loginData.password != loginData.againPassword) {
-        message.error('两次输入的密码不一致，请重新输入!')
+        message.error(t(`ts.${'两次输入的密码不一致，请重新输入!'}`))
       } else {
         const data = loginData as unknown as UserApi.UserVO
         await UserApi.updatePassword(data)
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index ba9c1c24c..3b2f7f0ad 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -91,7 +91,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'warehouseCode',
           value:'warehouseCode',
-          message: '请填写仓库代码！',
+          message: t(`ts.${'请填写仓库代码！'}`),
           isMainValue: true
         },{
           key: 'available',
@@ -129,7 +129,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'areaCode',
           value:'areaCode',
-          message: '请填写库区代码！',
+          message: t(`ts.${'请填写库区代码！'}`),
           isMainValue: true
         },{
           key: 'available',
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index c028411a7..3f8415a12 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -88,7 +88,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key:'warehouseCode',
           value:'warehouseCode',
-          message: '请填写仓库代码！',
+          message: t(`ts.${'请填写仓库代码！'}`),
           isMainValue: true
         },{
           key: 'available',
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index 9e970b878..75ec7269d 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -115,7 +115,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 150
+      width: 160
     },
   },
   {
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
index ad342343c..b5900d095 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -27,9 +27,9 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchListPlaceholder: t('ts.请选择供应商代码'), // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
+        searchTitle: t('ts.供应商信息'), // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
         searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
         searchCondition: [{
@@ -61,15 +61,15 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: t('ts.请选择物料代码'), // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
-        searchTitle: '供应商物料信息', // 查询弹窗标题
+        searchTitle: t('ts.供应商物料信息'), // 查询弹窗标题
         searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
         searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key:'supplierCode',
           value:'supplierCode',
-          message: '请填写供应商代码！',
+          message: t(`ts.${'请填写供应商代码！'}`),
           isMainValue: true
         },{
           key: 'available',
@@ -265,21 +265,21 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const PurchasepriceRules = reactive({
   supplierCode: [
-    { required: true, message: '请输入供应商代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入供应商代码'), trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入物料代码'), trigger: 'change' }
   ],
   currency: [
-    { required: true, message: '请选择货币', trigger: 'change' }
+    { required: true, message: t('ts.请选择货币'), trigger: 'change' }
   ],
   price: [
-    { required: true, message: '请输入价格', trigger: 'blur' }
+    { required: true, message: t('ts.请输入价格'), trigger: 'blur' }
   ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
 })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index f44468c43..4c9ecfdc7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -30,7 +30,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchListPlaceholder: t('ts.请选择供应商代码'), // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
@@ -54,7 +54,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchListPlaceholder: t('ts.请选择供应商代码'), // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
@@ -117,9 +117,9 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         enterSearch:true,
         dialogWidth:'1085px',//搜索出来弹窗的宽度
         isSearchList: true,
-        searchListPlaceholder: '请选择采购订单',
+        searchListPlaceholder: t(`ts.${'请选择采购订单'}`),
         searchField: 'number',
-        searchTitle: '采购订单信息',
+        searchTitle: t(`ts.${'采购订单信息'}`),
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -133,7 +133,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'supplierCode',
           value: 'supplierCode',
-          message: '请填写供应商代码！',
+          message: t(`ts.${'请填写供应商代码！'}`),
           isMainValue: true
         },{
           key: 'status',
@@ -483,28 +483,28 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const PurchasePlanMainRules = reactive({
   available: [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
   supplierCode: [
-    { required: true, message: '请选择供应商代码', trigger: 'change' }
+    { required: true, message: t('ts.请选择供应商代码'), trigger: 'change' }
   ],
   poNumber: [
-    { required: true, message: '请选择采购订单号', trigger: 'change' }
+    { required: true, message: t('ts.请选择采购订单号'), trigger: 'change' }
   ],
   deliveryDate: [
-    { required: true, message: '请选择送达时间', trigger: 'change' }
+    { required: true, message: t('ts.请选择送达时间'), trigger: 'change' }
   ],
   status: [
-    { required: true, message: '请选择状态', trigger: 'change' }
+    { required: true, message: t('ts.请选择状态'), trigger: 'change' }
   ],
   number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
+    { required: true, message: t('ts.请输入单据号'), trigger: 'blur' }
   ],
   businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
+    { required: true, message: t('ts.请输入业务类型'), trigger: 'blur' }
   ],
   remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
 })
 
@@ -546,9 +546,9 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         dialogWidth:'1085px',//搜索出来弹窗的宽度
         isSearchList: true,
         enterSearch: true, 
-        searchListPlaceholder: '请选择采购订单',
+        searchListPlaceholder: t(`ts.${'请选择采购订单'}`),
         searchField: 'number',
-        searchTitle: '采购订单信息',
+        searchTitle: t(`ts.${'采购订单信息'}`),
         searchAllSchemas: PurchaseMain.allSchemas,
         searchPage: PurchaseMainApi.getPurchaseMainPage,
         searchCondition: [{
@@ -558,7 +558,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'supplierCode',
           value: 'supplierCode',
-          message: '请填写供应商代码！',
+          message: t(`ts.${'请填写供应商代码！'}`),
           isMainValue: true
         },{
           key: 'status',
@@ -661,15 +661,15 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled: true,
         isSearchList: false,
-        searchListPlaceholder: '请选择订单行',
+        searchListPlaceholder: t('ts.请选择订单行'),
         searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
+        searchTitle: t('ts.采购订单信息'),
         searchAllSchemas: PurchaseDetail.allSchemas,
         searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
         searchCondition: [{
           key: 'number',
           value: 'poNumber',
-          message: '请填写订单号！',
+          message: t(`ts.${'请填写订单号！'}`),
           isMainValue: true
         },{
           key: 'available',
@@ -682,15 +682,15 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       multiple:true,
       disabled: true,
       isInpuFocusShow: false,
-      searchListPlaceholder: '请选择订单行',
+      searchListPlaceholder: t('ts.请选择订单行'),
       searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
+      searchTitle: t('ts.采购订单信息'),
       searchAllSchemas: PurchaseDetail.allSchemas,
       searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber,
       searchCondition: [{
         key: 'number',
         value: 'poNumber',
-        message: '请填写订单号！',
+        message: t(`ts.${'请填写订单号！'}`),
         isMainValue: true
       },{
         key: 'available',
@@ -731,7 +731,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchCondition: [{
           key: 'supplierCode',
           value: 'supplierCode',
-          message: '请填写供应商代码！',
+          message: t(`ts.${'请填写供应商代码！'}`),
           isMainValue: true,
         },{
           key: 'available',
@@ -905,7 +905,7 @@ const validatePlanQty = (rule, value, callback) => {
   if (numReg.test(value)&&value>=0) {
       callback()
   } else {
-      callback(new Error('计划数量不能小于0'))
+      callback(new Error(t('ts.计划数量不能小于0')))
   }
 }
 //表单校验
@@ -914,16 +914,16 @@ export const PurchasePlanDetailRules = reactive({
   //   { required: true, message: '请选择是否可用', trigger: 'change' }
   // ],
   shippedQty: [
-    { required: true, message: '请输入已发货数量', trigger: 'blur' }
+    { required: true, message: t('ts.请输入已发货数量'), trigger: 'blur' }
   ],
   uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
+    { required: true, message: t('ts.请选择计量单位'), trigger: 'change' }
   ],
   planQty: [
-    { required: true, message: '请输入计划数量', trigger: 'blur' },
-    { validator:validatePlanQty, message: '计划数量不能小于0', trigger: 'blur'}
+    { required: true, message: t('ts.请输入计划数量'), trigger: 'blur' },
+    { validator:validatePlanQty, message: t('ts.计划数量不能小于0'), trigger: 'blur'}
   ],
   remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
 })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index 91c16dbe6..742908d9e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
 
 /**
  * @returns {Array} 供应商发货记录主表
@@ -349,7 +350,7 @@ export const SupplierdeliverRecordMainRules = reactive({
     { required: true, message: '请输入申请单号', trigger: 'blur' }
   ],
   supplierCode: [
-    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+    { required: true, message: t('ts.请输入供应商代码'), trigger: 'blur' }
   ],
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'blur' }
@@ -361,7 +362,7 @@ export const SupplierdeliverRecordMainRules = reactive({
     { required: true, message: '请输入到月台代码', trigger: 'blur' }
   ],
   planArriveTime: [
-    { required: true, message: '请输入计划到货时间', trigger: 'blur' }
+    { required: true, message: t('ts.请输入计划到货时间'), trigger: 'blur' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index d08f30be8..be39f2371 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -605,10 +605,10 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const SupplierdeliverRequestMainRules = reactive({
   supplierCode: [
-    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+    { required: true, message: t('ts.请输入供应商代码'), trigger: 'blur' }
   ],
   ppNumber: [
-    { required: true, message: '请输入要货计划单号', trigger: 'blur' }
+    { required: true, message: t(`ts.${'请输入要货计划单号'}`), trigger: 'blur' }
   ],
   asnNumber: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -637,7 +637,7 @@ export const SupplierdeliverRequestMainRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   planArriveTime: [
-    { required: true, message: '请输入计划到货时间', trigger: 'blur' }
+    { required: true, message: t('ts.请输入计划到货时间'), trigger: 'blur' }
   ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index d5d984b84..74036e981 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -338,7 +338,7 @@ export const PurchaseclaimRequestMainRules = reactive({
     { required: true, message: '请输入发货单号', trigger: 'blur' }
   ],
   ppNumber:  [
-    { required: true, message: '请输入要货计划单号', trigger: 'blur' }
+    { required: true, message: t(`ts.${'请输入要货计划单号'}`), trigger: 'blur' }
   ],
   supplierCode: [
     { required: true, message: '请输入供应商代码', trigger: 'change' }
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
index c5dc06367..867c96cfa 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
@@ -221,7 +221,7 @@ const formsSuccess = async (formType,data) => {
   });
   if(isHave){
     if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
+      message.error(t('ts.失效时间要大于生效时间'))
       return;
     }
   }
@@ -359,7 +359,7 @@ const getMonthDay = async ()=>{
 const confirmationHandle = async ()=>{
   let searchData =  await searchRef.value.getSearchFormData() 
   if(!year.value||!month.value||!day.value){
-    message.error('请选择日期后再点击询证')
+    message.error(t(`ts.${'请选择日期后再点击询证'}`))
     return
   }
   if(month.value.length==1){

From 092911945d9ec0c3740b653233a3abc7e8e22903 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 11:07:01 +0800
Subject: [PATCH 196/225] =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/arrivalInspectionStrategy/AddForm.vue              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
index b96dc2c64..24b9dcb52 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@@ -195,7 +195,7 @@ const formData = ref({
 const rules = ref({
   strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
   name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
-  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符') trigger: 'blur' }],
+  description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符') ,trigger: 'blur' }],
   priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
 })
 

From 61593b29c3359959f15b12370287faf32ab77202 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 11:14:35 +0800
Subject: [PATCH 197/225] =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategySetting/strategy/repairMaterialStrategy/AddForm.vue | 2 +-
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
index 7a9fe7bd6..8f09fe8d7 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@@ -328,7 +328,7 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符)', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: t('ts.请输入代码'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
   name: [{ required: true, message: t('ts.请输入名字'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
   description: [{ required: true, message: t('ts.请输入描述'), trigger: 'blur' },{ max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }],
   priority: [{ required: true, message: t('ts.请输入优先级'), trigger: 'blur' }]
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 7a2429656..aadad7310 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -815,7 +815,7 @@ const handleSelectionPublish = async ()=>{
         },{
           key: 'supplierCode',
           value: 'supplierCode',
-          message: '请填写供应商代码！',
+          message: t(`ts.${'请填写供应商代码！'}`),
           isMainValue: true
         },{
           key: 'status',

From ebc68dc5c0f8a9023c8194b7f5c1fbe25b7fea21 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 11:20:38 +0800
Subject: [PATCH 198/225] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.wyf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.wyf b/.env.wyf
index 6869a701f..7ee319b35 100644
--- a/.env.wyf
+++ b/.env.wyf
@@ -63,6 +63,7 @@ VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload'
 # # 上传路径
 # VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload'
 
+# # scptest
 # VITE_BASE_URL='http://172.21.32.16/api'
 # # 上传路径
 # VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload'

From b79d0db809eec8e6d0bdb0e429b5be68768e8c3c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 11:23:35 +0800
Subject: [PATCH 199/225] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=AD=EF=BC=8C=E5=8F=AB=E6=96=99=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index 0b7baf7e0..d50c7b763 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -361,7 +361,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortTableDefault:1,
-    isSearch:true,
+    isSearch:false,
     form: {
       componentProps: {
         disabled: true

From beba0bd63182a9ee4a1d82430133929e5741c40c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 11:24:26 +0800
Subject: [PATCH 200/225] FWHL-134

---
 src/locales/zh-CN.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index a6683633a..18de3935a 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1377,7 +1377,7 @@ export default {
     箱数量: '箱数量',
     已选: '已选 ',
     条数据: ' 条数据',
-    是否已读: '是否已读d',
+    是否已读: '是否已读',
     采购订单类型: '采购订单类型',
     PDA安装程序下载链接:'PDA安装程序下载链接',
     ASN直接收货: 'ASN直接收货',

From 870e719e1e7754b6219882fdd7c5cfcffbd64356 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 14:39:13 +0800
Subject: [PATCH 201/225] FWHL-97

---
 .../src/TableFormAdjustment.vue               | 58 ++++++++--------
 src/locales/en-US.ts                          | 65 ++++++++++++++++--
 src/locales/zh-CN.ts                          | 68 +++++++++++++++++--
 .../areabasic/areabasic.data.ts               | 18 ++---
 .../factoryModeling/dock/dock.data.ts         | 28 ++++----
 .../warehouse/warehouse.data.ts               | 14 ++--
 .../supplierManage/supplier/supplier.data.ts  | 40 +++++------
 .../supplieritem/supplieritem.data.ts         | 10 +--
 .../purchasereceiptJobMain/index.vue          |  2 +-
 .../purchasereceiptRequestMain/index.vue      |  2 +-
 .../supplierdeliverRequestMain.data.ts        |  2 +-
 .../supplierinvoiceRequestMain/index.vue      | 12 ++--
 .../supplierinvoiceRequestMain.data.ts        | 46 ++++++-------
 ...pplierinvoiceRequestMainDifference.data.ts | 34 +++++-----
 14 files changed, 252 insertions(+), 147 deletions(-)

diff --git a/src/components/TableFormAdjustment/src/TableFormAdjustment.vue b/src/components/TableFormAdjustment/src/TableFormAdjustment.vue
index f164a7b7c..877ab7ef7 100644
--- a/src/components/TableFormAdjustment/src/TableFormAdjustment.vue
+++ b/src/components/TableFormAdjustment/src/TableFormAdjustment.vue
@@ -36,7 +36,7 @@
       <div class="bottom" style="display: flex; flex-direction: row;">
         <!-- 下-左 -->
         <div style="margin-right:5px">
-          <el-button type="info" link>调整事项（减项以负数列示）：</el-button>
+          <el-button type="info" link>{{t(`ts.${'调整事项（减项以负数列示）：'}`)}}</el-button>
           <el-table border class="top-table" :data="[...bottomLeftTableData,...bottomLeftSumTableData]">
             <el-table-column
               :label="headerItem.label"
@@ -46,29 +46,29 @@
               v-for="headerItem in bottomLeftHeader"
             >
             <template #default="scope">
-              <el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/>
-              <el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/>
+              <el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="t('ts.请输入')+`${headerItem.label}`"/>
+              <el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="`t('ts.请输入')+${headerItem.label}`"/>
               
               <span v-else>{{ scope.row[headerItem.field] }}</span>
             </template>
           </el-table-column>
           </el-table>
           <el-form style="margin-top:20px;width:460px" :model="leftForm" :label-width="300" >
-            <el-form-item label="经办人">
-              <el-input :disabled="isDetail" v-model="leftForm.name" placeholder="请输入经办人"/>
+            <el-form-item :label="t('ts.经办人')">
+              <el-input :disabled="isDetail" v-model="leftForm.name" :placeholder="t('ts.请输入经办人')"/>
             </el-form-item>
-            <el-form-item label="对账日期">
+            <el-form-item :label="t('ts.对账日期')">
               <el-date-picker :disabled="isDetail" value-format="YYYY-MM-DD HH:mm:ss"
                 v-model="leftForm.date"
                 type="datetime"
-                placeholder="请选择对账日期"
+                :placeholder="t('ts.请选择对账日期')"
               />
             </el-form-item>
           </el-form>
         </div>
         <!-- 下-右 -->
         <div>
-          <el-button type="info" link>调整事项（减项以负数列示）：</el-button>
+          <el-button type="info" link>{{t(`ts.${'调整事项（减项以负数列示）：'}`)}}</el-button>
           <el-table border class="top-table" :data="[...bottomRightTableData,...bottomRightSumTableData]">
             <el-table-column
               :label="headerItem.label"
@@ -78,22 +78,22 @@
               v-for="headerItem in bottomRightHeader"
             >
             <template #default="scope">
-              <el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/>
-              <el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/>
+              <el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="t('ts.请输入')+`${headerItem.label}`"/>
+              <el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="t('ts.请输入')+`${headerItem.label}`"/>
               
               <span v-else>{{ scope.row[headerItem.field] }}</span>
             </template>
           </el-table-column>
           </el-table>
           <el-form style="margin-top:20px;width:460px" :model="rightForm" :label-width="300" >
-            <el-form-item label="经办人">
-              <el-input :disabled="isDetail" v-model="rightForm.name" placeholder="请输入经办人"/>
+            <el-form-item :label="t('ts.经办人')">
+              <el-input :disabled="isDetail" v-model="rightForm.name" :placeholder="t('ts.请输入经办人')"/>
             </el-form-item>
-            <el-form-item label="对账日期">
+            <el-form-item :label="t('ts.对账日期')">
               <el-date-picker :disabled="isDetail"  value-format="YYYY-MM-DD HH:mm:ss"
                 v-model="rightForm.date"
                 type="datetime"
-                placeholder="请选择对账日期"
+                :placeholder="t('ts.请选择对账日期')"
               />
             </el-form-item>
           </el-form>
@@ -164,15 +164,15 @@ const setTopHeaderData = ()=>{
   let myData = unref(props.rowData)
   console.log('myData',myData)
   topHeader.value = [{
-    label:`单位名称:${myData?.ttSupplierName}`,
+    label:`${t('ts.单位名称')}:${myData?.ttSupplierName}`,
     field:'name1',
     width:260
   },{
-    label:'金额',
+    label: t('ts.金额'),
     field:'price1',
     width:100
   },{
-    label:'备注',
+    label:t('ts.备注'),
     field:'remark1',
     width:100
   }]
@@ -181,10 +181,10 @@ const setTopHeaderData = ()=>{
   let month = dayjs(myData?.ttGenerateTime).month()+1
   let day = new Date(year,month,0).getDate()
   topTableData.value = [{
-    name1:`截止${year}年${month}月${day}日账面金额如下`,
+    name1:`${t('ts.截止')}${year}${t('ts.年')}${month}${t('ts.月')}${day}${t('ts.日')}${t('ts.账面金额如下')}`,
     price1:Number(myData?.ttAccountAp)+Number(myData?.ttAccountOthap),
     remark1:myData?.remark,
-    name2:'截止年月日账面金额如下',
+    name2:t('ts.截止年月日账面金额如下'),
     price2:Number(myData?.ttAccountAp)+Number(myData?.ttAccountOthap),
     remark2:myData?.remark,
   }]
@@ -225,31 +225,31 @@ const setDetailData = (adjustmentData)=>{
 
 //摘要表格左侧
 const bottomLeftHeader = ref([{
-  label:'序号',
+  label:t('ts.序号'),
   field:'index',
   width:80
 },{
-  label:'摘要',
+  label:t('ts.摘要'),
   field:'ttAbstractLeft',
   width:180,
   type:'input'
 },{
-  label:'金额',
+  label:t('ts.金额'),
   field:'ttBalanceLeft',
   width:200,
   type:'inputnumber'
 }])
 const bottomRightHeader = ref([{
-  label:'序号',
+  label:t('ts.序号'),
   field:'index',
   width:80
 },{
-  label:'摘要',
+  label:t('ts.摘要'),
   field:'ttAbstractRight',
   width:180,
   type:'input'
 },{
-  label:'金额',
+  label:t('ts.金额'),
   field:'ttBalanceRight',
   width:200,
   type:'inputnumber'
@@ -341,14 +341,14 @@ const bottomRightTableData = ref([{
 // 调整事项合计 、调整后余额 
 const bottomLeftSumTableData = ref([{
   index:'',
-  ttAbstractLeft:'调整事项合计',
+  ttAbstractLeft:t('ts.调整事项合计'),
   ttBalanceLeft:'',
   remark:'',
   isSum:true,
   disabled:true
 },{
   index:'',
-  ttAbstractLeft:'调整后余额',
+  ttAbstractLeft:t('ts.调整后余额'),
   ttBalanceLeft:'',
   remark:'',
   isSum:true
@@ -379,14 +379,14 @@ watch(
 )
 const bottomRightSumTableData = ref([{
   index:'',
-  ttAbstractRight:'调整事项合计',
+  ttAbstractRight:t('ts.调整事项合计'),
   ttBalanceRight:'',
   remark:'',
   isSum:true,
   disabled:true
 },{
   index:'',
-  ttAbstractRight:'调整后余额',
+  ttAbstractRight:t('ts.调整后余额'),
   ttBalanceRight:'',
   remark:'',
   isSum:true
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 5023775f3..fc0cb56e1 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1543,13 +1543,64 @@ export default {
     确认新密码:'Confirm new password',
     请再次输入新密码:'Please enter a new password again',
     '两次输入的密码不一致，请重新输入!':'The password you entered twice is different, please enter it again!',
-    // 物料描述: '',
-    // 返利未税金额: '',
-    // 财务过账日期: '',
-    // Q2通知单: '',
-    // ASN外部收货: '',
-    // 数量: '',
-
+    请输入正确的手机号:'Please enter the correct mobile phone number',
+    请输入类型:'Please enter a type',
+    请输入默认库位代码:'Please enter the default library bit code',
+    请选择是否是功能区:'Please select whether it is a functional area',
+    请选择类型:'Please select type',
+    请输入简称:'Please enter the abbreviation',
+    不得超过128个字符:'Maximum 128 characters',
+    请输入正确的邮箱格式:'Please enter the correct email format',
+    请输入正确的传真:'Please enter the correct fax',
+    用户名称:'User name',
+    子表版本:'Subtable version',
+    请选择版本号: 'Please select the version number',
+    请输入未税金额: 'Please enter the untaxed amount',
+    请输入税额: 'Please enter the tax amount',
+    请选择是否跳过任务直接生成记录: 'Choose whether to skip the task and generate the record directly',
+    请选择是否自动执行: 'Select whether to execute automatically',
+    请选择是否自动通过: 'Please select whether to pass automatically',
+    请选择是否自动提交: 'Choose whether to submit automatically',
+    请输入部门: 'Please enter the department',
+    请输入金税票号: 'Please enter the gold tax voucher number',
+    请选择发票日期: 'Please select the invoice date',
+    请输入价差通过说明: 'Please enter the spread through the description',
+    最多100字符: 'Up to 100 characters',
+    '请填订单类型！':'Please fill in the order type!',
+    请输入合同价格:'Please enter the contract price',
+    '请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数':'Please confirm whether the rebate amount is included in the application. Please note that the rebate amount should be negative',
+    重要提示:'Important Notes',
+    '调整事项（减项以负数列示）：':'Adjustment items (minus items are shown as negative numbers) :',
+    '请输入':'Please enter',
+    经办人:'Person in charge',
+    对账日期:'Date of reconciliation',
+    请选择对账日期:'Please select the reconciliation date',
+    调整事项合计: 'Total adjustment items',
+    调整后余额:'Adjusted balance',
+    摘要:'Abstract',
+    截止:'deadline',
+    账面金额如下:'the carrying amount is as follows',
+    截止年月日账面金额如下:'The book amount at the end of the year is as follows',
+    单位名称:'Name of company',
+    请输入经办人:'Please enter operator',
+    活动:'Activity',
+    停用:'Deactivate',
+    A类:'Class A',
+    B类:'Class B',
+    C类:'Class C',
+    Z类:'Class Z',
+    原材料:'Raw material',
+    器具:'Utensils',
+    产成品:'Finished product',
+    低值易耗品:'Low value consumables',
+    专用维修备件:'Special maintenance spare parts',
+    一次性包材:'Disposable packaging material',
+    生产耗材:'Production consumables',
+    '漆&胶':'Paint&glue',
+    自制备件:'Self made spare parts',
+    通用维修备件:'General maintenance spare parts',
+    '周转箱（周转包装）':'Turnover box (turnover packing)',
+    '外购件':'Outside purchased parts',
   },
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 18de3935a..076ab279b 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1541,15 +1541,69 @@ export default {
     确认新密码:'确认新密码',
     请再次输入新密码:'请再次输入新密码',
     '两次输入的密码不一致，请重新输入!':'两次输入的密码不一致，请重新输入!',
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
-    // 抽奖规则请填写完全:'抽奖规则请填写完全',
+    请输入正确的手机号:'请输入正确的手机号',
+    请输入类型:'请输入类型',
+    请输入默认库位代码:'请输入默认库位代码',
+    请选择是否是功能区:'请选择是否是功能区',
+    请选择类型:'请选择类型',
+    请输入简称:'请输入简称',
+    不得超过128个字符:'不得超过128个字符',
+    请输入正确的邮箱格式:'请输入正确的邮箱格式',
+    请输入正确的传真:'请输入正确的传真',
+    用户名称:'用户名称',
+    子表版本:'子表版本',
+    请选择版本号:'请选择版本号',
+    请输入未税金额:'请输入未税金额',
+    请输入税额: '请输入税额',
+    请选择是否跳过任务直接生成记录: '请选择是否跳过任务直接生成记录',
+    请选择是否自动执行: '请选择是否自动执行',
+    请选择是否自动通过: '请选择是否自动通过',
+    请选择是否自动提交: '请选择是否自动提交',
+    请输入部门: '请输入部门',
+    请输入金税票号: '请输入金税票号',
+    请选择发票日期: '请选择发票日期',
+    请输入价差通过说明: '请输入价差通过说明',
+    最多100字符: '最多100字符',
+    '请填订单类型！':'请填订单类型！',
+    请输入合同价格:'请输入合同价格',
+    '请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数':'请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数',
+    重要提示:'重要提示',
+    '调整事项（减项以负数列示）：':'调整事项（减项以负数列示）：',
+    '请输入':'请输入',
+    经办人:'经办人',
+    对账日期:'对账日期',
+    请选择对账日期:'请选择对账日期',
+    调整事项合计:'调整事项合计',
+    调整后余额:'调整后余额',
+    摘要:'摘要',
+    截止:'截止',
+    账面金额如下:'账面金额如下',
+    截止年月日账面金额如下:'截止年月日账面金额如下',
+    单位名称:'单位名称',
+    请输入经办人:'请输入经办人',
+    活动:'活动',
+    停用:'停用',
+    A类:'A类',
+    B类:'B类',
+    C类:'C类',
+    Z类:'Z类',
+    原材料:'原材料',
+    器具:'器具',
+    产成品:'产成品',
+    低值易耗品:'低值易耗品',
+    专用维修备件:'专用维修备件',
+    一次性包材:'一次性包材',
+    生产耗材:'生产耗材',
+    '漆&胶':'漆&胶',
+    自制备件:'自制备件',
+    通用维修备件:'通用维修备件',
+    '周转箱（周转包装）':'周转箱（周转包装）',
+    '外购件':'外购件',
+    // 自制备件:'',
+    // 自制备件:'',
+    // 自制备件:'',
 
     
-    
-    
-    
-
 
   },
 
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 5e1f25d80..645f33bff 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -257,27 +257,27 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const AreaRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validate: validateYS, message: '请输入正确的代码', trigger: 'blur' }
+    { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validate: validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur' }
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   warehouseCode: [
-    { required: true, message: '请输入仓库代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入仓库代码'), trigger: 'change' }
   ],
   isFunctional: [
-    { required: true, message: '请选择是否是功能区', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否是功能区'), trigger: 'change' }
   ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
   type: [
-    { required: true, message: '请选择类型', trigger: 'change' }
+    { required: true, message: t('ts.请选择类型'), trigger: 'change' }
   ],
   manageMode: [
     { required: true, message: t('ts.请选择管理精度'), trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index 11a7c465a..1c2f512c3 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -295,39 +295,39 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const DockRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validator:validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur'}
   ],
   name: [
-    { required: true,max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true,max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   city: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   address: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   contactPerson: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   contactPhone: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validator:validateHanset, message: t('ts.请输入正确的手机号'), trigger: 'blur'}
   ],
   type: [
-    { required: true, message: '请输入类型', trigger: 'change' }
+    { required: true, message: t('ts.请输入类型'), trigger: 'change' }
   ],
   warehouseCode: [
-    { required: true, message: '请输入仓库代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入仓库代码'), trigger: 'change' }
   ],
   defaultLocationCode: [
-    { required: true, message: '请输入默认库位代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入默认库位代码'), trigger: 'change' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
index 3f82b7907..4f4e936cb 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
@@ -199,20 +199,20 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const WarehouseRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validator:validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur'}
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   description: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
index b386fcf1a..5c8d373ff 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
@@ -298,50 +298,50 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const SupplierRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validator:validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur'}
   ],
   name: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   shortName: [
-    { required: true, message: '请输入简称', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, message: t('ts.请输入简称'), trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   address: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   country: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   city: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   phone: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validator:validateHanset, message: t('ts.请输入正确的手机号'), trigger: 'blur'}
   ],
   fax: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
+    { validator:validateFax, message: t('ts.请输入正确的传真'), trigger: 'blur'}
   ],
   postId: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
     { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
   ],
   contacts: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   email:  [
-    { required: true, message: '请输入邮箱', trigger: 'blur' },
-    { max: 128, message: '不得超过128个字符', trigger: 'blur' },
-    { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'}
+    { required: true, message: t('ts.请输入邮箱'), trigger: 'blur' },
+    { max: 128, message: t('ts.不得超过128个字符'), trigger: 'blur' },
+    { validator:validateEmail, message: t('ts.请输入正确的邮箱格式'), trigger: 'blur'}
   ],
   bank: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index c53781342..8c646a5fd 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -403,13 +403,13 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const SupplieritemRules = reactive({
   supplierCode: [
-    { required: true, message: '请输入供应商代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入供应商代码'), trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: t('ts.请输入物料代码'), trigger: 'change' }
   ],
   supplierItemCode: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
     // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   // packUnit: [
@@ -419,9 +419,9 @@ export const SupplieritemRules = reactive({
   //   { required: true, message: '请输入供应商包装量', trigger: 'blur' }
   // ],
   available:  [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
 })
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 51b472a5c..f5f91ac59 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -348,7 +348,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
-    label: '查看子包装',
+    label: t('ts.查看子包装'),
     name: 'viewParentPickingNumber',
     hide: false,
     type: 'primary',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 995b51cce..cb02a86fd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -862,7 +862,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
-    label: '查看子包装',
+    label: t('ts.查看子包装'),
     name: 'viewParentPickingNumber',
     hide: false,
     type: 'primary',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index be39f2371..92545bda7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -130,7 +130,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
           {
             key: 'supplierCode',
             value: 'supplierCode',
-            message: '请填写供应商代码！',
+            message: t(`ts.${'请填写供应商代码！'}`),
             isMainValue: true
           },
           {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index ea534c889..fb83bf890 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -1120,7 +1120,7 @@ const onChangePurchasePass = (field, cur, formRef)=>{
 const submitPurchasePass = async (id, submitData) => {
   console.log(submitData)
   if(submitData&&!submitData.balanceStatement.trim()){
-    message.error('请输入价差通过说明')
+    message.error(t('ts.请输入价差通过说明'))
     return
   }
   const id1 = submitData?.id || id
@@ -1151,7 +1151,7 @@ const formFinanceRef = ref()
 const handleFinanceApp = async (row) => {
   row.postingDate = dayjs().valueOf()
   row.voucherNumberRemark = `收${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>6?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-6):row.goldenTaxInvoiceNumber:''}`
-  formFinanceRef.value.open('update', row, null, '财务通过', '财务通过')
+  formFinanceRef.value.open('update', row, null, t('ts.财务通过'), t('ts.财务通过'))
 }
 
 const submitFormFinance = async (formType, submitData) => {
@@ -1425,8 +1425,8 @@ const submitForm = async (formType, submitData) => {
       }
       if(data.discountAmount1>0){
         await ElMessageBox.alert(
-          '请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数',
-          '重要提示',
+          t(`ts.${'请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数'}`),
+          t('ts.重要提示'),
           {
             showCancelButton: true
           }
@@ -1439,8 +1439,8 @@ const submitForm = async (formType, submitData) => {
     } else {
       if(data.discountAmount1>0){
         await ElMessageBox.alert(
-          '请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数',
-          '重要提示',
+          t(`ts.${'请确认该申请中是否包含返利金额，请注意填写的返利金额应为负数'}`),
+          t('ts.重要提示'),
           {
             showCancelButton: true
           }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 04db901dc..b562dcb2c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1643,44 +1643,44 @@ export const SupplierinvoiceRequestMainRules = reactive({
     // { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
   ],
   supplierCode: [
-    { required: true, message: '请选择供应商代码', trigger: 'change' }
+    { required: true, message: t('ts.请选择供应商代码'), trigger: 'change' }
   ],
   invoiceTime:[
-    { required: false, message: '请选择发票日期', trigger: 'blur' }
+    { required: false, message: t('ts.请选择发票日期'), trigger: 'blur' }
   ],
   goldenTaxInvoiceNumber:[
-    { required: false, message: '请输入金税票号', trigger: 'blur' },
+    { required: false, message: t('ts.请输入金税票号'), trigger: 'blur' },
     // { validator:validateGoldenTaxInvoiceNumber, message: '金税票号只能是数字', trigger: 'blur'}
   ],
   departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
+    { required: true, message: t('ts.请输入部门'), trigger: 'blur' }
   ],
   autoCommit: [
-    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否自动提交'), trigger: 'change' }
   ],
   autoAgree: [
-    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否自动通过'), trigger: 'change' }
   ],
   autoExecute: [
-    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否自动执行'), trigger: 'change' }
   ],
   directCreateRecord: [
-    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否跳过任务直接生成记录'), trigger: 'change' }
   ],
   businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
+    { required: true, message: t('ts.请输入业务类型'), trigger: 'blur' }
   ],
   remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message:  t('ts.不得超过50个字符'), trigger: 'blur' }
   ],
   procurementCreator: [
-    { required: true, message: '请选择采购员', trigger: 'change' }
+    { required: true, message: t('ts.请选择采购员'), trigger: 'change' }
   ],
   beforeTaxAmount: [
-    { required: true, message: '请输入未税金额', trigger: 'change' }
+    { required: true, message: t('ts.请输入未税金额'), trigger: 'change' }
   ],
   totalTaxAmount: [
-    { required: true, message: '请输入税额', trigger: 'change' }
+    { required: true, message: t('ts.请输入税额'), trigger: 'change' }
   ],
 })
 
@@ -1966,7 +1966,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       componentProps: {
         multiple:true,//多选
         isSearchList: true,
-        searchListPlaceholder: '请选择订单行',
+        searchListPlaceholder: t('ts.请选择订单行'),
         searchField: 'poLine',
         searchTitle: '待开票列表',
         searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
@@ -1975,12 +1975,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           {
             key: 'supplierCode',
             value: 'supplierCode',
-            message: '请填供应商信息！',
+            message: t(`ts.${'请填供应商信息！'}`),
             isMainValue: true
           },{
             key: 'orderType',
             value: 'orderType',
-            message: '请填订单类型！',
+            message: t(`ts.${'请填订单类型！'}`),
             isMainValue: true
           }
         ]
@@ -1989,7 +1989,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     tableForm: {
       multiple:true,//多选
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单行',
+      searchListPlaceholder: t('ts.请选择订单行'),
       searchField: 'poLine',
       searchTitle: '待开票列表',
       searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
@@ -1998,13 +1998,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         {
           key: 'supplierCode',
           value: 'supplierCode',
-          message: '请填供应商信息！',
+          message: t(`ts.${'请填供应商信息！'}`),
           isMainValue: true
         },
         {
           key: 'orderType',
           value: 'orderType',
-          message: '请填订单类型！',
+          message: t(`ts.${'请填订单类型！'}`),
           isMainValue: true
         }
       ],
@@ -2220,13 +2220,13 @@ const validateSinglePrice = (rule: any, value: any, callback: any) => {
   if (Number(value)>0) {
       callback();
   } else {
-    callback(new Error('请输入合同价格'));
+    callback(new Error(t('ts.请输入合同价格')));
   }
 }
 //表单校验
 export const SupplierinvoiceRequestDetailRules = reactive({
   singlePrice: [
-    { required: true, message: '请输入合同价格', trigger: 'change' },
+    { required: true, message: t('ts.请输入合同价格'), trigger: 'change' },
     { validator: validateSinglePrice, trigger: 'change' }
   ],
 })
@@ -2250,7 +2250,7 @@ export const PurchasePass = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const PurchasePassRules = reactive({
   balanceStatement: [
-    { required: true, message: '请输入价差通过说明', trigger: 'blur'},
-    { max: 100, message: '最多100字符', trigger: 'blur'}
+    { required: true, message: t('ts.请输入价差通过说明'), trigger: 'blur'},
+    { max: 100, message: t('ts.最多100字符'), trigger: 'blur'}
   ],
 })
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index a64708f61..ef5b2529a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -1612,43 +1612,43 @@ export const SupplierinvoiceRequestMainRules = reactive({
     // { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
   ],
   supplierCode: [
-    { required: true, message: '请选择供应商代码', trigger: 'change' }
+    { required: true, message:  t('ts.请选择供应商代码'), trigger: 'change' }
   ],
   invoiceTime:[
-    { required: false, message: '请选择发票日期', trigger: 'blur' }
+    { required: false, message: t('ts.请选择发票日期'), trigger: 'blur' }
   ],
   goldenTaxInvoiceNumber:[
-    { required: false, message: '请输入金税票号', trigger: 'blur' }
+    { required: false, message: t('ts.请输入金税票号'), trigger: 'blur' }
   ],
   departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
+    { required: true, message: t('ts.请输入部门'), trigger: 'blur' }
   ],
   autoCommit: [
-    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否自动提交'), trigger: 'change' }
   ],
   autoAgree: [
-    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否自动通过'), trigger: 'change' }
   ],
   autoExecute: [
-    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+    { required: true, message: t('ts.请选择是否自动执行'), trigger: 'change' }
   ],
   directCreateRecord: [
-    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+    { required: true, message: t('请选择是否跳过任务直接生成记录'), trigger: 'change' }
   ],
   businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
+    { required: true, message: t('请输入业务类型'), trigger: 'blur' }
   ],
   remark:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: t('不得超过50个字符'), trigger: 'blur' }
   ],
   procurementCreator: [
-    { required: true, message: '请选择采购员', trigger: 'change' }
+    { required: true, message: t('请选择采购员'), trigger: 'change' }
   ],
   beforeTaxAmount: [
-    { required: true, message: '请输入未税金额', trigger: 'change' }
+    { required: true, message: t('请输入未税金额'), trigger: 'change' }
   ],
   totalTaxAmount: [
-    { required: true, message: '请输入税额', trigger: 'change' }
+    { required: true, message: t('请输入税额'), trigger: 'change' }
   ],
 })
 
@@ -2145,13 +2145,13 @@ const validateSinglePrice = (rule: any, value: any, callback: any) => {
   if (Number(value)>0) {
       callback();
   } else {
-    callback(new Error('请输入合同价格'));
+    callback(new Error(t('ts.请输入合同价格')));
   }
 }
 //表单校验
 export const SupplierinvoiceRequestDetailRules = reactive({
   singlePrice: [
-    { required: true, message: '请输入合同价格', trigger: 'change' },
+    { required: true, message: t('ts.请输入合同价格'), trigger: 'change' },
     { validator: validateSinglePrice, trigger: 'change' }
   ],
 })
@@ -2175,7 +2175,7 @@ export const PurchasePass = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const PurchasePassRules = reactive({
   balanceStatement: [
-    { required: true, message: '请输入价差通过说明', trigger: 'blur'},
-    { max: 100, message: '最多100字符', trigger: 'blur'}
+    { required: true, message: t('ts.请输入价差通过说明'), trigger: 'blur'},
+    { max: 100, message: t('ts.最多100字符'), trigger: 'blur'}
   ],
 })

From 08db77324bd121db01d54550d7be23bf3572821e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 15:14:07 +0800
Subject: [PATCH 202/225] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8F=AB=E6=96=99?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callmaterials/callmaterials.data.ts       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
index d50c7b763..fd438daee 100644
--- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
@@ -352,22 +352,22 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
         }]
     },
   },
-  {
-    label: '叫料库位',
-    field: 'location',
-    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-    isSearch:false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '叫料库位',
+  //   field: 'location',
+  //   isTable: false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:1,
+  //   isSearch:false,
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '项目',
     field: 'project',

From c7e52782a3caa22b086ad7bbaf9f81b6d3b7c4a3 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 17 Dec 2024 16:29:07 +0800
Subject: [PATCH 203/225] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                               |  2 ++
 src/locales/zh-CN.ts                               |  1 +
 .../supplierdeliver/purchasePlanMain/index.vue     | 14 +++++++-------
 .../supplierinvoiceRequestMainDifference.data.ts   |  8 ++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index fc0cb56e1..3ab92f9ba 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1601,6 +1601,8 @@ export default {
     通用维修备件:'General maintenance spare parts',
     '周转箱（周转包装）':'Turnover box (turnover packing)',
     '外购件':'Outside purchased parts',
+    '请填供应商信息！':'Please fill in the supplier information!',
+
   },
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 076ab279b..4541510d0 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1599,6 +1599,7 @@ export default {
     通用维修备件:'通用维修备件',
     '周转箱（周转包装）':'周转箱（周转包装）',
     '外购件':'外购件',
+    '请填供应商信息！':'请填供应商信息！',
     // 自制备件:'',
     // 自制备件:'',
     // 自制备件:'',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index aadad7310..303929f8b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -127,13 +127,6 @@ import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
   const { wsCache } = useCache()
   const language = wsCache.get('lang')
-  const announcements  = ref<any>([])
-  if('en-US'==language){
-    announcements.value = ["1. The total number of data items of the quantity of goods in the template does not exceed 1000 data (row × column).","2. All data content in the template is in text format, and formula content cannot be used as import data","3. The delivery date is in YYYY-MM-DD format, no hours, minutes and seconds are required"]
-
-  }else{
-    announcements.value = ["1. 模板中要货数量数据项总数不超过1000个数据（行×列）","2. 模板中全部数据内容格式为文本格式，不能使用公式内容作为导入数据","3. 要货日期为YYYY-MM-DD格式，不需填写时分秒"]
-  }
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
 
@@ -909,7 +902,14 @@ const handleSelectionPublish = async ()=>{
 
   /** 导入 */
   const importFormRef = ref()
+  const announcements  = ref<any>([])
   const handleImport = () => {
+    if('en-US'==language){
+      announcements.value = ["1.The total number of data items of the quantity of goods in the template does not exceed 1000 data (row × column)","2. All data content in the template is in text format, and formula content cannot be used as import data","3. The delivery date is in YYYY-MM-DD format, no hours, minutes and seconds are required"]
+
+    }else{
+      announcements.value = ["1. 模版中要货数量数据项总数不超过1000个数据（行×列）","2. 模板中全部数据内容格式为文本格式，不能使用公式内容作为导入数据","3. 要货日期为YYYY-MM-DD格式，不需填写时分秒"]
+    }
     importFormRef.value.open()
   }
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
index ef5b2529a..f40ca677f 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts
@@ -1939,12 +1939,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           {
             key: 'supplierCode',
             value: 'supplierCode',
-            message: '请填供应商信息！',
+            message: t(`ts.${'请填供应商信息！'}`),
             isMainValue: true
           },{
             key: 'orderType',
             value: 'orderType',
-            message: '请填订单类型！',
+            message: t(`ts.${'请填订单类型！'}`),
             isMainValue: true
           }
         ]
@@ -1962,13 +1962,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         {
           key: 'supplierCode',
           value: 'supplierCode',
-          message: '请填供应商信息！',
+          message: t(`ts.${'请填供应商信息！'}`),
           isMainValue: true
         },
         {
           key: 'orderType',
           value: 'orderType',
-          message: '请填订单类型！',
+          message: t(`ts.${'请填订单类型！'}`),
           isMainValue: true
         }
       ]

From ecaa6a64b2d707f88e4e994192bbd7ec77c91fcc Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Dec 2024 09:04:17 +0800
Subject: [PATCH 204/225] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index a49e1bad9..0c0c25e58 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -97,7 +97,7 @@
               :type="headerItem?.tableForm?.inputType"
               :placeholder="
                 t(
-                  `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
+                  `ts.${headerItem?.tableForm?.placeholder || t('ts.请输入') + t(`ts.${headerItem.label}`).replace('ts.','')}`
                 ).replace('ts.', '')
               "
               :disabled="disabledInput(headerItem, row)"

From 86edb31d3b4e3b5289e13cc147ab567ce2bc2c83 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Thu, 19 Dec 2024 11:22:09 +0800
Subject: [PATCH 205/225] =?UTF-8?q?FWHL-135=20=E4=BF=AE=E5=A4=8D=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index fb83bf890..5e35cb767 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -858,7 +858,7 @@ const openForm = async (type: string, row?: any) => {
       }
       // 编辑---procurementCreator采购审批人、discountAmount1折扣金额
       if (item.field == 'procurementCreator' || item.field == 'discountAmount1') {
-        if (row.status == '1' || row.status == '6') {
+        if (row.status == '1' || row.status == '6' || row.status == '3') {
           item.componentProps.disabled = false
         } else {
           item.componentProps.disabled = true

From 5ad189969d29e598e1d8f13bc3da84cc37bb6062 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Thu, 19 Dec 2024 14:15:42 +0800
Subject: [PATCH 206/225] =?UTF-8?q?FWHL-135=20=E4=BF=AE=E5=A4=8D=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 5e35cb767..6374483ad 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -857,7 +857,13 @@ const openForm = async (type: string, row?: any) => {
         }
       }
       // 编辑---procurementCreator采购审批人、discountAmount1折扣金额
-      if (item.field == 'procurementCreator' || item.field == 'discountAmount1') {
+      if (item.field == 'procurementCreator') {
+        if (row.status == '1' || row.status == '6') {
+          item.componentProps.disabled = false
+        } else {
+          item.componentProps.disabled = true
+        }
+      }else if(item.field == 'discountAmount1'){
         if (row.status == '1' || row.status == '6' || row.status == '3') {
           item.componentProps.disabled = false
         } else {

From a4b0b89449602f4f55f19424e060ce25c91fdfd7 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 19 Dec 2024 14:41:17 +0800
Subject: [PATCH 207/225] =?UTF-8?q?FWHL-137=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrap/productscrapRequestMain/index.vue       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index cecb4643c..2829b4934 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -655,6 +655,15 @@ const butttondata = (row,$index) => {
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:productscrap-request-main:agree'}), // 审批通过
         defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:productscrap-request-main:handle'}), // 处理
         defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:productscrap-request-main:update'}), // 编辑
+        {
+          label: '更改BOM数量',
+          name: 'updateBomQty',
+          hide: isShowMainButton(row,['1']),
+          type: 'warning',
+          color: '',
+          link: true, // 文本展现按钮
+          hasPermi: 'wms:productscrap-request-main:update'
+        },
         // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productscrap-request-main:delete'}), // 删除
     ]
 }

From 985e5ceb4e72ef939d1f36ce4959ed74e3c72309 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Dec 2024 15:44:07 +0800
Subject: [PATCH 208/225] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7-=E6=9B=B4=E6=94=B9bom?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/bomDismantle/index.ts             |  4 +
 src/api/wms/productscrapRequestMain/index.ts  |  6 ++
 .../productscrapRequestMain/index.vue         | 92 +++++++++++++++++-
 .../productscrapRequestMain.data.ts           | 94 +++++++++++++++++++
 4 files changed, 195 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/bomDismantle/index.ts b/src/api/wms/bomDismantle/index.ts
index 981af0fdb..99b3050d8 100644
--- a/src/api/wms/bomDismantle/index.ts
+++ b/src/api/wms/bomDismantle/index.ts
@@ -41,6 +41,10 @@ export const getProductscrapBomRecordPageBatch = async (params1) => {
   }
 }
 
+export const getChangeBomQtyPage = async (params) => {
+  return await request.get({ url: `/wms/productscrap-request-main/pageBom`, params })
+}
+
 // 查询制品报废申请子列表
 export const getProductscrapBomDismantleRecordPage = async (params) => {
   return await request.get({ url: `/wms/productscrap-record-main/bomPage`, params })
diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts
index 2a0a38edd..f003dc322 100644
--- a/src/api/wms/productscrapRequestMain/index.ts
+++ b/src/api/wms/productscrapRequestMain/index.ts
@@ -103,6 +103,12 @@ export const updateProductscrapDetailRequestBom = async (id, data) => {
   return await request.post({ url: `/wms/productscrap-request-main/updateBom?id=`+id, data })
 }
 
+
+// 修改制品报废BOM数据
+export const updateChangeBomRequest = async (data) => {
+  return await request.post({ url: `/wms/productscrap-request-main/updateBomQty`, data })
+}
+
 // 编辑
 export const editReturnNew = async (params) => {
   return await request.get({ url: `/wms/productscrap-request-main/editReturnNew`, params })
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 2829b4934..d6d803a05 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -121,6 +121,40 @@
   </template>
  </BasicForm>
 
+
+ <!-- 更改BOM数量 -->
+ <BasicForm
+    ref="detailChangeBomRef"
+    @success="getList"
+    :tableAllSchemas="ChangeBomQty.allSchemas"
+    :tableFormRules="ChangeBomQtyRules"
+    :tableData="changeBomTableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="true"
+    :isShowReduceButtonSelection="false"
+    @handleDeleteTable="handleDeleteTableBom"
+    @tableSelectionDelete="tableSelectionDeleteBom"
+    @searchTableSuccess="searchTableBomSuccess"
+    :footButttondata="footButttondata"
+    @footButtonClick="buttonBaseClickChangeBom"
+    @formSelectChange="formSelectChange">
+  <template #TableFormHead>
+    <el-form inline>
+      <el-form-item label="父物料代码">
+        <el-input v-model="ChangeBomSearchData.parentItemCode" @input="ChangeBomSearchData.parentItemCode = ChangeBomSearchData.parentItemCode.replace(/，/g, ',')" clearable placeholder="请输入物料代码"/>
+      </el-form-item>
+      <el-form-item label="子物料代码">
+        <el-input v-model="ChangeBomSearchData.childItemCode" @input="ChangeBomSearchData.childItemCode = ChangeBomSearchData.childItemCode.replace(/，/g, ',')" clearable placeholder="请输入物料代码"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" plain @click="changeBomSearchClick"><Icon class="mr-5px" icon="ep:search" />{{ t('common.query') }}</el-button>
+      </el-form-item>
+    </el-form>
+    
+  </template>
+ </BasicForm>
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/productscrap-request-main/import" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@@ -134,7 +168,9 @@ import { ProductscrapRequestMain,
   ProductscrapRequestDetail,
   ProductscrapRequestDetailRules,
   ProdcutscrapBomScrap,
-  ProdcutscrapBomScrapRules } from './productscrapRequestMain.data'
+  ProdcutscrapBomScrapRules,
+  ChangeBomQty,
+  ChangeBomQtyRules } from './productscrapRequestMain.data'
 import * as ProductscrapRequestMainApi from '@/api/wms/productscrapRequestMain'
 import * as ProductscrapRequestDetailApi from '@/api/wms/productscrapRequestDetail'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
@@ -260,6 +296,8 @@ const bomSearchClick = ()=>{
   }
 }
 
+
+
 const banchBomPage = async (fromLocationCode,item) => {
   const params = {
     location_code:fromLocationCode,
@@ -692,9 +730,61 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
+  }else if (val == 'updateBomQty'){ // 更改BOM数量
+    handleChangeBom(row)
   }
 }
 
+// 修改Bom数量 窗口
+const changeBomTableList = ref<any[]>([])
+const detailChangeBomRef =ref()
+const { tableObject: changeBomTableObject, tableMethods: changeBomTableMethods } =useTable({
+  getListApi: BomDismantleApi.getChangeBomQtyPage
+})
+const { getList:getDetailListChangeBom } = changeBomTableMethods
+const handleChangeBom = async (row)=>{
+    changeBomTableObject.params = {
+      number: row.number
+    }
+    await getDetailListChangeBom()
+    changeBomTableList.value = changeBomTableObject.tableList
+    detailChangeBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
+}
+// 查询
+const ChangeBomSearchData = ref({
+  parentItemCode:'', // 父物料代码
+  childItemCode:'' // 子物料代码
+})
+const changeBomSearchClick = ()=>{
+  ChangeBomSearchData.value.parentItemCode = ChangeBomSearchData.value.parentItemCode.trim()
+  ChangeBomSearchData.value.childItemCode = ChangeBomSearchData.value.childItemCode.trim()
+  let parentItemCodeList = ChangeBomSearchData.value.parentItemCode?ChangeBomSearchData.value.parentItemCode.split(','):[]
+  let childItemCodeList = ChangeBomSearchData.value.childItemCode?ChangeBomSearchData.value.childItemCode.split(','):[]
+  console.log('parentItemCodeList',parentItemCodeList)
+  console.log('childItemCodeList',childItemCodeList)
+  changeBomTableList.value = changeBomTableObject.tableList.filter(item=>{
+    console.log(parentItemCodeList.includes(item.parentItemCode))
+    console.log(childItemCodeList.includes(item.childItemCode))
+    if((parentItemCodeList.includes(item.parentItemCode)||parentItemCodeList.length==0)&&(childItemCodeList.includes(item.childItemCode)||childItemCodeList.length==0)){
+      return true
+    } else {
+      return false
+    }
+  })
+}
+// bom 列表 表单 按钮
+const buttonBaseClickChangeBom = (val) => {
+  // 保存
+  if (val == 'save') {
+    ProductscrapRequestMainApi.updateChangeBomRequest(changeBomTableList.value)
+    message.success(t('common.updateSuccess'))
+    detailChangeBomRef.value.dialogVisible = false
+  }
+  // 关闭
+  else if (val == 'close') {
+    detailChangeBomRef.value.dialogVisible = false
+  }
+}
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
   try{
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 829c83855..87216603b 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -1689,3 +1689,97 @@ export const ProdcutscrapBomScrap = useCrudSchemas(reactive<CrudSchema[]>([
 export const ProdcutscrapBomScrapRules = reactive({
   
 })
+
+
+/**
+ * @returns {Array} bom 拆解
+ */
+export const ChangeBomQty = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '行标记',
+  //   field: 'rowId',
+  //   isTableForm: false,
+  //   isForm: false,
+  //   tableForm:{
+  //     disabled: true
+  //   },
+  //   table: {
+  //     show: false
+  //   }
+  // },
+  {
+    label: '父物料代码',
+    field: 'parentItemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '父物料数量',
+    field: 'parentQty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '子物料代码',
+    field: 'childItemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: 'Bom数量',
+    field: 'bomQty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '子物料数量',
+    field: 'qty',
+    tableForm: {
+      disabled: false,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true,
+      // isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择批次',
+      searchField: 'batch',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePage,
+    }
+  }
+]))
+
+//表单校验
+export const ChangeBomQtyRules = reactive({
+  qty:[
+    { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
+  ],
+})

From c32eb8c614ef495d44f53b6458d4fc75e66e6ac9 Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Thu, 19 Dec 2024 15:45:17 +0800
Subject: [PATCH 209/225] =?UTF-8?q?FWHL-147=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreceiptRecordMain.data.ts                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index 045228cb0..44dd2cc1e 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -733,10 +733,10 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    hiddenInMain:true,
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:10,
   },
   {
     label: '接口类型',

From 943017caad62887cacfdbb402d985b815ffaf991 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Dec 2024 16:48:35 +0800
Subject: [PATCH 210/225] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7-=E6=9B=B4=E6=94=B9bom?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E6=95=B0=E9=87=8F=E6=9C=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productscrap/productscrapRequestMain/index.vue          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index d6d803a05..d92ed7b45 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -346,6 +346,7 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
     }
     return
   }
+  detatableDataBom.params.masterId = row.id
   detatableDataBom.params.itemCode = row.itemCode
   detatableDataBom.params.bomVersion =  row.bomVersion
   detailQty.value = row.qty
@@ -384,7 +385,10 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
     //     }
     //   })
     // }else {
+    if(formType.value != 'update'){
+      //编辑的时候直接取接口返回数据
       item.qty = item.bomQty * row.qty
+    }
     // }
     // const obj = await banchBomPage(row.fromLocationCode, item)
     // console.log('obj',obj)
@@ -871,7 +875,9 @@ const handleHandle = async (id: number) => {
 
 /** 添加/修改操作 */
 const formRef = ref()
+const formType = ref('')
 const openForm =async (type: string, row?: number) => {
+  formType.value = type
   tableData.value = [] // 重置明细数据
   detatableDataBom.params = []; // 重置Bom请求参数
   lsBomSave.value = true

From b06e96d222114e07832a54b738427092b342651e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Dec 2024 17:28:48 +0800
Subject: [PATCH 211/225] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategySetting/strategy/upShelfStrategy/index.vue        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index 97ac40a2b..ec85b9f30 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -201,8 +201,8 @@ const importSuccess = () => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:up-shelf-strategy:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:up-shelf-strategy:delete' }), // 删除
   ]
 }
 

From 887e7b5e192dd79c65e4d1de2d1a0ba952089b2a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 20 Dec 2024 11:59:01 +0800
Subject: [PATCH 212/225] =?UTF-8?q?FWHL-89SCP=E9=92=88=E5=AF=B9=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A8=8B=E5=BA=8F=E6=A0=A1=E9=AA=8C=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=90=8E=E6=9C=9F=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/supplierdeliverRequestMain/index.ts   |  9 +++-
 .../ConfigGlobal/src/ConfigGlobal.vue         |  2 +-
 src/components/UploadFile/src/UploadFile.vue  | 45 +++++++++++++------
 .../supplierdeliverInspectionDetail.data.ts   |  4 ++
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts
index f4d4a7b20..55e68a727 100644
--- a/src/api/wms/supplierdeliverRequestMain/index.ts
+++ b/src/api/wms/supplierdeliverRequestMain/index.ts
@@ -129,4 +129,11 @@ export const deleteOldLabels = async (id) => {
 // 查看履历表
 export const querySupplierResume =  (asnNumber:string) => {
   return  request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber })
-}
\ No newline at end of file
+}
+
+
+// 校验是否上传成功
+export const checkUploadFileData = async (data) => {
+  return await request.post({ url: `/infra/file/uploadFileData`,data})
+}
+
diff --git a/src/components/ConfigGlobal/src/ConfigGlobal.vue b/src/components/ConfigGlobal/src/ConfigGlobal.vue
index a08739674..2f313d42c 100644
--- a/src/components/ConfigGlobal/src/ConfigGlobal.vue
+++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue
@@ -54,7 +54,7 @@ const currentLocale = computed(() => localeStore.currentLocale)
 <template>
   <ElConfigProvider
     :locale="currentLocale.elLocale"
-    :message="{ max: 1 }"
+    :message="{ max: 2 }"
     :namespace="variables.elNamespace"
     :size="size"
   >
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 7d64b8633..d6c2fda41 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -65,7 +65,7 @@ const props = defineProps({
   drag: propTypes.bool.def(false), // 拖拽上传
   isShowTip: propTypes.bool.def(true), // 是否显示提示
   isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
-  
+  checkUploadUrl:propTypes.func.def(), // 校验二次请求的接口
 })
 // ========== 上传相关 ==========
 const valueRef = ref(props.modelValue)
@@ -108,19 +108,38 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
 //   uploadRef.value.data.path = uploadFile.name
 // }
 // 文件上传成功
-const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any): void => {
+const handleFileSuccess: UploadProps['onSuccess'] = async (res: any,uploadFile: any): Promise<void> => {
+  console.log('文件上传成功',res)
   if(res&&res.code==0){
-    message.success(t('ts.上传成功'))
-    const fileListNew = fileList.value
-    fileListNew.pop()
-    fileList.value = fileListNew
-    uploadList.value.push({ name: uploadFile.name, url: res.data })
-    // if (uploadList.value.length == uploadNumber.value) {
-    if(fileList.value.every(it => it.status == 'success')) { 
-      fileList.value = fileList.value.concat(uploadList.value)
-      uploadList.value = []
-      uploadNumber.value = 0
-      emit('update:modelValue', listToString(fileList.value),res,uploadFile)
+    if(res.data&&res.data.code==200&&props.checkUploadUrl){
+      let checkRes = await props.checkUploadUrl(res.data.data)
+      console.log('checkRes',checkRes)
+      console.log('fileList.value',fileList.value)
+      console.log('uploadFile',uploadFile)
+      ElMessage.closeAll()
+      if(checkRes['fileExists']=="YES"){
+        message.success(t('ts.上传成功'))
+      }else{
+
+        let findItem = fileList.value.find(item=>item.uid == uploadFile.uid)
+        if(findItem){
+          uploadRef?.value?.handleRemove(findItem)
+        }
+        message.error(checkRes['msg'])
+      }
+    }else{
+      message.success(t('ts.上传成功'))
+      const fileListNew = fileList.value
+      fileListNew.pop()
+      fileList.value = fileListNew
+      uploadList.value.push({ name: uploadFile.name, url: res.data })
+      // if (uploadList.value.length == uploadNumber.value) {
+      if(fileList.value.every(it => it.status == 'success')) { 
+        fileList.value = fileList.value.concat(uploadList.value)
+        uploadList.value = []
+        uploadNumber.value = 0
+        emit('update:modelValue', listToString(fileList.value),res,uploadFile)
+      }
     }
   }else{
     message.error(res.msg)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index ab2006ea6..a43954d2d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+import { getBaseUrl } from '@/utils/systemParam'
 
 export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -16,6 +18,8 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableName: 'SupplierdeliverInspectionDetail',
         },
         fileType:['pdf'],
+        updateUrl: getBaseUrl()+import.meta.env.VITE_API_URL+'/infra/file/uploadFile',
+        checkUploadUrl: SupplierdeliverRequestMainApi.checkUploadFileData,
         fileSize:100,
         limit:20000
       }

From 1948f40f5cdf1a3b5347bd399b4d23d0af3e9b8f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 20 Dec 2024 13:46:30 +0800
Subject: [PATCH 213/225] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Annex/src/Annex.vue            | 15 +++++++++++-
 src/components/Detail/src/Detail.vue          |  7 ++++++
 src/components/UploadFile/src/UploadFile.vue  | 23 +++++++++++++++++--
 .../supplierdeliverRequestMain/index.vue      |  4 ++++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index b64bcfa90..ee1c122d8 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="limit"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="limit" :updateUrl="updateUrl" :checkUploadUrl="checkUploadUrl"
       @update:modelValue="handleAnnexSuccess" v-if="showAddBtn"/>
       <!-- HL-5838 5条限制影响了供应商发货申请上传质检报告，这个限制没找到认领的需求，所以放开 -->
       <!-- @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/> -->
@@ -36,6 +36,9 @@ import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
 import { formatDate } from '@/utils/formatTime'
 import * as FileApi from '@/api/wms/file'
 import { getBaseUrl } from '@/utils/systemParam'
+import { getUploadUrl } from '@/utils/systemParam'
+import { func } from 'vue-types'
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 defineComponent({
@@ -83,6 +86,16 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
+  updateUrl:{
+    type: String,
+    required: false,
+    default: getUploadUrl()
+  },
+  checkUploadUrl:{
+    type: Function,
+    required: false,
+    default: null
+  }
 })
 // 子传父的时候需要先定义好emit这个方法
 const emit = defineEmits(['handleAnnexSuccess', 'deleteAnnexSuccess','previewAnnexHandle'])
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 22f0dd4a6..ce9d38d21 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -124,6 +124,8 @@
                   :showPreview="annexItem.showPreview"
                   :showDownload = "annexItem.showDownload"
                   :hiddenDelete = "annexItem.hiddenDelete"
+                  :checkUploadUrl="annexItem.checkUploadUrl"
+                  :updateUrl="annexItem.updateUrl"
                   @handleAnnexSuccess="updateAnnexTableHandle"
                   @deleteAnnexSuccess="updateAnnexTableHandle"
                   :upData="{...remarksData.data,tableName:annexItem.tableName}"
@@ -220,6 +222,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 import { SearchTable } from '@/components/SearchTable'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getUploadUrl } from '@/utils/systemParam'
 
 defineOptions({ name: 'Detail' })
 
@@ -633,11 +636,15 @@ const getAnnexFileList =  async (row) => {
         fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
         limit:item.limit||10,
         fileSize:item.fileSize||5,
+        checkUploadUrl:item.checkUploadUrl || null,
+        updateUrl:item.updateUrl || getUploadUrl(),
         showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
         hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
         hiddenUpload:hiddenUpload || item.hiddenUpload || false, // 是否展示上传按钮
       })
+      console.log('annexTableData',annexTableData.value)
+
     }
     if(subDetailTableData){
         const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index d6c2fda41..d7f1a151a 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -65,7 +65,11 @@ const props = defineProps({
   drag: propTypes.bool.def(false), // 拖拽上传
   isShowTip: propTypes.bool.def(true), // 是否显示提示
   isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
-  checkUploadUrl:propTypes.func.def(), // 校验二次请求的接口
+  checkUploadUrl:{ // 校验的二次请求的接口
+    type: Function,
+    required: false,
+    default: null
+  }
 })
 // ========== 上传相关 ==========
 const valueRef = ref(props.modelValue)
@@ -110,24 +114,38 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
 // 文件上传成功
 const handleFileSuccess: UploadProps['onSuccess'] = async (res: any,uploadFile: any): Promise<void> => {
   console.log('文件上传成功',res)
+  
   if(res&&res.code==0){
     if(res.data&&res.data.code==200&&props.checkUploadUrl){
       let checkRes = await props.checkUploadUrl(res.data.data)
       console.log('checkRes',checkRes)
       console.log('fileList.value',fileList.value)
       console.log('uploadFile',uploadFile)
-      ElMessage.closeAll()
       if(checkRes['fileExists']=="YES"){
+        ElMessage.closeAll()
         message.success(t('ts.上传成功'))
+        const fileListNew = fileList.value
+        fileListNew.pop()
+        fileList.value = fileListNew
+        uploadList.value.push({ name: uploadFile.name, url: res.data })
+        // if (uploadList.value.length == uploadNumber.value) {
+        if(fileList.value.every(it => it.status == 'success')) { 
+          fileList.value = fileList.value.concat(uploadList.value)
+          uploadList.value = []
+          uploadNumber.value = 0
+          emit('update:modelValue', listToString(fileList.value),res,uploadFile)
+        }
       }else{
 
         let findItem = fileList.value.find(item=>item.uid == uploadFile.uid)
         if(findItem){
           uploadRef?.value?.handleRemove(findItem)
         }
+        ElMessage.closeAll()
         message.error(checkRes['msg'])
       }
     }else{
+      ElMessage.closeAll()
       message.success(t('ts.上传成功'))
       const fileListNew = fileList.value
       fileListNew.pop()
@@ -142,6 +160,7 @@ const handleFileSuccess: UploadProps['onSuccess'] = async (res: any,uploadFile:
       }
     }
   }else{
+    ElMessage.closeAll()
     message.error(res.msg)
   }
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index bb821346e..bb824ef87 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -218,6 +218,7 @@ import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { getBaseUrl } from '@/utils/systemParam'
 const { loadStart, loadDone } = usePageLoading()
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
@@ -240,6 +241,8 @@ const annexInspectionDetail = ref({
   fileType: ['pdf'],
   limit:999999,
   align: 'left',
+  updateUrl: getBaseUrl()+import.meta.env.VITE_API_URL+'/infra/file/uploadFile',
+  checkUploadUrl:SupplierdeliverRequestMainApi.checkUploadFileData,
   //明细表数据
   subDetailTableData: {
     queryParams: [
@@ -255,6 +258,7 @@ const annexInspectionDetail = ref({
     pageSize: 10,
     currentPage: 1
   }
+  
 })
 const tableColumns = ref([
   ...SupplierdeliverRequestMain.allSchemas.tableColumns,

From bef00e3813b5dc4eed7b63dbb5ff0a0251e14217 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 20 Dec 2024 14:04:09 +0800
Subject: [PATCH 214/225] =?UTF-8?q?FWHL-154WMS=20=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=20=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E4=B8=80=E8=B5=B7=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saleShipmentMainRequest/index.vue                 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index 73f4e3237..341d34cc2 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -62,6 +62,8 @@
     @submitForm="submitForm"
     :isShowButton = isShowButton
     @inputNumberChange="inputNumberChange"
+    @clearSearchInput="clearSearchInput"
+
   />
  <!-- 详情 -->
  <Detail
@@ -143,8 +145,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     }else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      if(formField == 'CustomerCode') {
-        setV['CustomerCode'] = val[0]['CustomerCode']
+      if(formField == 'customerCode') {
+        tableData.value = []
       } else {
         setV[formField] = val[0][searchField]
       }
@@ -348,6 +350,11 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+const clearSearchInput = (formField) => {
+  if(formField == 'customerCode'){
+    tableData.value = []
+  }
+}
 const inputNumberChange = (field, val,row, index) => {
   if(field=='qty'){
     if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){

From 0cfd5f56ddbc178d2745bd4a23953e4cbc77af4c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 20 Dec 2024 16:25:09 +0800
Subject: [PATCH 215/225] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7-M=E5=9E=8B=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7-=E6=90=9C=E7=B4=A2=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
index f5554a844..e1179e7af 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/purchasereceiptRequestMain.data.ts
@@ -67,7 +67,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         isConcatDetailSchemas:true,//是否是主子表合并 默认false
         searchDetailSchemas:PurchaseDetail.allSchemas,
         searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
+        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMSTypeM, // 查询弹窗所需分页方法
         searchCondition: [{
           key:'status',
           value:'2',

From ae535cc19164a27511e4716e640af719a65d8c3b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 23 Dec 2024 10:16:19 +0800
Subject: [PATCH 216/225] FWHL-119

---
 src/api/wms/purchaseDetail/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts
index fda3f3623..842604d0e 100644
--- a/src/api/wms/purchaseDetail/index.ts
+++ b/src/api/wms/purchaseDetail/index.ts
@@ -47,8 +47,8 @@ export const getPurchaseDetailPage = async (params) => {
 // 查询采购订单子列表
 export const getPurchaseDetailPageWMS = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
     const data = {...params}
+    delete data.isSearch
     return await request.post({ url: '/wms/purchase-detail/seniorWMS', data })
   } else {
     return await request.get({ url: `/wms/purchase-detail/pageWMS`, params })
@@ -71,8 +71,8 @@ export const getPurchaseDetailPageWMSPurchasereceiptRequest = async (params) =>
 // 查询M类型的采购订单子列表
 export const getPurchaseDetailPageWMSMOrderType = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
     const data = {...params}
+    delete data.isSearch
     return await request.post({ url: '/wms/purchase-detail/seniorWMS-MOrderType', data })
   } else {
     return await request.get({ url: `/wms/purchase-detail/pageWMS-MOrderType`, params })
@@ -81,8 +81,8 @@ export const getPurchaseDetailPageWMSMOrderType = async (params) => {
 
 export const getPurchaseDetailPageWMSTypeM = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
     const data = {...params}
+    delete data.isSearch
     return await request.post({ url: '/wms/purchase-detail/seniorM', data })
   } else {
     return await request.get({ url: `/wms/purchase-detail/pageM`, params })
@@ -92,8 +92,8 @@ export const getPurchaseDetailPageWMSTypeM = async (params) => {
 // 查询采购订单子列表
 export const getPurchaseDetailPageWMSSpare = async (params) => {
   if (params.isSearch) {
-    delete params.isSearch
     const data = {...params}
+    delete data.isSearch
     return await request.post({ url: '/wms/purchase-detail/seniorWMS-Spare', data })
   } else {
     return await request.get({ url: `/wms/purchase-detail/pageWMS-Spare`, params })

From 7c5d65605209ace74fa51f98f8ba9d61ed913dbd Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 23 Dec 2024 17:03:37 +0800
Subject: [PATCH 217/225] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A6=81=E8=B4=A7?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8BFWHL-37?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingMain/index.ts    |  6 ++
 src/locales/en-US.ts                          |  6 ++
 src/locales/zh-CN.ts                          |  9 +-
 .../demandforecastingMain.data.ts             | 97 +++++++++++++++++++
 .../demandforecastingMain/index.vue           | 88 ++++++++++++++++-
 5 files changed, 200 insertions(+), 6 deletions(-)

diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index cbb7bfb59..a8e96a0c5 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -156,4 +156,10 @@ export const updateIsRead = async (data) => {
   return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data })
 }
 
+//更新要货预测
+export const updateDemandforecaste = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-detail/queryQADDemandforecasting`,data })
+}
+
+
 
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 3ab92f9ba..aff39d14f 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1602,6 +1602,12 @@ export default {
     '周转箱（周转包装）':'Turnover box (turnover packing)',
     '外购件':'Outside purchased parts',
     '请填供应商信息！':'Please fill in the supplier information!',
+    更新要货预测:'Update demand forecast',
+    全部更新:'All updated',
+    按供应商更新:'Updated by vendor',
+    按物料更新:'Update by material',
+    '填写物料号（填写多个物料号）':'Fill in the material number (fill in multiple material numbers)',
+    '填写供应商代码（填写多个供应商）':'Fill in the vendor code (fill in multiple vendors)',
 
   },
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 4541510d0..eddcea95c 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1600,9 +1600,12 @@ export default {
     '周转箱（周转包装）':'周转箱（周转包装）',
     '外购件':'外购件',
     '请填供应商信息！':'请填供应商信息！',
-    // 自制备件:'',
-    // 自制备件:'',
-    // 自制备件:'',
+    更新要货预测:'更新要货预测',
+    全部更新:'全部更新',
+    按供应商更新:'按供应商更新',
+    按物料更新:'按物料更新',
+    '填写物料号（填写多个物料号）':'填写物料号（填写多个物料号）',
+    '填写供应商代码（填写多个供应商）':'填写供应商代码（填写多个供应商）',
 
     
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index ee80b26df..d6bca2d43 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -501,3 +501,100 @@ export const DemandforecastingDetailRules = reactive({
   ],
   poLine: [{required:true, message: '请选择订单行', trigger: 'blur'}]
 })
+
+
+export const UpdateMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '全部更新',
+    field: 'isAll',
+    sort: 'custom',
+    isForm: true,
+    dictType: DICT_TYPE.FALSE_OR_TRUE,
+    dictClass: 'string',
+    form: {
+      component: 'Radio',
+      // value: 1,
+      // componentProps:{
+      //   options: [{
+      //     value: 1,
+      //     label: '全部更新'
+      //   },
+      //   {
+      //     value: 2,
+      //     label: '按供应商更新'
+      //   },
+      //   {
+      //     value: 3,
+      //     label: '按物料更新'
+      //   }]
+      // }
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    form: {
+      componentProps: {
+        disabled:true,
+        dialogWidth:'700px',//搜索出来弹窗的宽度
+        multiple: true,
+        enterSearch:false,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '填写供应商代码（填写多个供应商）', // 输入框占位文本
+        searchField: 'supplierCode', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier1.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingMainApi.querySupplierList, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        // verificationParams: [{
+        //   key: 'codes',
+        //   action: '==',
+        //   value: '',
+        //   isMainValue: false,
+        //   isSearch: true,
+        //   isFormModel: true,
+        // }],
+        // verificationPage: DemandforecastingMainApi.querySupplierList, // 校验数去焦点输入是否正确的方法
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isForm: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        dialogWidth:'700px',//搜索出来弹窗的宽度
+        multiple: true,
+        enterSearch:false,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '填写物料号（填写多个物料号）', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchPage: SupplieritemApi.getSupplieritemPageSCP, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  }
+]))
+
+//表单校验
+export const UpdateMainRules = reactive({
+  
+})
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index d36758d0f..272861361 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -1,7 +1,15 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange"/>
+    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange">
+      <template #actionMore>
+        <el-button  type="primary" class="updateBtn" @click="updateHandle">
+          <Icon class="mr-5px" icon="ep:" />
+          {{t(`ts.更新要货预测`)}}
+          <Icon class="ml-5px" icon="ep:" />
+        </el-button>
+      </template>
+    </Search>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -32,13 +40,22 @@
     </template>
     </Table>
   </ContentWrap>
-
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="updateFormRef" 
+    :rules="UpdateMainRules" 
+    :formAllSchemas="UpdateMain.allSchemas"
+    @success="updateDemandforecaste"
+    @searchTableSuccess="searchTableSuccessUpdate"
+    @onChange="onChange"
+    :isBusiness="false"
+  />
 
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { DemandforecastingMain,DemandforecastingMainRules,DemandforecastingDetail,DemandforecastingDetailRules } from './demandforecastingMain.data'
+import { DemandforecastingMain,DemandforecastingMainRules,DemandforecastingDetail,DemandforecastingDetailRules ,UpdateMain,UpdateMainRules} from './demandforecastingMain.data'
 import * as DemandforecastingMainApi from '@/api/wms/demandforecastingMain'
 import * as DemandforecastingDetailApi from '@/api/wms/demandforecastingDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -210,6 +227,66 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+
+const updateFormRef = ref()
+const updateHandle = ()=>{
+  UpdateMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'supplierCode'||item.field == 'itemCode'){
+        item.componentProps.enterSearch = false
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+    })
+  updateFormRef.value.open('create',null,null,t(`ts.更新要货预测`),t(`ts.更新要货预测`))
+}
+const onChange = (field, cur, formRef) => {
+  console.log('onChange',field, cur, formRef)
+  if(field == 'isAll'){
+    //全部更新
+    UpdateMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'supplierCode'){
+        item.componentProps.enterSearch = cur=='true'?false:true
+        item.componentProps.isSearchList = cur=='true'?false:true
+        item.componentProps.disabled = cur=='true'?true:false
+      }
+      if(item.field == 'itemCode'){
+        item.componentProps.enterSearch = cur=='true'?false:true
+        item.componentProps.isSearchList = cur=='true'?false:true
+        item.componentProps.disabled = cur=='true'?true:false
+      }
+    })
+  }
+
+}
+const searchTableSuccessUpdate = (formField, searchField, val, formRef, type, row ) => {
+  console.log('searchTableSuccessUpdate',formField, searchField, val, formRef, type, row )
+  const setV = {}
+  let list = []
+  val.forEach(item=>{
+    list.push(item[searchField])
+  })
+  setV[formField] = list.join(',')
+  formRef.setValues(setV)
+}
+const updateDemandforecaste = async (formType,data)=>{
+  console.log('updateDemandforecaste',formType,data)
+  let submitData = {
+    "supplierCodes":"",
+    "itemCodes":""
+  }
+  if(data.isAll=='false'){
+    submitData.supplierCodes = data.supplierCode || ''
+    submitData.itemCodes =  data.itemCode || ''
+  }
+  updateFormRef.value.formLoading = true
+  try {
+    let res = await DemandforecastingMainApi.updateDemandforecaste(submitData)
+    console.log('更新结果',res)
+  } finally{
+    updateFormRef.value.formLoading = false
+  }
+
+}
 /** 初始化 **/
 onMounted(async () => {
   // try {
@@ -229,4 +306,9 @@ onMounted(async () => {
   color:var(--el-color-success);
   font-weight:700;
 }
+
+.updateBtn{
+  max-width: 100px !important;
+
+}
 </style>
\ No newline at end of file

From df27adb6050d1e0eb9304575e848f8b8da0cac7f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 23 Dec 2024 17:23:49 +0800
Subject: [PATCH 218/225] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnspare/purchasereturnRequestSpareMain/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
index 260f2206e..af17525bb 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue
@@ -313,6 +313,7 @@ const choosePurchanseList  = ()=>{
     null,
     {
       supplierCode:formRef.value.formRef.formModel.supplierCode,
+      searchType:'spareReturn'
     },
     undefined,
     true,

From ff6c4372decb5d9201971b29847fc2261978a238 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 23 Dec 2024 19:16:59 +0800
Subject: [PATCH 219/225] =?UTF-8?q?-=E6=9B=B4=E6=96=B0=E8=A6=81=E8=B4=A7?=
 =?UTF-8?q?=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   | 8 ++++----
 .../supplierdeliver/demandforecastingMain/index.vue       | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index d6bca2d43..bb061cc19 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -531,7 +531,7 @@ export const UpdateMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '供应商代码',
+    label: '按供应商更新',
     field: 'supplierCode',
     sort: 'custom',
     table: {
@@ -544,7 +544,7 @@ export const UpdateMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch:false,
         isSearchList: false, // 开启查询弹窗
-        searchListPlaceholder: '填写供应商代码（填写多个供应商）', // 输入框占位文本
+        searchListPlaceholder: t(`ts.${'填写供应商代码（填写多个供应商）'}`), // 输入框占位文本
         searchField: 'supplierCode', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
         searchAllSchemas: Supplier1.allSchemas, // 查询弹窗所需类
@@ -567,7 +567,7 @@ export const UpdateMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料代码',
+    label: '按物料更新',
     field: 'itemCode',
     sort: 'custom',
     isForm: true,
@@ -579,7 +579,7 @@ export const UpdateMain = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch:false,
         isSearchList: false, // 开启查询弹窗
-        searchListPlaceholder: '填写物料号（填写多个物料号）', // 输入框占位文本
+        searchListPlaceholder: t(`ts.${'填写物料号（填写多个物料号）'}`), // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 272861361..9fb23d0ef 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -282,6 +282,8 @@ const updateDemandforecaste = async (formType,data)=>{
   try {
     let res = await DemandforecastingMainApi.updateDemandforecaste(submitData)
     console.log('更新结果',res)
+    message.success(t('更新成功'))
+    updateFormRef.value.dialogVisible = false
   } finally{
     updateFormRef.value.formLoading = false
   }

From 5b0a60e1e5e1a825551a8790c96875f120b29a75 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 24 Dec 2024 10:08:31 +0800
Subject: [PATCH 220/225] =?UTF-8?q?FWHL-160=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7-=E7=94=9F=E6=88=90=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=B8=AD=E4=B8=8D=E5=90=8C=E7=89=A9=E6=96=99=E7=9A=84?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=E6=94=BE=E5=A4=A7=E9=95=9C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 402447f35..465ed6ff1 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -2167,7 +2167,7 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
           key: 'itemCode',
           value: 'itemCode',
           message: '请选择订单行',
-          isMainValue: true
+          isTableRowValue: true, 
         },
         {
           key: 'available',

From 1c26f13664143a6839bb7c3f388451903604231e Mon Sep 17 00:00:00 2001
From: chenfang <1057876684@qq.com>
Date: Tue, 24 Dec 2024 14:49:37 +0800
Subject: [PATCH 221/225] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6?=
 =?UTF-8?q?=E9=80=80=E5=BA=93=E7=94=B3=E8=AF=B7=E7=9A=84=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=85=81=E8=AE=B8=E5=B1=95=E7=A4=BA=E4=BD=8E?=
 =?UTF-8?q?=E5=80=BC=E6=98=93=E8=80=97=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartReturnRequestMain.data.ts               | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
index 956c6b76d..5a7b82d3d 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -746,12 +746,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         action: '!=',
         isSearch: true,
         isMainValue: false
-      },{
-        key: 'type',
-        value: 'DZYH',
-        action: '!=',
-        isSearch: true,
-        isMainValue: false
       },{
         key: 'type',
         value: 'CCP',
@@ -833,12 +827,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
           action: '!=',
           isSearch: true,
           isMainValue: false
-        },{
-          key: 'type',
-          value: 'DZYH',
-          action: '!=',
-          isSearch: true,
-          isMainValue: false
         },{
           key: 'type',
           value: 'CCP',

From 2ab3a09103fedd360ff39979a4ee522ac5040be1 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 24 Dec 2024 15:29:37 +0800
Subject: [PATCH 222/225] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B-?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E5=88=B0=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingMain/index.ts    |   8 +
 .../demandforecastingMain.data.ts             | 158 +++++++++++++++---
 .../demandforecastingMain/index.vue           |  18 +-
 3 files changed, 153 insertions(+), 31 deletions(-)

diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index a8e96a0c5..819fdc475 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -149,6 +149,14 @@ export const queryUserPlanerList = async () => {
 export const querySupplierList = async (data) => {
   return await request.post({ url: `/wms/demandforecasting-main/querySupplierList`,data })
 }
+// 供应商代码
+export const queryQadSupplierList = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/queryQadSupplierList`,data })
+}
+// 物料代码
+export const queryQadItemCodeList = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/queryQadItemCodeList`,data })
+}
 
 
 // 是否已读接口
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index bb061cc19..45de11ae8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -4,7 +4,6 @@ import * as SupplierApi from '@/api/wms/supplier'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplier} from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 
-import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
@@ -33,34 +32,25 @@ try {
 /**
  * @returns {Array} 要货预测主表
  */
-Supplieritem.allSchemas.searchSchema = Supplieritem.allSchemas.searchSchema.filter(item=>item.field!="allowOverShipment")
 
-export const Supplier1 = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '用户名称',
-    field: 'userName',
-    sort: 'custom',
-    isSearch:true,
-    
-  },
-  {
-    label: '用户昵称',
-    field: 'nickName',
-    sort: 'custom',
-    
-  },
+export const Supplier2= useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '供应商代码',
     field: 'supplierCode',
     isSearch:true,
     sort: 'custom',
-    
   },
   {
     label: '供应商名称',
     field: 'supplierName',
     sort: 'custom',
    
+  },
+  {
+    label: '供应商简称',
+    field: 'shortName',
+    sort: 'custom',
+   
   },
   {
     label: '创建时间',
@@ -70,8 +60,128 @@ export const Supplier1 = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
-    
+  },
+  {
+    label: '更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
   }
+  
+]))
+
+export const Supplieritem1 = useCrudSchemas(reactive<CrudSchema[]>([
+  
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch:true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'name',
+    isForm:true,
+    form:{
+      componentProps:{
+        disabled: true
+      }
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'desc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'desc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  
 ]))
 export const Version = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -146,7 +256,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'supplierCode', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier1.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: Supplier2.allSchemas, // 查询弹窗所需类
         searchPage: DemandforecastingMainApi.querySupplierList, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'planers',
@@ -197,7 +307,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: Supplieritem1.allSchemas, // 查询弹窗所需类
         searchPage: SupplieritemApi.getSupplieritemPageSCP, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'supplierCodes',
@@ -547,8 +657,8 @@ export const UpdateMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: t(`ts.${'填写供应商代码（填写多个供应商）'}`), // 输入框占位文本
         searchField: 'supplierCode', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier1.allSchemas, // 查询弹窗所需类
-        searchPage: DemandforecastingMainApi.querySupplierList, // 查询弹窗所需分页方法
+        searchAllSchemas: Supplier2.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingMainApi.queryQadSupplierList, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -582,8 +692,8 @@ export const UpdateMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: t(`ts.${'填写物料号（填写多个物料号）'}`), // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
-        searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
-        searchPage: SupplieritemApi.getSupplieritemPageSCP, // 查询弹窗所需分页方法
+        searchAllSchemas: Supplieritem1.allSchemas, // 查询弹窗所需类
+        searchPage: DemandforecastingMainApi.queryQadItemCodeList, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 9fb23d0ef..7ca7cd927 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -49,7 +49,11 @@
     @searchTableSuccess="searchTableSuccessUpdate"
     @onChange="onChange"
     :isBusiness="false"
-  />
+    :showSearchTableQueryFields="['supplierCode','itemCode']" 
+    :hiddenFilterBtnFields="['supplierCode','itemCode']"
+    >
+
+  </BasicForm>
 
 </template>
 
@@ -231,12 +235,12 @@ const searchFormClick = (searchData) => {
 const updateFormRef = ref()
 const updateHandle = ()=>{
   UpdateMain.allSchemas.formSchema.forEach((item) => {
-      if(item.field == 'supplierCode'||item.field == 'itemCode'){
-        item.componentProps.enterSearch = false
-        item.componentProps.isSearchList = false
-        item.componentProps.disabled = true
-      }
-    })
+    if(item.field == 'supplierCode'||item.field == 'itemCode'){
+      item.componentProps.enterSearch = false
+      item.componentProps.isSearchList = false
+      item.componentProps.disabled = true
+    }
+  })
   updateFormRef.value.open('create',null,null,t(`ts.更新要货预测`),t(`ts.更新要货预测`))
 }
 const onChange = (field, cur, formRef) => {

From b03e5ce43eefa8513fd6b55d344b25071451b472 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 25 Dec 2024 09:30:56 +0800
Subject: [PATCH 223/225] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A6=81=E8=B4=A7?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8B=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90wms:deman?=
 =?UTF-8?q?dforecasting-main:update-demand-forecast?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/demandforecastingMain/index.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 7ca7cd927..469fe095a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -3,7 +3,7 @@
     <!-- 搜索工作栏 -->
     <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess" @onChange="onSearchChange">
       <template #actionMore>
-        <el-button  type="primary" class="updateBtn" @click="updateHandle">
+        <el-button v-hasPermi="['wms:demandforecasting-main:update-demand-forecast']" type="primary" class="updateBtn" @click="updateHandle">
           <Icon class="mr-5px" icon="ep:" />
           {{t(`ts.更新要货预测`)}}
           <Icon class="ml-5px" icon="ep:" />

From 2d1213191349c69c3f5f5eb8f51c1cddc2a25a1a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 25 Dec 2024 10:29:40 +0800
Subject: [PATCH 224/225] =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/demandforecastingMain/index.vue              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 469fe095a..64741a0d4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -285,6 +285,7 @@ const updateDemandforecaste = async (formType,data)=>{
   updateFormRef.value.formLoading = true
   try {
     let res = await DemandforecastingMainApi.updateDemandforecaste(submitData)
+    buttonBaseClick('refresh')
     console.log('更新结果',res)
     message.success(t('更新成功'))
     updateFormRef.value.dialogVisible = false

From 0de728bd20c542a7c27efa6ff43924379708e6c3 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 30 Dec 2024 08:54:12 +0800
Subject: [PATCH 225/225] =?UTF-8?q?FWHL-170WMS=20=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=B7=A5=E4=BD=8D=E4=BB=A3=E7=A0=81=E6=98=AF?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueManage/issue/issueRequestMain/issueRequestMain.data.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 1442d37b7..d909c0ca8 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -646,6 +646,7 @@ export const IssueRequestMain = useCrudSchemas(
 
 export const IssueRequestMainRules = reactive({
   workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'change' }],
+  workStationCode: [{ required: true, message: '请选择工位代码', trigger: 'change' }],
   productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
   // fromWarehouseCode: [
   //   { required: true, message: '请选择从仓库代码', trigger: 'change' }