From de81a2f725f0aa31c76cbdf67d9e3018131bcbf3 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Wed, 4 Jun 2025 19:57:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=88=87=E5=93=81=E7=95=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/cutItem/index.ts                  |   4 +
 src/utils/disposition/defaultButtons.ts       |  14 ++
 .../basicDataManage/cutItem/cutItem.data.ts   |  17 +--
 .../wms/basicDataManage/cutItem/index.vue     | 120 +++++++++++++-----
 4 files changed, 113 insertions(+), 42 deletions(-)

diff --git a/src/api/wms/cutItem/index.ts b/src/api/wms/cutItem/index.ts
index b8503f5ac..9c7a0bc2d 100644
--- a/src/api/wms/cutItem/index.ts
+++ b/src/api/wms/cutItem/index.ts
@@ -41,6 +41,10 @@ export const updateCutItem = async (data: CutItemVO) => {
 export const deleteCutItem = async (id: number) => {
   return await request.delete({ url: `/wms/cut-item/delete?id=` + id })
 }
+// 重新计算打切品番配置
+export const recalculate = async (id: number) => {
+  return await request.get({ url: `/wms/cut-item/recalculate?id=` + id })
+}
 
 // 导出打切品番配置 Excel
 export const exportCutItem = async (params) => {
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 87b7430f1..c7b045405 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -377,6 +377,20 @@ export function mainListDeleteBtn(option: any) {
     hasPermi: ''
   })
 }
+
+// 主列表-重新计算按钮
+export function mainListRecalculateBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.重新计算`).replace('ts.', ''),
+    name: 'recalculate',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
 export function mainListEnableBtn(option: any) {
   return __defaultBtnOption(option, {
     label: t(`ts.启用`).replace('ts.', ''),
diff --git a/src/views/wms/basicDataManage/cutItem/cutItem.data.ts b/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
index 55212a946..85fd0a4fc 100644
--- a/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
+++ b/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
@@ -101,6 +101,7 @@ export const CutItem = useCrudSchemas(
       isForm: false,
       isSearch: false
     },
+
     {
       label: '开始日期',
       field: 'beginDate',
@@ -169,19 +170,19 @@ export const CutItem = useCrudSchemas(
         }
       }
     },
-    {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
-      isForm: false,
-      isSearch: false
-    },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   isForm: false,
+    //   isSearch: false
+    // },
     {
       label: '操作',
       field: 'action',
       isForm: false,
       table: {
-        width: 150,
+        width: 180,
         fixed: 'right'
       }
     }
diff --git a/src/views/wms/basicDataManage/cutItem/index.vue b/src/views/wms/basicDataManage/cutItem/index.vue
index f7a1b98cf..187595953 100644
--- a/src/views/wms/basicDataManage/cutItem/index.vue
+++ b/src/views/wms/basicDataManage/cutItem/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CutItem.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="CutItem.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="CutItem.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="CutItem.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,13 +31,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <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)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -54,12 +58,17 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="CutItem.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/basic/cut-item/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/basic/cut-item/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { CutItem,CutItemRules } from './cutItem.data'
+import { CutItem, CutItemRules } from './cutItem.data'
 import * as CutItemApi from '@/api/wms/cutItem'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -104,7 +113,7 @@ const HeadButttondata = [
   defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -117,58 +126,90 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
+  defaultButtons.mainListRecalculateBtn(null), // 重新计算
   defaultButtons.mainListEditBtn(null), // 编辑
-  defaultButtons.mainListDeleteBtn(null), // 删除
+  defaultButtons.mainListDeleteBtn(null) // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
+  } else if (val == 'recalculate') {
+    // 重新计算
+    recalculate(row.id)
   }
 }
 
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if (type == 'update') {
+    CutItem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+        item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
+      }
+    })
+  } else if (type == 'create') {
+    CutItem.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'itemCode') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
+    })
+  }
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =CutItem.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+const formsSuccess = async (formType, data) => {
+  var isHave = CutItem.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;
+      return
     }
   }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
+  if (data.activeTime == 0) data.activeTime = null
+  if (data.expireTime == 0) data.expireTime = null
   if (formType === 'create') {
     await CutItemApi.createCutItem(data)
     message.success(t('common.createSuccess'))
   } else {
+    if(data.cutoverQty<data.planQty){
+      message.error('打切数量不可小于已要货数量!')
+      return
+    }
+
     await CutItemApi.updateCutItem(data)
     message.success(t('common.updateSuccess'))
   }
@@ -194,6 +235,18 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
+/** 重新计算按钮操作 */
+const recalculate = async (id: number) => {
+  try {
+    // 重新计算的二次确认
+    await message.confirm('确认要重新计算吗？')
+    // 发起重新计算
+    await CutItemApi.recalculate(id)
+    message.success(t('重新计算成功'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
@@ -240,5 +293,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await CutItemApi.importTemplate()
 })
-
 </script>

From 7c38cc630e35cc0a14a4b76625cbb94be60c7b86 Mon Sep 17 00:00:00 2001
From: wangxianlei <542787045@qq.com>
Date: Thu, 5 Jun 2025 15:07:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7--=E6=89=93=E5=8D=B0=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=B8=AD=E7=9A=84=E3=80=90=E6=89=93=E5=8D=B0=E6=89=80?=
 =?UTF-8?q?=E9=80=89=E3=80=91=EF=BC=8C=E4=B9=9F=E6=94=B9=E4=B8=BA=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAPDF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index de729046c..12bae4df1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -178,7 +178,8 @@
   </BasicForm>
 
   <!-- 标签打印 -->
-  <SearchTable width="905px" ref="searchTableRef" sureText="打印所选" @searchTableSuccess="searchTableSuccess1">
+<!--  <SearchTable width="905px" ref="searchTableRef" sureText="打印所选" @searchTableSuccess="searchTableSuccess1">-->
+  <SearchTable width="905px" ref="searchTableRef" sureText="打印所选" @searchTableSuccess="handlePrintSelectExport">
     <template #actionsOther>
 <!--      <el-button type="primary" @click="printAllClick">打印全部</el-button>-->
       <el-button type="primary" :loading="printAllLoading" @click="handlePrintAllExport">打印全部</el-button>
@@ -1341,6 +1342,37 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   })
 }
 
+const handlePrintSelectExport = async (formField, searchField, val, formRef, type, row) => {
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if (val.length == 0) {
+    message.warning(t('ts.请先选择要打印的数据'))
+    return
+  }
+  let array1 = []
+  val.forEach((item,index) => {
+    array1.push(item)
+  })
+  await PackageApi.batchPrintingLablesForYT(array1)
+    .then(res => {
+      let asnNumber;
+      if(res.xdpLabel){
+        //协定品标签
+        asnNumber = res.xdpLabel;
+      }
+      if (res.cgLabel) {
+        //采购标签
+        asnNumber = res.cgLabel;
+      }
+      debugger;
+      doHandlePrintAllExport(asnNumber);
+    }).catch(err => {
+      message.error(t('ts.创建标签失败'))
+    })
+}
+
 const print = async () => {
   window.open(src.value + '&number=' + detatableData.tableList[0].number)
 }