From 0d0c4200828f8b5568ca1fe11e3b7bc2d1e57f91 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Tue, 21 May 2024 19:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/gw/finishedProductWarehousing/index.ts    |  6 ++++++
 src/views/Gw/biLeiQi/BiLeiQi.vue                  |  2 +-
 src/views/Gw/biLeiQi/BiLeiQiForm.vue              |  2 +-
 .../FinishedProductWarehousing.vue                |  2 +-
 .../FinishedProductWarehousingForm.vue            |  7 ++++++-
 .../ProductionWorkOrderForm.vue                   | 15 +++++++++------
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/api/gw/finishedProductWarehousing/index.ts b/src/api/gw/finishedProductWarehousing/index.ts
index 2707a78..a5959e0 100644
--- a/src/api/gw/finishedProductWarehousing/index.ts
+++ b/src/api/gw/finishedProductWarehousing/index.ts
@@ -1,5 +1,11 @@
 import request from '@/config/axios'
 import { useUserStore } from '../../../stores/user'
+
+// 成品入库前完整数据验证
+export const getFinishedProductCount = async (data: any) => {
+    return await request.post({ url: `/DistributionBoxTesting/GetFinishedProductCount?wono=`+data })
+}
+
 // 成品入库列表获取
 export const getFinishedProductWarehousingPaging = async (data: any) => {
     return await request.post({ url: `/DistributionBoxTesting/GetFinishedProductWarehousingPaging?user=`+useUserStore().UserName, data })
diff --git a/src/views/Gw/biLeiQi/BiLeiQi.vue b/src/views/Gw/biLeiQi/BiLeiQi.vue
index f128eec..8ae58b4 100644
--- a/src/views/Gw/biLeiQi/BiLeiQi.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQi.vue
@@ -69,7 +69,7 @@ const gridOptionsA: any = reactive({
         // { field: 'SgEntityId', title: '国网实物Id', width: '110px' },
         // { field: 'DataUniqueIdentifier', title: '数据唯一标识', width: '250px' },
         // { field: 'ModelSpecification', title: '规格型号', width: '160px' },
-        { field: 'PressureValue', title: '额定电压(kV)', width: '120px' },
+        { field: 'PressureValue', title: '额定电压(V)', width: '120px' },
         { title: '操作', width: '250px', fixed: 'right', slots: { default: 'operate' } }
     ],
     pagerConfig: {
diff --git a/src/views/Gw/biLeiQi/BiLeiQiForm.vue b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
index 447ac39..ded7ab3 100644
--- a/src/views/Gw/biLeiQi/BiLeiQiForm.vue
+++ b/src/views/Gw/biLeiQi/BiLeiQiForm.vue
@@ -169,7 +169,7 @@
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="额定电压(kV)" field="PressureValue" span="12">
+                        <vxe-form-item title="额定电压(V)" field="PressureValue" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.PressureValue" placeholder="请输入额定电压" clearable
                                     @change="fnChangeA(params)"></vxe-input>
diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue
index 1978ae8..4e7c0cf 100644
--- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue
+++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousing.vue
@@ -62,7 +62,7 @@ const gridOptionsA: any = reactive({
         { field: 'IsQualified', title: '是否合格', width: '110px' },
         { field: 'InventoryQuantity', title: '成品入库数量', width: '110px' },
         { field: 'MeasuringUnit', title: '计量单位', width: '110px' },
-        { field: 'VoltageGrade', title: '电压等级(kV)', width: '110px' },
+        { field: 'VoltageGrade', title: '电压等级(V)', width: '110px' },
         { field: 'StorageTime', title: '成品入库时间', width: '110px', slots: { default: 'slotStorageTime' } },
         { field: 'DeliveryStatus', title: '发货状态', width: '110px', slots: { default: 'slotDeliveryStatus' } },
         { field: 'DeliveryTime', title: '发货时间', width: '110px', slots: { default: 'slotDeliveryTime' } },
diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
index a88c2de..22f44b5 100644
--- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
+++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
@@ -67,7 +67,7 @@
                                     @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
                             </template>
                         </vxe-form-item> -->
-                        <vxe-form-item title="电压等级(kV)" field="VoltageGrade" span="12">
+                        <vxe-form-item title="电压等级(V)" field="VoltageGrade" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.VoltageGrade" type="number" placeholder="请输入电压等级" clearable
                                     @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
@@ -373,6 +373,11 @@ const fnSubmitA = async () => {
                 VXETable.modal.alert({content:"供应商工单编号重复设置，请重新选择"})
                 return;
             }
+    let finishedCount = await FinishedProductWarehousingApi.getFinishedProductCount(formDataA.value.SupplierWorkNo)
+    if(finishedCount!= 32){
+        VXETable.modal.alert({content:"当前工单数据不完整，请检查原材料/组部件检验、生产工艺及过程检验、出厂试验是否都已完整录入"})
+                return;
+    }
     switch (formTypeA.value) {
         case 'add':
             const paramsA = {
diff --git a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
index 49f54e1..5770db3 100644
--- a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
+++ b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
@@ -14,11 +14,11 @@
                                 <vxe-input v-model="params.data.WoNo" disabled style="width:240px;" placeholder="系统自动生成"></vxe-input>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="生产订单编号" field="IpoNo" span="12">
+                        <vxe-form-item title="采购订单编号" field="PoNo" span="12">
                             <template #default="params">
                                 <!-- <div style="width: 196px;">{{ params.data.IpoNo }}</div> -->
-                                <vxe-input v-if="formTypeA=='edit'" v-model="params.data.IpoNo" disabled style="width:240px;"></vxe-input>
-                                <vxe-select v-else="formTypeA=='add'" v-model="params.data.IpoNo" style="width:240px;" clearable
+                                <vxe-input v-if="formTypeA=='edit'" v-model="params.data.PoNo" disabled style="width:240px;"></vxe-input>
+                                <vxe-select v-else="formTypeA=='add'" v-model="params.data.PoNo" style="width:240px;" clearable
                                     filterable @change="fnIpoNoChange" >
                                     <template v-for="(item) in ipoSimpleList">
                                         <vxe-option :value="item.key" :label="item.val"></vxe-option>
@@ -231,6 +231,7 @@ const formDataA: any = ref(
         "SupplierWoId": 0,
         "PurchaserHqCode": "SGCC",
         "IpoNo": "",
+        "PoNo": "",
         "SupplierCode": "1000032215",
         "SupplierName": "长江电气集团股份有限公司",
         "WoNo": "",
@@ -301,11 +302,12 @@ const fnIpoNoChange =async (params: any) => {
         ipoSimpleList.value.forEach(async (item: any) => {
             if (item.key == params.value) {
                 baseEntityIds.value = await BaseEntityIDApi.GetPoUnUsedEntityID(item.pono)
+                formDataA.value.IpoNo= item.ipono
                 formDataA.value.EntityCode= ""
                 ipoEntityIds.value = []
-                baseEntityIds.value.forEach((item: any) => {
-                    if (ipoEntityIds.value.indexOf(item.EntityId) == -1)
-                        ipoEntityIds.value.push({ key: item.EntityId, val: item.EntityId })
+                baseEntityIds.value.forEach((record: any) => {
+                    if (ipoEntityIds.value.indexOf(record.EntityId) == -1)
+                        ipoEntityIds.value.push({ key: record.EntityId, val: record.EntityId })
 
                 })
             }
@@ -490,6 +492,7 @@ const fnResetA = () => {
         "SupplierWoId": 0,
         "PurchaserHqCode": "SGCC",
         "IpoNo": "",
+        "PoNo": "",
         "SupplierCode": "1000032215",
         "SupplierName": "长江电气集团股份有限公司",
         "WoNo": "",