From 48e264ce3bdc9628dec10f2ea43022b1003cd8d9 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 15 Apr 2024 09:27:34 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A---=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          | 59 +++++++++++++++----
 .../supplierdeliverRequestMain/index.vue      | 34 +++++++++--
 .../supplierdeliverRequestMain.data.ts        |  2 +-
 3 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 0f0132a20..9f06a30d3 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -96,16 +96,34 @@
             </template>
           </DetailTable>
         </ContentWrap>
+        <!-- other附件组件:如质检明细 -->
+        <div v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexTableData.some(item=>item.label==tabsList[current].label)"  class="w-[100%]" :style="{height:remarkHeight+'px'}">
+          <ContentWrap class="w-[100%]">
+            <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
+                <Annex v-show="tabsList[current].label==annexItem.label"
+                  :annexData="annexItem"
+                  @handleAnnexSuccess="updateAnnexTableHandle"
+                  @deleteAnnexSuccess="updateAnnexTableHandle"
+                  :upData="{...remarksData.data,tableName:annexItem.tableName}"
+                />
+            </ElScrollbar>
+          </ContentWrap> 
+          {{annexItem.subDetailTableData.tableColumns}}
+           
+          <Table style="border:1px solid red;height:100px"
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="annexItem.subDetailTableData.tableColumns"
+            :data="annexItem.subDetailTableData.tableList"
+            :loading="annexItem.subDetailTableData.loading"
+            :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          />
+        </div>
         <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="annexTableData.some(item=>item.label==tabsList[current].label)||tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
           <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <Annex v-for="(annexItem ,index) in annexTableData" :key="index" v-show="tabsList[current].label==annexItem.label"
-              :annexData="annexItem"
-              @handleAnnexSuccess="updateAnnexTableHandle"
-              @deleteAnnexSuccess="updateAnnexTableHandle"
-              :upData="{...remarksData.data,tableName:annexItem.tableName}"
-            />
             <Annex v-show="tabsList[current].label=='附件'"
                 :annexData="annexData"
                 @handleAnnexSuccess="handleAnnexSuccess"
@@ -392,7 +410,7 @@ const remarkHeight = computed(() => {
 const annexData = reactive({
   annexList: []
 })
-// 其他附件默认数据数组
+// // 其他附件默认数据数组
 const annexTableData = ref<Array<any>>([])
 
 // 备注数据
@@ -416,7 +434,8 @@ const getFileList = async () => {
   }
 }
 // 获取其他附件列表篇
-const getAnnexFileList =  async () => {
+const getAnnexFileList =  async (row:id) => {
+  console.log('getAnnexFileList')
   props.annexTable?.forEach(async (item) => {
     let requstData = {...remarksData.data,tableName: item?.tableName} 
     const annexList = await FileApi.getFileList(requstData)
@@ -427,8 +446,24 @@ const getAnnexFileList =  async () => {
       annexTableData.value.push({
         label: item.label,
         tableName: item?.tableName || '',
-        annexList
+        annexList,
+        hasSubDetail:item.hasSubDetail||false,
+        subDetailTableData:item.subDetailTableData||{}
       })
+      if(item?.subDetailTableData){
+        const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({
+          getListApi: item.subDetailTableData.getSubList // 分页接口
+        })
+        const {getList:getSubList} = subTableMethods
+        subTableObject.params= {}
+        item.subDetailTableData.queryParams.forEach(queryItem => {
+          subTableObject.params[queryItem.queryField] = row[queryItem.rowField]
+        });
+        await getSubList()
+        item.subDetailTableData.tableList = subTableObject.tableList
+        annexItem.subDetailTableData.tableList
+        console.log('subTableObject',annexTableData.value)
+      }
     }
   })
 }
@@ -444,7 +479,7 @@ const deleteAnnexSuccess = async () => {
 }
 /** 追加的附件 */
 const updateAnnexTableHandle  = () => {
-  getAnnexFileList()
+  getAnnexFileList(detailData.value)
   getChangeRecordList()
 }
 
@@ -526,7 +561,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
       detailData.value = row
       getRemarkList()
       getFileList()
-      getAnnexFileList()
+      getAnnexFileList(row)
       getChangeRecordList()
       // 判断详情按钮是否显示
       let detailButtonFilter: any = []
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index a906c8217..fe75c0ccb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -77,7 +77,21 @@
     :annexTable="[{
       label: '质检明细',
       prop: 'uploadFile',
-      tableName:'uploadFile'
+      tableName:'UploadQualityReport',
+      hasSubDetail:true, // 附件中是否展示明细表
+      //明细表数据
+      subDetailTableData:{
+        queryParams:[{
+          queryField:'masterId',
+          rowField:'id'
+        }], // 查询参数
+        getSubList:SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage,//请求接口
+        tableColumns:UploadQualityReport.allSchemas.tableColumns,
+        tableList:[],//表格数据
+        total:1,
+        pageSize:10,
+        currentPage:1,
+      }
     }]"
     :isBasic="false"
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
@@ -125,7 +139,11 @@
     @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail"
     @submitForm="submitFormUploadQualityReport"
     :isShowReduceButton="true"
-  />
+  >
+    <template #UploadQualityReport>
+      <span>1111</span>
+    </template>
+  </BasicForm>
  
 </template>
 
@@ -429,7 +447,7 @@ const buttonTableClick = async (val, row) => {
     handleClo(row.id)
   } else if (val == 'mainPlanUploadQualityReport') {
     // 上传质量报告
-    handleUploadQualityReport(row.id)
+    handleUploadQualityReport(row)
   }  else if (val == 'mainPlanSub') {
     // 提交审批
     handleSub(row.id)
@@ -573,10 +591,13 @@ const handleOpe = async (id: number) => {
 const ploadQualityReportRef = ref()
 const ploadQualityReportTableData = ref([])
 /** 上传质量报告 */
-const handleUploadQualityReport  = async (id: number) => {
+const handleUploadQualityReport  = async (row) => {
   console.log('UploadQualityReport',UploadQualityReport.allSchemas)
-  // ploadQualityReportRef.value.dialogVisible = true
-  ploadQualityReportRef.value.open('create', null, null,'上传质量报告')//创建标签页面 createLabel 标题
+  const uploadFile = UploadQualityReport.allSchemas.formSchema.find(item=>item.field=='uploadFile')
+  if(uploadFile){
+    uploadFile['componentProps']['upData']['tableId'] = row.id
+  }
+  ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')//创建标签页面 createLabel 标题
   const tableFormKeys  = {}
   UploadQualityReport.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
@@ -585,6 +606,7 @@ const handleUploadQualityReport  = async (id: number) => {
 }
 
 const submitFormUploadQualityReport = async (formType, data) => {
+  delete data.number
   data.subList = ploadQualityReportTableData.value // 拼接子表数据参数
   if (formType === 'create') {
     await SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail(data)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index b03007f2d..3f7c03068 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1597,7 +1597,7 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         upData:{
           tableId: '',
-          tableName: ''
+          tableName: 'UploadQualityReport'
         },
         limit:1,
       }

From 5f884fdeb46a2fb70bfa0e98b90d3a7af02b753f Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 15 Apr 2024 09:28:35 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 9f06a30d3..284741bcc 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -108,9 +108,8 @@
                 />
             </ElScrollbar>
           </ContentWrap> 
-          {{annexItem.subDetailTableData.tableColumns}}
            
-          <Table style="border:1px solid red;height:100px"
+          <Table
             v-if="!isBasic && fromeWhere != 'countPlan'"
             :columns="annexItem.subDetailTableData.tableColumns"
             :data="annexItem.subDetailTableData.tableList"

From 5ebd48de9706059882d4cd6c9606524d9d37ac88 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 15 Apr 2024 09:31:58 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 284741bcc..770fc372c 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -97,7 +97,7 @@
           </DetailTable>
         </ContentWrap>
         <!-- other附件组件:如质检明细 -->
-        <div v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexTableData.some(item=>item.label==tabsList[current].label)"  class="w-[100%]" :style="{height:remarkHeight+'px'}">
+        <div v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexTableData.some(item=>item.label==tabsList[current].label)"  class="w-[100%]" :style="{height:annexItem.hasSubDetail?'100%':remarkHeight+'px'}">
           <ContentWrap class="w-[100%]">
             <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
                 <Annex v-show="tabsList[current].label==annexItem.label"

From 322af162105eaef2eecfe0e203c968f8f60249e4 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 15 Apr 2024 09:39:13 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +--
 .../supplierdeliverInspectionDetail.data.ts   | 27 +++++++------------
 .../supplierdeliverRequestMain/index.vue      | 20 +++++++-------
 .../supplierdeliverRequestMain.data.ts        |  2 +-
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/.env.development b/.env.development
index 78976cddd..81e0d3dfb 100644
--- a/.env.development
+++ b/.env.development
@@ -4,10 +4,10 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+VITE_BASE_URL='http://192.168.0.113:12080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index 0f5cf23aa..ae04dccf8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -18,8 +18,16 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '批次',
@@ -60,22 +68,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     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,
+    isForm: false,
   },
   {
     label: '操作',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index fe75c0ccb..f1a92a5c1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -77,7 +77,7 @@
     :annexTable="[{
       label: '质检明细',
       prop: 'uploadFile',
-      tableName:'UploadQualityReport',
+      tableName:'SupplierdeliverInspectionDetail',
       hasSubDetail:true, // 附件中是否展示明细表
       //明细表数据
       subDetailTableData:{
@@ -86,7 +86,7 @@
           rowField:'id'
         }], // 查询参数
         getSubList:SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage,//请求接口
-        tableColumns:UploadQualityReport.allSchemas.tableColumns,
+        tableColumns:SupplierdeliverInspectionDetail.allSchemas.tableColumns,
         tableList:[],//表格数据
         total:1,
         pageSize:10,
@@ -132,15 +132,15 @@
   <BasicForm
     ref="ploadQualityReportRef"
     @success="getList"
-    :formAllSchemas="UploadQualityReport.allSchemas"
-    :tableAllSchemas="UploadQualityReport.allSchemas"
+    :formAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
+    :tableAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
     :tableData="ploadQualityReportTableData"
     @handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail"
     @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail"
     @submitForm="submitFormUploadQualityReport"
     :isShowReduceButton="true"
   >
-    <template #UploadQualityReport>
+    <template #SupplierdeliverInspectionDetail>
       <span>1111</span>
     </template>
   </BasicForm>
@@ -157,9 +157,9 @@ import {
   SupplierdeliverRequestMainRules,
   SupplierdeliverRequestDetail,
   SupplierdeliverRequestDetailRules,
-  SupplierdeliverRequestDetailLabel,
-  UploadQualityReport
+  SupplierdeliverRequestDetailLabel
 } from './supplierdeliverRequestMain.data'
+import {    SupplierdeliverInspectionDetail} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -592,14 +592,14 @@ const ploadQualityReportRef = ref()
 const ploadQualityReportTableData = ref([])
 /** 上传质量报告 */
 const handleUploadQualityReport  = async (row) => {
-  console.log('UploadQualityReport',UploadQualityReport.allSchemas)
-  const uploadFile = UploadQualityReport.allSchemas.formSchema.find(item=>item.field=='uploadFile')
+  console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas)
+  const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile')
   if(uploadFile){
     uploadFile['componentProps']['upData']['tableId'] = row.id
   }
   ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')//创建标签页面 createLabel 标题
   const tableFormKeys  = {}
-  UploadQualityReport.allSchemas.tableFormColumns.forEach((item) => {
+  SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
   ploadQualityReportTableData.value = [tableFormKeys]
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 3f7c03068..8a6b79cdd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1630,7 +1630,7 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '数量',
-    field: 'orderQty',
+    field: 'planQty',
     table: {
       width: 150
     },

From 7625dae79265bc1f6b8b93515f9d50106c276fe2 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 15 Apr 2024 09:54:21 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8C=E6=B1=87=E6=80=BB=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F=E5=92=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F=E5=BF=85=E9=A1=BB=E4=B8=BA?=
 =?UTF-8?q?=E6=95=B4=E6=95=B0=EF=BC=8C=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=8C=E6=81=A2=E5=A4=8D=E6=89=BF?=
 =?UTF-8?q?=E6=8E=A5=E5=92=8C=E6=94=BE=E5=BC=83=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E3=80=81=E9=87=87=E6=A0=B7=E8=BF=87=E7=A8=8B=EF=BC=8C=E6=A0=B7?=
 =?UTF-8?q?=E6=9C=AC=E9=87=8F=E5=8F=AF=E8=BE=93=E5=85=A5=E6=97=B6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=98=AF=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspection/inspectionJob/addForm.vue  | 36 ++++++++++---------
 .../qms/inspection/inspectionJob/index.vue    |  6 ++--
 src/views/qms/samplingProcess/index.vue       | 15 ++++++++
 .../samplingProcess/samplingProcess.data.ts   |  4 +--
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index 267d771d5..71fbff79b 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -537,8 +537,8 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
-    console.log(data.value)// 发起承接
-      await InspectionJobMainApi.acceptInspectionJobMain(row.id)
+    // console.log(data.value)// 发起承接
+    //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
     list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
     data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
@@ -700,7 +700,7 @@ const buttonBaseClick =async(val) => {
   }
   // 关闭
   else if (val == 'close') {
-     await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
     dialogVisible.value = false
   }
 }
@@ -751,6 +751,7 @@ const submitForm = async () => {
     let arrBol = []
     let isOutweigh = []//结束时间是否大于开始时间
     let numberList = []//判断合格数量和不合格数量之和是否等于主表数量
+    let parseFloatList = []//判断合格数量和不合格数量是否是整数
     data.value.subList.forEach((item, index) => {
       if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
         arrBol.push(
@@ -761,15 +762,6 @@ const submitForm = async () => {
           )
         )
       }
-      // if (item.samplingProcessRespVO.evaluationMode == 1) {
-      //   arrBol.push(
-      //     item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
-      //       (cur, key) => {
-      //         return !cur.estimateCode
-      //       }
-      //     )
-      //   )
-      // }
       if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
         arrBol.push(
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
@@ -792,12 +784,20 @@ const submitForm = async () => {
       if (item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime) {
         isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
       }
-      // 合格数量和不合格数量之和不等于总数量
+      // 合格数量和不合格数量之和不能是小数
       if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+        parseFloatList.push(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+            (cur, key) => {
+              return String(cur.qualifiedQuantity).indexOf('.')>-1 ||  String(cur.unqualifiedQuantity).indexOf('.')>-1 
+            }
+          )
+        )
+      // 合格数量和不合格数量之和不等于总数量
         numberList.push(
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
             (cur, key) => {
-              return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=  data.value.sampleTotalAmount
+              return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=  parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty)
             }
           )
         )
@@ -805,6 +805,7 @@ const submitForm = async () => {
     })
     let isEmpty1 = arrBol.some(item=>item == true)
     let isEmptyNumberList = numberList.some(item=>item == true)
+    let isParseFloat = parseFloatList.some(item=>item == true)
     if(isEmpty1){
       message.error('检验工序和检验特性有字段未填写完全')
       return;
@@ -813,9 +814,12 @@ const submitForm = async () => {
       message.error('检验特性中有开始时间大于结束时间')
       return;
     }
-    console.log(44,numberList)
+    if(isParseFloat){
+      message.error('合格数量和不合格数量之和不可以是小数')
+      return;
+    }
     if(isEmptyNumberList){
-      message.error('合格数量和不合格数量之和不等于总数量')
+      message.error('合格数量和不合格数量之和不等于检验数')
       return;
     }
     if (formType.value == 'create') {
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index 680aa7eb7..0413a48aa 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -161,10 +161,10 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-      // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接
+      defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接
       defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:close'}), // 关闭
-      // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
-      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
+      defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
+      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
       defaultButtons.mainListPackageBtn(null), // 包装
     ]
   }
diff --git a/src/views/qms/samplingProcess/index.vue b/src/views/qms/samplingProcess/index.vue
index 52cddcc2f..b8918ceb8 100644
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@@ -66,6 +66,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 {validatePercent } from '@/utils/validator'
 
 defineOptions({ name: 'SamplingProcess' })
 
@@ -235,20 +236,34 @@ const updateFormFields = (sampleType, formRef) => {
     case '1':
       sampleSizeLabel = '样品量';
       sampleSizeDisabled = true;
+      if( SamplingProcessRules.sampleSize.length==3){
+        SamplingProcessRules.sampleSize.pop()
+      }
       break;
     case '2':
       sampleSizeLabel = '样品量(%)';
       sampleSizeRequired = true;
+      if( SamplingProcessRules.sampleSize.length==2){
+        SamplingProcessRules.sampleSize.push({
+          validator:validatePercent, message: '百分比范围 0 ~ 100', trigger: 'blur'
+        })
+      }
       break;
     case '3':
       sampleSizeLabel = '样品量';
       sampleSizeRequired = true;
+      if( SamplingProcessRules.sampleSize.length==3){
+        SamplingProcessRules.sampleSize.pop()
+      }
       break;
     case '4':
       sampleSizeLabel = '样品量';
       sampleSizeDisabled = true;
       sampleProgCodeDisabled = false;
       sampleProgCodeRequired = true;
+      if( SamplingProcessRules.sampleSize.length==3){
+        SamplingProcessRules.sampleSize.pop()
+      }
       break;
     default:
       break;
diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts
index d9c69e379..05f285cf9 100644
--- a/src/views/qms/samplingProcess/samplingProcess.data.ts
+++ b/src/views/qms/samplingProcess/samplingProcess.data.ts
@@ -1,14 +1,14 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import {getSamplingScheme} from "@/api/qms/samplingProcess";
-import { validateInteger } from '@/utils/validator'
+import { validateInteger ,validateTwoNum} from '@/utils/validator'
 
 // 表单校验
 export const SamplingProcessRules = reactive({
   sampleType: [required],
   evaluationMode: [required],
   description: [required],
-  sampleSize:ref([{ required: true, message: '该项为必填项', trigger: 'blur' }]),
+  sampleSize:ref([{ required: true, message: '该项为必填项', trigger: 'blur' },{validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}]),
   sampleProgCode:ref([{ required: true, message: '该项为必填项', trigger: 'blur' }]),
   inspectionQty: [required, {validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })

From 9f1f0e2f6d1c9a1ee7f83606cf49884bf7026091 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 15 Apr 2024 10:04:16 +0800
Subject: [PATCH 6/9] =?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/Detail/src/Detail.vue          | 24 ++++++++-------
 .../supplierdeliverInspectionDetail.data.ts   | 29 +++++++++++++++++++
 .../supplierdeliverRequestMain/index.vue      |  1 +
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 770fc372c..83fcf090a 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -108,16 +108,19 @@
                 />
             </ElScrollbar>
           </ContentWrap> 
-           
-          <Table
-            v-if="!isBasic && fromeWhere != 'countPlan'"
-            :columns="annexItem.subDetailTableData.tableColumns"
-            :data="annexItem.subDetailTableData.tableList"
-            :loading="annexItem.subDetailTableData.loading"
-            :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
-          />
+          <ContentWrap class="w-[100%]">
+            <Table 
+              v-if="!isBasic && fromeWhere != 'countPlan'"
+              :align="annexItem.align?annexItem.align:'center'"
+              :columns="annexItem.subDetailTableData.tableColumns"
+              :data="annexItem.subDetailTableData.tableList"
+              :loading="annexItem.subDetailTableData.loading"
+              :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
+              v-model:pageSize="tableObjectRef.pageSize"
+              v-model:currentPage="tableObjectRef.currentPage"
+            />
+          </ContentWrap> 
+
         </div>
         <!-- 附件/备注/变更记录 -->
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
@@ -443,6 +446,7 @@ const getAnnexFileList =  async (row:id) => {
       annexData.annexList = annexList
     }else{
       annexTableData.value.push({
+        align:item.align,
         label: item.label,
         tableName: item?.tableName || '',
         annexList,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index ae04dccf8..0f55e8f0c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -9,10 +9,28 @@ export const SupplierdeliverInspectionDetailRules = reactive({
 })
 
 export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '上传质检报告',
+    field: 'uploadFile',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+        upData:{
+          tableId: '',
+          tableName: 'SupplierdeliverInspectionDetail'
+        },
+        limit:1,
+      }
+    },
+  },
   {
     label: '代码',
     field: 'itemCode',
     sort: 'custom',
+    isForm:false,
     isSearch: true,
   },
   {
@@ -21,6 +39,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -33,18 +52,23 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     label: '批次',
     field: 'batch',
     sort: 'custom',
+    isForm:false,
     isSearch: true,
   },
   {
     label: '计划数量',
     field: 'planQty',
     sort: 'custom',
+    isForm:false,
     isSearch: true,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isForm:false,
+    isTable: false,
+    isTableForm: false,
     isSearch: true,
   },
   {
@@ -61,6 +85,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    isTableForm: false,
     isForm: false,
   },
   {
@@ -69,11 +94,15 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    isTable: false,
+    isTableForm: false,
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable: false,
+    isTableForm: false,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index f1a92a5c1..92ddf02a2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -79,6 +79,7 @@
       prop: 'uploadFile',
       tableName:'SupplierdeliverInspectionDetail',
       hasSubDetail:true, // 附件中是否展示明细表
+      align:'left',
       //明细表数据
       subDetailTableData:{
         queryParams:[{

From 12e91fcaa34db4ffe853b6fd689a17dd580e71f2 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Mon, 15 Apr 2024 11:40:56 +0800
Subject: [PATCH 7/9] =?UTF-8?q?1=E3=80=81=E6=9C=88=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82=E7=BC=96=E7=A0=81=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |  4 +-
 src/api/mes/workstation/index.ts       |  9 ++--
 src/views/mes/ordermonthplan/index.vue |  2 -
 src/views/mes/workstation/index.vue    | 57 +++++++++++++++-----------
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/.env.development b/.env.development
index 81e0d3dfb..c47a3135c 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://192.168.0.113:12080'
+VITE_BASE_URL='http://localhost:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload'
@@ -34,4 +34,4 @@ VITE_OUT_DIR=dist
 VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://localhost:12080'
\ No newline at end of file
+VITE_JMREPORT_BASE_URL='http://localhost:12080'
diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index a3dfde12d..08794d283 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -72,7 +72,6 @@ export const createEquipmentRelation = async (equipmentCodes:string[]) => {
 
 // 删除设备关联
 export const deleteEquipmentRelation = async (equipmentCodes:string[]) => {
-  debugger
   const data = {
     workstationCode : goalParams.workstationCode,
     equipmentCodes : equipmentCodes
@@ -139,19 +138,19 @@ export const checkOperstepsPageList = async (params) => {
   }
 }
 // 添加操作步骤关联
-export const createOperstepsRelation = async (processCodes:string[]) => {
+export const createOperstepsRelation = async (codes:string[]) => {
   const data = {
     workstationCode : goalParams.workstationCode,
-    processCodes : processCodes
+    operstepsCodes : codes
   }
   return await request.post({ url: `/strategy/workstation-opersteps/createRelation`, data })
 }
 
 // 删除操作步骤关联
-export const deleteOperstepsRelation = async (processCodes:string[]) => {
+export const deleteOperstepsRelation = async (codes:string[]) => {
   const data = {
     workstationCode : goalParams.workstationCode,
-    processCodes : processCodes
+    operstepsCodes : codes
   }
   return await request.post({ url: `/strategy/workstation-opersteps/deleteRelation`, data })
 }
diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index 32805630a..fc5c30e21 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -44,8 +44,6 @@
     @success="formsSuccess"
     :rules="MesOrderMonthMainRules"
     :formAllSchemas="MesOrderMonthMain.allSchemas"
-    :apiUpdate="updateMesOrderMonthMain"
-    :apiCreate="createMesOrderMonthMain"
     :apiDelete="MesOrderMonthApi.deleteMesOrderMonthMain"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 092a7e41b..bfcf17225 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -52,21 +52,22 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef"
-    :isBasic="false"
-    :isOpenSearchTable="true"
-    :apiCreate="tabsCreateApi"
-    :apiDelete="tabsDeleteApi"
-    :allSchemas="Workstation.allSchemas"
-    :detailAllSchemas="detailAllSchemas"
-    :searchTableSchema="tmpPopList"
-    :detailAllSchemasRules="WorkstationRules"
-    :apiPage="apiPage"
-    :tabs="TabsList"
-    @changeTabs="changeTabs"
-    :detailButtonIsShowAdd="true"
-    :detailButtonIsShowDelete="true"
-    :detailButtonIsShowEdit="false"
-    @detailOpenForm="detailOpenForm"
+          :isBasic="false"
+          :isOpenSearchTable="true"
+          :apiCreate="tabsCreateApi"
+          :apiDelete="tabsDeleteApi"
+          :allSchemas="Workstation.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
+          :searchTableSchema="tmpPopList"
+          :detailAllSchemasRules="WorkstationRules"
+          :apiPage="apiPage"
+          :tabs="TabsList"
+          @changeTabs="changeTabs"
+          :detailButtonIsShowAdd="true"
+          :detailButtonIsShowDelete="true"
+          :detailButtonIsShowEdit="false"
+          @detailOpenForm="detailOpenForm"
+          @searchTableSuccessDetail="searchTableSuccess"
   />
   <BasicForm
     ref="tmpPopListRef"
@@ -78,19 +79,19 @@
 <script setup lang="ts">
 import {
   Equipment,
+  equipmentPopList,
   Opersteps,
+  stepPopList,
   TabsList,
   Workstation,
-  WorkstationRules,equipmentPopList,stepPopList
+  WorkstationRules
 } from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
+import {goalParams} from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import {
-  goalParams,
-} from "@/api/mes/workstation";
 import Detail from './components/Detail.vue'
+
 defineOptions({ name: 'Workstation' })
 let tabsDeleteApi = WorkstationApi.deleteEquipmentRelation
 let tabsCreateApi = WorkstationApi.createEquipmentRelation
@@ -103,10 +104,18 @@ const tableColumns = ref(Workstation.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+  console.log(formField)
+  console.log(searchField)
+  console.log(val)
+  console.log(formRef)
+  nextTick(async () => {
+    debugger
+    if (formRef) {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    } else {
+    }
   })
 }
 

From f9dd65b8616332294288de4c9ee33b73fd2b2806 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 15 Apr 2024 13:02:43 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/interfaceInfo/index.ts            |  56 ++++
 .../wms/agvManage/interfaceInfo/index.vue     | 244 ++++++++++++++++++
 .../interfaceInfo/interfaceInfo.data.ts       | 106 ++++++++
 3 files changed, 406 insertions(+)
 create mode 100644 src/api/wms/interfaceInfo/index.ts
 create mode 100644 src/views/wms/agvManage/interfaceInfo/index.vue
 create mode 100644 src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts

diff --git a/src/api/wms/interfaceInfo/index.ts b/src/api/wms/interfaceInfo/index.ts
new file mode 100644
index 000000000..370b7f1c2
--- /dev/null
+++ b/src/api/wms/interfaceInfo/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface InterfaceInfoVO {
+  id: number
+  interfaceType: string
+  interfaceName: string
+  interfaceStatus: string
+  url: string
+  reqBody: string
+  respBody: string
+  errorMsg: string
+  remark: string
+  extraProperties: string
+  concurrencyStamp: number
+}
+
+// 查询接口调用信息列表
+export const getInterfaceInfoPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/interface-info/senior', data })
+  } else {
+    return await request.get({ url: `/wms/interface-info/page`, params })
+  }
+}
+
+// 查询接口调用信息详情
+export const getInterfaceInfo = async (id: number) => {
+  return await request.get({ url: `/wms/interface-info/get?id=` + id })
+}
+
+// 新增接口调用信息
+export const createInterfaceInfo = async (data: InterfaceInfoVO) => {
+  return await request.post({ url: `/wms/interface-info/create`, data })
+}
+
+// 修改接口调用信息
+export const updateInterfaceInfo = async (data: InterfaceInfoVO) => {
+  return await request.put({ url: `/wms/interface-info/update`, data })
+}
+
+// 删除接口调用信息
+export const deleteInterfaceInfo = async (id: number) => {
+  return await request.delete({ url: `/wms/interface-info/delete?id=` + id })
+}
+
+// 导出接口调用信息 Excel
+export const exportInterfaceInfo = async (params) => {
+  return await request.download({ url: `/wms/interface-info/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/interface-info/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/agvManage/interfaceInfo/index.vue b/src/views/wms/agvManage/interfaceInfo/index.vue
new file mode 100644
index 000000000..ec8913d10
--- /dev/null
+++ b/src/views/wms/agvManage/interfaceInfo/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="InterfaceInfo.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="InterfaceInfo.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="InterfaceInfoRules"
+    :formAllSchemas="InterfaceInfo.allSchemas"
+    :apiUpdate="InterfaceInfoApi.updateInterfaceInfo"
+    :apiCreate="InterfaceInfoApi.createInterfaceInfo"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="InterfaceInfo.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/interface-info/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { InterfaceInfo,InterfaceInfoRules } from './interfaceInfo.data'
+import * as InterfaceInfoApi from '@/api/wms/interfaceInfo'
+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: 'InterfaceInfo' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(InterfaceInfo.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: InterfaceInfoApi.getInterfaceInfoPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:interfaceInfo:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:interfaceInfo:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:interfaceInfo: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:interfaceInfo:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:interfaceInfo: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 =InterfaceInfo.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 InterfaceInfoApi.createInterfaceInfo(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await InterfaceInfoApi.updateInterfaceInfo(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, 'basicInterfaceInfo')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await InterfaceInfoApi.deleteInterfaceInfo(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 InterfaceInfoApi.exportInterfaceInfo(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 InterfaceInfoApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts
new file mode 100644
index 000000000..6c9898302
--- /dev/null
+++ b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts
@@ -0,0 +1,106 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const InterfaceInfoRules = reactive({
+  concurrencyStamp: [required],
+})
+
+export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '序号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    },
+  },
+  {
+    label: '接口名称',
+    field: 'interfaceName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '状态',
+    field: 'interfaceStatus',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '请求地址',
+    field: 'url',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '请求参数',
+    field: 'reqBody',
+    sort: 'custom',
+  },
+  {
+    label: '返回结果',
+    field: 'respBody',
+    sort: 'custom',
+  },
+  {
+    label: '错误信息',
+    field: 'errorMsg',
+    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: 'extraProperties',
+    sort: 'custom',
+    isTable:false,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    isTable:false,
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

From 9248168c005bfd1da7e04ebf951123541d7c8ed1 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 15 Apr 2024 13:24:10 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E5=8F=AB=E6=96=99=E5=88=9B=E5=BB=BA=E5=8F=91=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=8E=A5=E5=8F=A3api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/issueRequestMain/index.ts                        | 5 +++++
 .../supplierdeliver/supplierdeliverRequestMain/index.vue     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/issueRequestMain/index.ts b/src/api/wms/issueRequestMain/index.ts
index efaf03d24..40d37e803 100644
--- a/src/api/wms/issueRequestMain/index.ts
+++ b/src/api/wms/issueRequestMain/index.ts
@@ -47,6 +47,11 @@ export const createIssueRequestMain = async (data: IssueRequestMainVO) => {
   return await request.post({ url: `/wms/issue-request-main/create`, data })
 }
 
+// 新增PDA发料申请主
+export const createIssueRequestMainSetInterval = async (data: IssueRequestMainVO) => {
+  return await request.post({ url: `/wms/issue-request-main/createPDA`, data })
+}
+
 // 修改发料申请主
 export const updateIssueRequestMain = async (data: IssueRequestMainVO) => {
   return await request.put({ url: `/wms/issue-request-main/update`, data })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 92ddf02a2..200aeac55 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -402,7 +402,7 @@ const isShowMainButtonLabel = (row, val) => {
 const butttondata = (row) => {
   return [
     defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
-    defaultButtons.mainListPlanUploadQualityReportBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
+    defaultButtons.mainListPlanUploadQualityReportBtn({ hide: isShowMainButton(row, ['1','2','3']) }), // 上传质检审批
     defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
     defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
     defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮