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

src/api/wms/supplierdeliverRecordMain/index.ts

@@ -81,6 +81,11 @@ export const importTemplate = () => {
   return request.download({ url: '/wms/supplierdeliver-record-main/get-import-template' })
 }
 
+// 打印发货单前查询物料的状态，从而确定使用哪个积木模版
+export const getItemStatus = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-main/getItemStatus?id=` + id })
+}
+
 // 创建采购申请
 export const createPurchasereceiptRequest = async (number:string) => {
   return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -126,6 +126,11 @@ export const deleteOldLabels = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/deleteOldLabels?id=` + id })
 }
 
+// 打印发货单前查询物料的状态，从而确定使用哪个积木模版
+export const getItemStatus = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/getItemStatus?id=` + id })
+}
+
 // 查看履历表
 export const querySupplierResume =  (asnNumber:string) => {
   return  request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber })

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -266,13 +266,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         }).then((res) => {
           fromManagementPrecision.value = res[0].ManagementPrecision
         })
-        // if (fromManagementPrecision.value == 'BY_QUANTITY') {
+        if (fromManagementPrecision.value == 'BY_QUANTITY') {
-        //   newRow['batchFormItemType'] = 'FormDate'
+          newRow['batchFormItemType'] = 'FormDate'
-        //   newRow['disabled_batch'] = false
+          newRow['disabled_batch'] = false
-        // } else {
+          newRow['batch'] = formatDate(new Date(),'YYYYMMDD')
-        //   newRow['batchFormItemType'] = ''
+        } else {
-        //   newRow['disabled_batch'] = true
+          newRow['batchFormItemType'] = ''
-        // }
+          newRow['disabled_batch'] = true
+        }
 
           if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])){
             messageItemCodes.push(item['itemCode'])
@@ -548,6 +549,14 @@ const buttonTableClick = async (val, row) => {
       masterId:row.masterId
     }
     await getDetailList()
+
+    console.log(22,detatableData)
+    detatableData.tableList.forEach(item => {
+      if (!item.batch) {
+        item.batch=formatDate(new Date(),'YYYYMMDD')
+      }
+    })
+
     // 打开创建标签页面
     // dialogVisible.value = true
     detatableData.tableList.map((item) => {
@@ -894,7 +903,7 @@ const handlePoint = async (row) => {
 const searchTableRef = ref()
 const labelPrint = async (row) => {
   tableObject.loading = true
-  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number}
+  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number,batch:row.batch}
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,
     getListApi: PackageApi.getLabelDetailPage  // 分页接口

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@@ -1,7 +1,14 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...SupplierdeliverRecordMain.allSchemas.searchSchema,...SupplierdeliverRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="[
+        ...SupplierdeliverRecordMain.allSchemas.searchSchema,
+        ...SupplierdeliverRecordDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -17,7 +24,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -28,13 +36,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
+      <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -53,35 +64,41 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
-    :annexTable="[{
+    :annexTable="[
+      {
         label: '质检明细',
         prop: 'uploadFile',
-      hasPermi:'wms:supplierdeliver-request-main:uploadCheck',
+        hasPermi: 'wms:supplierdeliver-request-main:uploadCheck',
-      tableName:'SupplierdeliverInspectionDetail',
+        tableName: 'SupplierdeliverInspectionDetail',
-      hasSubDetail:true, // 附件中是否展示明细表
+        hasSubDetail: true, // 附件中是否展示明细表
-      showPreview:true, // 附件中是否展示预览按钮
+        showPreview: true, // 附件中是否展示预览按钮
-      showDownload:true,
+        showDownload: true,
-      hiddenDelete:true,
+        hiddenDelete: true,
-      hiddenUpload:true,
+        hiddenUpload: true,
-      align:'left',
+        align: 'left',
-      queryParams:[{
+        queryParams: [
-        queryField:'tableId',
+          {
-        rowField:'annexMasterId',
+            queryField: 'tableId',
-      }],
+            rowField: 'annexMasterId'
+          }
+        ],
         //明细表数据
-      subDetailTableData:{
+        subDetailTableData: {
-        queryParams:[{
+          queryParams: [
-          queryField:'masterId',
+            {
-          rowField:'annexMasterId',
+              queryField: 'masterId',
-        }], // 查询参数
+              rowField: 'annexMasterId'
-        getSubList:SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage,//请求接口
+            }
-        tableColumns:SupplierdeliverInspectionDetail.allSchemas.tableColumns,
+          ], // 查询参数
-        tableList:[],//表格数据
+          getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
-        total:1,
+          tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
-        pageSize:10,
+          tableList: [], //表格数据
-        currentPage:1,
+          total: 1,
+          pageSize: 10,
+          currentPage: 1
+        }
       }
-    }]"
+    ]"
     :isBasic="false"
     :allSchemas="SupplierdeliverRecordMain.allSchemas"
     :detailAllSchemas="SupplierdeliverRecordDetail.allSchemas"
@@ -103,15 +120,22 @@
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
   />
-
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as SupplierdeliverInspectionDetailApi from '@/api/wms/supplierdeliverInspectionDetail'
-import {    SupplierdeliverInspectionDetail,SupplierdeliverInspectionDetailRules} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
+import {
-import { SupplierdeliverRecordMain,SupplierdeliverRecordMainRules,
+  SupplierdeliverInspectionDetail,
-  SupplierdeliverRecordDetail,SupplierdeliverRecordDetailRules,SupplierdeliverRecordDetailPickingNumer } from './supplierdeliverRecordMain.data'
+  SupplierdeliverInspectionDetailRules
+} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
+import {
+  SupplierdeliverRecordMain,
+  SupplierdeliverRecordMainRules,
+  SupplierdeliverRecordDetail,
+  SupplierdeliverRecordDetailRules,
+  SupplierdeliverRecordDetailPickingNumer
+} from './supplierdeliverRecordMain.data'
 import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
 import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
@@ -121,6 +145,8 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+import { SupplierdeliverRequestMainRules } from '../supplierdeliverRequestMain/supplierdeliverRequestMain.data'
 const { loadStart, loadDone } = usePageLoading()
 // 供应商发货记录主
 defineOptions({ name: 'SupplierdeliverRecordMain' })
@@ -131,7 +157,10 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...SupplierdeliverRecordMain.allSchemas.tableColumns,...SupplierdeliverRecordDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([
+  ...SupplierdeliverRecordMain.allSchemas.tableColumns,
+  ...SupplierdeliverRecordDetail.allSchemas.tableMainColumns
+])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -147,10 +176,10 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:supplierdeliver-record-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-record-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -163,95 +192,116 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'export') { // 导出
+  if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
     } else {
       getList()
     }
-  } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'filtrate') {
-  } else { // 其他按钮
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
-const butttondata = (row,$index) => {
+const butttondata = (row, $index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  const findIndex = row['masterId']
-  if(findIndex>-1&&findIndex<$index){
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
     return []
   }
   return [
-     defaultButtons.mainListGenerateApplicationBtn({hasPermi:'wms:supplierdeliver-record-main:createPurchasereceiptRequest',hide:!row.purchasereceiptRequestFlag}), // 生成采购申请
+    defaultButtons.mainListGenerateApplicationBtn({
+      hasPermi: 'wms:supplierdeliver-record-main:createPurchasereceiptRequest',
+      hide: !row.purchasereceiptRequestFlag
+    }), // 生成采购申请
     defaultButtons.mainListDocumentPrintBtn({}) // 单据打印
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if(val == 'generateApplication'){
+  if (val == 'generateApplication') {
     handlerCreatePurchasereceiptRequest(row.number)
-  }else if (val == 'documentPrint') {
+  } else if (val == 'documentPrint') {
     // 单据打印
     handleDocumentPrint(row.masterId)
   }
 }
 
 /** 生成采购收货申请按钮操作 */
-const handlerCreatePurchasereceiptRequest = async (number:string) => {
+const handlerCreatePurchasereceiptRequest = async (number: string) => {
-  try{
+  try {
     await message.confirm(t('ts.确认生成采购申请吗？'))
     tableObject.loading = true
     await SupplierdeliverRecordMainApi.createPurchasereceiptRequest(number)
     message.success(t('ts.采购申请生成成功'))
     await getList()
-  }catch{}finally{
+  } catch {
+  } finally {
     tableObject.loading = false
   }
 }
 
 // 单据打印
 const BASE_URL = getJmreportBaseUrl()
-//const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+// 物料状态是“补给品”和其余状态 的发货单模版
 const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
+// 物料状态是号试显示生准订单的发货单模版
+const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
+
 const handleDocumentPrint = async (id) => {
+  await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => {
+    if (res) {
+      //号试（生准订单）模板
+      window.open(documentSrc2.value + '&id=' + id)
+    } else {
       window.open(documentSrc.value + '&id=' + id)
+    }
+  })
 }
 
-
 // 子包装数据
 const detailParenPackingRef = ref()
 const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
   getListApi: SupplierdeliverRecordDetailApi.queryChildPickingNumber
 })
-const { getList:getDetailList } = detatableMethods
+const { getList: getDetailList } = detatableMethods
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = async (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   //获取申请中的masterId
-  const { tableObject: requestTableObject, tableMethods:requestTableMethods } = useTable({
+  const { tableObject: requestTableObject, tableMethods: requestTableMethods } = useTable({
     getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
   })
-  const { getList:requestGetList } = requestTableMethods
+  const { getList: requestGetList } = requestTableMethods
   requestTableObject.params.number = row.requestNumber
   await requestGetList()
-  if(requestTableObject.tableList.length>0){
+  if (requestTableObject.tableList.length > 0) {
     row.annexMasterId = requestTableObject.tableList[0].masterId
-    detailRef.value.openDetail(row, titleName, titleValue,'recordSupplierdeliverMain')
+    detailRef.value.openDetail(row, titleName, titleValue, 'recordSupplierdeliverMain')
   }
-  
 }
 
 // 详情 table 操作扩展 按钮
-const buttondataTable = ref([{
+const buttondataTable = ref([
+  {
     label: t('ts.查看其他包装规格'),
     name: 'viewParentPickingNumber',
     hide: false,
@@ -259,19 +309,20 @@ const buttondataTable = ref([{
     icon: '',
     color: '',
     hasPermi: '',
-    link: true, // 文本展现按钮
+    link: true // 文本展现按钮
-  }])
+  }
-
+])
 
 // 查看其他包装规格
-const tableFormButton = async (val , row) => {
+const tableFormButton = async (val, row) => {
-  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+  if (val == 'viewParentPickingNumber') {
+    //查看其他包装规格
     detatableData.params = {
-          masterId:row.masterId,
+      masterId: row.masterId,
-          parentPackingNumber:row.packingNumber
+      parentPackingNumber: row.packingNumber
     }
     await getDetailList()
-        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+    detailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
   }
 }
 
@@ -283,7 +334,9 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(tableObject.params)
+    const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(
+      tableObject.params
+    )
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
@@ -300,8 +353,6 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
-
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -1238,10 +1238,19 @@ const print = async () => {
 }
 
 // 单据打印
-// const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+// 物料状态是“补给品”和其余状态 的发货单模版
 const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
+// 物料状态是号试显示生准订单的发货单模版
+const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
 const handleDocumentPrint = async (id) => {
+  await SupplierdeliverRequestMainApi.getItemStatus(id).then(async (res) => {
+    if (res) {
+      //号试（生准订单）模板
+      window.open(documentSrc2.value + '&id=' + id)
+    } else {
       window.open(documentSrc.value + '&id=' + id)
+    }
+  })
 }
 
 /**

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -1831,7 +1831,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
     },
     tableForm: {
       type: 'InputNumber',
-      precision: 0,
+      precision: 6,
       min:0
     }
   },

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -2302,7 +2302,7 @@ export const ClaimDetails = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '索赔金额',
-    field: 'claimQty',
+    field: 'claimAmount',
     table: {
       width: 150
     },