From 993ee72469b4c69a75c08346fc5c4defb491e55a Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Fri, 11 Jul 2025 10:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BC=95=E7=BB=B4=E6=8A=A4=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/maintenanceBillDate/index.ts      |  27 +++
 src/components/TableForm/src/TableForm.vue    |   2 +-
 .../deliverRecordMain.data.ts                 | 213 ++++++++++++------
 .../deliverRecordMain/index.vue               | 129 +++++++++--
 4 files changed, 292 insertions(+), 79 deletions(-)
 create mode 100644 src/api/wms/maintenanceBillDate/index.ts

diff --git a/src/api/wms/maintenanceBillDate/index.ts b/src/api/wms/maintenanceBillDate/index.ts
new file mode 100644
index 000000000..47ebf1cd8
--- /dev/null
+++ b/src/api/wms/maintenanceBillDate/index.ts
@@ -0,0 +1,27 @@
+import request from '@/config/axios'
+
+export interface MaintenanceBillDateMainVO {
+  customerOrderNumber: string,
+  customerCode: string,
+  productionLineCode: string,
+  startDueTime: Date,
+  endDueTime: Date,
+  reconciliationDate: Date,
+  startSerialNo: number,
+  endSerialNo: number,
+  incorporationNumber: string,
+  backNumber: string,
+  notIncludedList: object
+}
+
+// 计算发货数量
+export const comPuteReconciliationDate = async (data: MaintenanceBillDateMainVO) => {
+  return await request.post({ url: `/wms/leadership-incorporation-doc-request/comPuteReconciliationDate`, data })
+}
+
+
+
+
+
+
+
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 2a177821e..a46e47def 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -42,7 +42,7 @@
           icon="ep:remove"
           color="#757575"
           :size="26"
-          style="cursor: pointer; margin-top: -16px"
+          style="cursor: pointer;"
           @click.stop="handleDeleteTable(row, $index)"
         />
       </el-table-column>
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
index cbd437761..f6e66403b 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
@@ -6,7 +6,8 @@ import * as CustomerItemApi from '@/api/wms/customeritem'
 import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
 import * as ProductionlineApi from '@/api/wms/productionline'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
-
+import * as  ItemBasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../../../basicDataManage/itemManage/itembasic/itembasic.data'
 /**
  * @returns {Array} 发货记录主表
  */
@@ -1374,88 +1375,134 @@ export const MaintenanceBillDateMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
-  },
-   {
-      label: '生产线',
-      field: 'productionLine',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true,
-          searchListPlaceholder: '请选择生产线',
-          searchField: 'code',
-          searchTitle: '生产线信息',
-          searchAllSchemas: Productionline.allSchemas,
-          searchPage: ProductionlineApi.getProductionlinePage,
-          searchCondition:[{
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          },{
-            key: 'workshopCode',
-            value: 'workshop',
-            message: '请填写车间代码！',
-            isMainValue: true
-          }],
-          verificationParams: [{
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
-        }
+    table: {
+      width: 150
+    },
+    tableForm:{
+      multiple:true,
+      isInpuFocusShow: false, // 开启查询弹窗
+      searchListPlaceholder: '请选择品番',
+      searchField: 'backNumber',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Itembasic.allSchemas,
+      searchPage: ItemBasicApi.selectItembasicPageToFgAndSemibasicPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }],
+      verificationPage: ItemBasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择品番',
+        searchField: 'backNumber',
+        searchTitle: '物料基础信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItemBasicApi.getItembasicPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
+    }
+  },
+  {
+    label: '生产线',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionlineApi.getProductionlinePage,
+        searchCondition:[{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
   {
     label: '顺引开始日期',
-    field: 'startDate',
+    field: 'startDueTime',
     sort: 'custom',
     form: {
       component: 'DatePicker',
       componentProps: {
         style: { width: '100%' },
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     },
   },
   {
-    label: '开始序号',
-    field: 'startNo',
+    label: '顺引结束日期',
+    field: 'endDueTime',
     sort: 'custom',
     form: {
-      component: 'InputNumber',
+      component: 'DatePicker',
       componentProps: {
-        min: 1,
-        precision: 0
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
   },
   {
-    label: '顺引结束日期',
-    field: 'endDate',
+    label: '开始序号',
+    field: 'startSerialNo',
     sort: 'custom',
     form: {
-      component: 'DatePicker',
+      component: 'InputNumber',
       componentProps: {
-        style: { width: '100%' },
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        min: 1,
+        precision: 0
       }
     },
   },
   {
     label: '结束序号',
-    field: 'endNo',
+    field: 'endSerialNo',
     sort: 'custom',
     form: {
       component: 'InputNumber',
@@ -1463,6 +1510,38 @@ export const MaintenanceBillDateMain = useCrudSchemas(reactive<CrudSchema[]>([
         min: 1,
         precision: 0
       }
+    }, 
+  },
+  {
+    label: '对账日期',
+    field: 'reconciliationDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: true,
+    isTableForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x'
+      }
+    },
+    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')]
+      },
     },
   },
 ]))
@@ -1470,25 +1549,28 @@ export const MaintenanceBillDateMain = useCrudSchemas(reactive<CrudSchema[]>([
 // 维护对账日期主校验
 export const MaintenanceBillDateMainRules = reactive({
   backNumber: [
-    { required: true, message: '请输入订单号', trigger: 'blur' },
+    { required: true, message: '请输入背番', trigger: 'blur' },
   ],
-  productionLine: [
+  productionLineCode: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  startDate: [
+  startDueTime: [
     { required: true, message: '请选择顺引开始日期', trigger: 'change' }
   ],
-  endDate: [
+  endDueTime: [
     { required: true, message: '请选择顺引结束日期', trigger: 'change' },
   ],
-  startNo: [
+  startSerialNo: [
     { required: true, message: '请输入开始序号', trigger: 'change' },
     { type: 'number', message: '开始序号必须为数字', trigger: 'blur' }
   ],
-  endNo: [
+  endSerialNo: [
     { required: true, message: '请输入结束序号', trigger: 'change' },
     { type: 'number', message: '结束序号必须为数字', trigger: 'blur' }
   ],
+  reconciliationDate: [
+    { required: true, message: '请选择顺引结束日期', trigger: 'change' },
+  ],
 })
 /**
  * @returns {Array}  维护对账日期子
@@ -1498,15 +1580,20 @@ export const MaintenanceBillDateDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '不包含顺引日期',
     field: 'billDate',
     sort: 'custom',
+    tableForm: {
+      type: 'FormDate',
+      placeholder: '请选择维护对账日期',
+      valueFormat: 'yyyyMMdd',
+    }
   },
   {
     label: '不包含顺序号',
-    field: 'serialNo',
+    field: 'serialNoShow',
     sort: 'custom',
     table: {
       width: 150
     },
-  }
+  },
 ]))
 
 // 维护对账日期主校验
@@ -1514,7 +1601,7 @@ export const MaintenanceBillDateDetailRules = reactive({
   billDate: [
     { required: true, message: '请输入不包含顺引日期', trigger: 'blur' },
   ],
-  serialNo: [
+  serialNoShow: [
     { required: true, message: '请输入不包含顺序号', trigger: 'blur' }
   ],
 })
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
index a2d1be47a..edae37b60 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
@@ -101,30 +101,38 @@
     ref="maintenanceBillDateRef"
     fieldTableColumn="itemCode"
     @success="getList"
-    :rules="DeliverRecordMainRules"
+    :rules="MaintenanceBillDateMainRules"
     :formAllSchemas="MaintenanceBillDateMain.allSchemas"
-    :tableAllSchemas="DeliverRecordDetail.allSchemas"
-    :tableFormRules="DeliverRecordDetailRules"
+    :tableAllSchemas="MaintenanceBillDateDetail.allSchemas"
+    :tableFormRules="MaintenanceBillDateDetailRules"
     :isBusiness="true"
     :apiUpdate="DeliverRecordMainApi.inducedProductUpdate"
     :apiCreate="DeliverRecordMainApi.inducedProductCreate"
-    fromeWhere="InducedProduct"
-    :tableData="tableData"
-    :handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @tableSelectionDelete="tableSelectionDelete"
-    @searchTableSuccess="searchTableAddSuccess"
-    @submitForm="submitForm"
-    @clearSearchInput="clearSearchInput"
-  />
+    :tableData="tableDataBillDate"
+    :isShowFooterButtton="false"
+    :footButttondata="footButttondata"
+    @handleAddTable="handleAddTableBillDate"
+    @handleDeleteTable="handleDeleteTableBillDate"
+    @tableSelectionDelete="tableSelectionDeleteBillDate"
+    @searchTableSuccess="searchTableAddSuccessBillDate"
+    @clearSearchInput="clearSearchInputBillDate"
+    @footButtonClick="footButtonClick"
+  >
+  <template #foorter>
+    <div style="position: absolute; left: 20px;bottom: 26px;">
+      发货数量合计：888
+    </div>
+  </template>
+  </BasicForm>
 
 </template>
 <script setup lang="ts">
 import download from '@/utils/download'
 import { getAccessToken } from '@/utils/auth'
-import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRecordDetailRules,DeliverRecordImport,DeliverRecordImportRules,ImportLeadershipDocErrorData,ImportLeadershipDocTempData,MaintenanceBillDateMain,MaintenanceBillDateMainRules} from './deliverRecordMain.data'
+import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRecordDetailRules,DeliverRecordImport,DeliverRecordImportRules,ImportLeadershipDocErrorData,ImportLeadershipDocTempData,MaintenanceBillDateMain,MaintenanceBillDateMainRules,MaintenanceBillDateDetail,MaintenanceBillDateDetailRules} from './deliverRecordMain.data'
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
+import * as MaintenanceBillDateApi from '@/api/wms/maintenanceBillDate'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
@@ -207,7 +215,7 @@ const HeadButttondata = [
   defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入
   defaultButtons.defaultImportBtn({
     label: '维护对账日期',
-    name: 'zdy',
+    name: 'billDate',
     hide: false,
     type: 'primary',
     icon: 'ep:notebook',
@@ -246,6 +254,8 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'filtrate') { // 筛选
   } else if (val == 'receiptOfInclusion') { // 导入纳入受领书
     receiptOfInclusion()
+  } else if (val == 'billDate') { //维护对账日期
+    handleMainBillDate('create')
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
@@ -507,7 +517,96 @@ const handleDeleteTable = (item, index) => {
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))
 }
-
+const maintenanceBillDateRef = ref()
+const tableDataBillDate = ref([])
+const tableFormKeysBillDate = {}
+const footButttondata = ref([
+  {
+    label: '计算发货数量',
+    name: 'sendGoodsNum',
+    type: 'primary',
+    hide: false,
+    icon: 'ep:platform',
+    color: '',
+    float: 'right',
+    hasPermi: ''
+  }, // 计算发货数量
+  {
+    label: '更新对账日期',
+    name: 'updateBillDate',
+    type: 'primary',
+    hide: false,
+    icon: 'ep:edit',
+    color: '',
+    float: 'right',
+    hasPermi: ''
+  }, // BOM下一步
+  defaultButtons.formCloseBtn(null) // BOM关闭
+])
+// 维护对账日期弹窗
+const handleMainBillDate = async (type,row) => {
+  maintenanceBillDateRef.value.open(type,row)
+}
+/**
+  * tableForm方法
+*/
+MaintenanceBillDateDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeysBillDate[item.field] = item.default ? item.default : ''
+})
+// 添加维护对账日期明细
+const handleAddTableBillDate = () => { 
+  tableDataBillDate.value.push(JSON.parse(JSON.stringify(tableFormKeysBillDate)))
+}
+const handleDeleteTableBillDate = (item, index) => { 
+  let itemIndex = tableDataBillDate.value.indexOf(item)
+  if(itemIndex>-1){
+    tableDataBillDate.value.splice(itemIndex, 1)
+  }
+}
+const tableSelectionDeleteBillDate = (selection) => { 
+  tableDataBillDate.value = tableDataBillDate.value.filter(item => !selection.includes(item))
+}
+const footButtonClick = async (val) => {
+  if (val == 'sendGoodsNum') {
+    sendGoodsNum()
+  } else if (val == 'close') {
+    formLabelRef.value.dialogVisible = false
+  }
+}
+// 计算发货数量
+const sendGoodsNum = async () => {
+  const elForm = unref(maintenanceBillDateRef.value.formRef)?.getElFormRef()
+  // 校验表单
+  if (!elForm) return
+  const valid = await elForm.validate()
+  if (!valid) return
+  if (tableDataBillDate.value.length > 0) {
+    const validateForm = await maintenanceBillDateRef.value.tableFormRef.validateForm()
+    if (!validateForm) {
+      return
+    }
+  }
+  if (maintenanceBillDateRef.value.formRef.formModel.startDueTime >= maintenanceBillDateRef.value.formRef.formModel.endDueTime) {
+    message.warning('顺引开始日期不能大于顺引结束日期！')
+    return
+  }
+  if (maintenanceBillDateRef.value.formRef.formModel.startSerialNo >= maintenanceBillDateRef.value.formRef.formModel.endSerialNo) {
+    message.warning('开始序号不能大于结束序号！')
+    return
+  }
+  const data = { ...maintenanceBillDateRef.value.formRef.formModel }
+  tableDataBillDate.value.forEach(item => { 
+    item.serialNo = item.serialNoShow.split(',')
+  })
+  data.notIncludedList = tableDataBillDate.value
+  console.log(data)
+  await MaintenanceBillDateApi.comPuteReconciliationDate(data)
+}
+const searchTableAddSuccessBillDate = (formField, searchField, val, formRef, type, row) => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+} 
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params.businessType = 'InducedProduct'