Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/saleShipmentDetail/index.ts

@@ -23,7 +23,7 @@ export interface SaleShipmentDetailVO {
   siteId: number
 }
 
-// 查询销售发运申请子列表
+// 查询结算出库申请子列表
 export const getSaleShipmentDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -34,27 +34,27 @@ export const getSaleShipmentDetailPage = async (params) => {
   }
 }
 
-// 查询销售发运申请子详情
+// 查询结算出库申请子详情
 export const getSaleShipmentDetail = async (id: number) => {
   return await request.get({ url: `/wms/sale-shipment-detail-request/get?id=` + id })
 }
 
-// 新增销售发运申请子
+// 新增结算出库申请子
 export const createSaleShipmentDetail = async (data: SaleShipmentDetailVO) => {
   return await request.post({ url: `/wms/sale-shipment-detail-request/create`, data })
 }
 
-// 修改销售发运申请子
+// 修改结算出库申请子
 export const updateSaleShipmentDetail = async (data: SaleShipmentDetailVO) => {
   return await request.put({ url: `/wms/sale-shipment-detail-request/update`, data })
 }
 
-// 删除销售发运申请子
+// 删除结算出库申请子
 export const deleteSaleShipmentDetail = async (id: number) => {
   return await request.delete({ url: `/wms/sale-shipment-detail-request/delete?id=` + id })
 }
 
-// 导出销售发运申请子 Excel
+// 导出结算出库申请子 Excel
 export const exportSaleShipmentDetail = async (params) => {
   return await request.download({ url: `/wms/sale-shipment-detail-request/export-excel`, params })
 }

src/api/wms/saleShipmentDetailRecord/index.ts

@@ -23,7 +23,7 @@ export interface SaleShipmentDetailRecordVO {
   siteId: number
 }
 
-// 查询销售发运记录子列表
+// 查询结算出库记录子列表
 export const getSaleShipmentDetailRecordPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -34,27 +34,27 @@ export const getSaleShipmentDetailRecordPage = async (params) => {
   }
 }
 
-// 查询销售发运记录子详情
+// 查询结算出库记录子详情
 export const getSaleShipmentDetailRecord = async (id: number) => {
   return await request.get({ url: `/wms/sale-shipment-detail-record/get?id=` + id })
 }
 
-// 新增销售发运记录子
+// 新增结算出库记录子
 export const createSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => {
   return await request.post({ url: `/wms/sale-shipment-detail-record/create`, data })
 }
 
-// 修改销售发运记录子
+// 修改结算出库记录子
 export const updateSaleShipmentDetailRecord = async (data: SaleShipmentDetailRecordVO) => {
   return await request.put({ url: `/wms/sale-shipment-detail-record/update`, data })
 }
 
-// 删除销售发运记录子
+// 删除结算出库记录子
 export const deleteSaleShipmentDetailRecord = async (id: number) => {
   return await request.delete({ url: `/wms/sale-shipment-detail-record/delete?id=` + id })
 }
 
-// 导出销售发运记录子 Excel
+// 导出结算出库记录子 Excel
 export const exportSaleShipmentDetailRecord = async (params) => {
   return await request.download({ url: `/wms/sale-shipment-detail-record/export-excel`, params })
 }

src/api/wms/saleShipmentMain/index.ts

@@ -22,7 +22,7 @@ export interface SaleShipmentMainVO {
   serialNumber: string
 }
 
-// 查询销售发运申请主列表
+// 查询结算出库申请主列表
 export const getSaleShipmentMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -33,27 +33,27 @@ export const getSaleShipmentMainPage = async (params) => {
   }
 }
 
-// 查询销售发运申请主详情
+// 查询结算出库申请主详情
 export const getSaleShipmentMain = async (id: number) => {
   return await request.get({ url: `/wms/sale-shipment-main-request/get?id=` + id })
 }
 
-// 新增销售发运申请主
+// 新增结算出库申请主
 export const createSaleShipmentMain = async (data: SaleShipmentMainVO) => {
   return await request.post({ url: `/wms/sale-shipment-main-request/create`, data })
 }
 
-// 修改销售发运申请主
+// 修改结算出库申请主
 export const updateSaleShipmentMain = async (data: SaleShipmentMainVO) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/update`, data })
 }
 
-// 删除销售发运申请主
+// 删除结算出库申请主
 export const deleteSaleShipmentMain = async (id: number) => {
   return await request.delete({ url: `/wms/sale-shipment-main-request/delete?id=` + id })
 }
 
-// 导出销售发运申请主 Excel
+// 导出结算出库申请主 Excel
 export const exportSaleShipmentMain = async (params) => {
   return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params })
 }
@@ -63,32 +63,32 @@ export const importTemplate = () => {
   return request.download({ url: '/wms/sale-shipment-main-request/get-import-template' })
 }
 
-// 关闭-销售发运申请
+// 关闭-结算出库申请
 export const close = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/close?id=` + id })
 }
 
-// 重新添加-销售发运申请
+// 重新添加-结算出库申请
 export const reAdd = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/reAdd?id=` + id })
 }
 
-// 提交审批-销售发运申请
+// 提交审批-结算出库申请
 export const submit = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/submit?id=` + id })
 }
 
-// 审批驳回-销售发运申请
+// 审批驳回-结算出库申请
 export const refused = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/refused?id=` + id })
 }
 
-// 审批通过-销售发运申请
+// 审批通过-结算出库申请
 export const agree = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/agree?id=` + id })
 }
 
-// 处理-销售发运申请
+// 处理-结算出库申请
 export const handle = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id })
 }

src/api/wms/saleShipmentMainRecord/index.ts

@@ -14,7 +14,7 @@ export interface SaleShipmentMainRecordVO {
   siteId: string
 }
 
-// 查询销售发运记录主列表
+// 查询结算出库记录主列表
 export const getSaleShipmentMainRecordPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -25,27 +25,27 @@ export const getSaleShipmentMainRecordPage = async (params) => {
   }
 }
 
-// 查询销售发运记录主详情
+// 查询结算出库记录主详情
 export const getSaleShipmentMainRecord = async (id: number) => {
   return await request.get({ url: `/wms/sale-shipment-main-record/get?id=` + id })
 }
 
-// 新增销售发运记录主
+// 新增结算出库记录主
 export const createSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => {
   return await request.post({ url: `/wms/sale-shipment-main-record/create`, data })
 }
 
-// 修改销售发运记录主
+// 修改结算出库记录主
 export const updateSaleShipmentMainRecord = async (data: SaleShipmentMainRecordVO) => {
   return await request.put({ url: `/wms/sale-shipment-main-record/update`, data })
 }
 
-// 删除销售发运记录主
+// 删除结算出库记录主
 export const deleteSaleShipmentMainRecord = async (id: number) => {
   return await request.delete({ url: `/wms/sale-shipment-main-record/delete?id=` + id })
 }
 
-// 导出销售发运记录主 Excel
+// 导出结算出库记录主 Excel
 export const exportSaleShipmentMainRecord = async (params) => {
   return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params })
 }

src/views/qms/inspectionScheme/index.vue

@@ -50,7 +50,15 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/qms/inspection-scheme/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/qms/inspection-scheme/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">

src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@@ -498,6 +498,26 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
+  {
+    label: '已结算数量',
+    field: 'settleQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
   {
     label: '单价',
     field: 'singlePrice',
@@ -869,5 +889,25 @@ export const SaleDetailAndMain = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm: {
       type: 'Select'
     }
-  }
+  },
+  {
+    label: '已结算数量',
+    field: 'settleQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
 ]))

src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue

@@ -196,7 +196,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
-    download.excel(data, '销售发运记录.xlsx')
+    download.excel(data, '结算出库记录.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -408,7 +408,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SaleShipmentMainApi.exportSaleShipmentMain(tableObject.params)
-    download.excel(data, '销售发运申请主.xlsx')
+    download.excel(data, '结算出库申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -423,7 +423,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '销售发运申请主导入模版.xlsx'
+  templateTitle: '结算出库申请主导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {