From b4373530d747c8f5dc1d995b4331144abf462ea7 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Wed, 23 Apr 2025 15:03:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=A7=A3=E5=86=B3=E8=BE=85=E6=9D=90?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=A1=AE=E8=AE=A4=E5=A4=87=E8=B4=A7=E3=80=81?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/index.ts                       |  10 +-
 .../auxiliaryManage/auxiliaryOut/index.vue    | 114 ++++++++++++++++--
 src/views/stockIn/NoPoStockIn/index.vue       |   4 +-
 3 files changed, 116 insertions(+), 12 deletions(-)

diff --git a/src/api/common/index.ts b/src/api/common/index.ts
index 1aeb12e..51b90e0 100644
--- a/src/api/common/index.ts
+++ b/src/api/common/index.ts
@@ -63,7 +63,7 @@ export function bpelAuxiliary(ChangeParams: any) {
 
 export function AuxiliaryReserve(ChangeParams: any) {
   return request({
-    url: '/api/Auxiliary/AuxiliaryReserve',
+    url: '/api/api/Auxiliary/auxiliaryAssign',
     method: 'post',
     data: ChangeParams,
   });
@@ -124,4 +124,12 @@ export function allocateStockInCommit(data: any) {
     method: 'post',
     data: data,
   });
+}
+
+export function auxiliaryStockOut(ChangeParams: any) {
+  return request({
+    url: '/api/api/Auxiliary/auxiliaryStockOut',
+    method: 'post',
+    data: ChangeParams,
+  });
 }
\ No newline at end of file
diff --git a/src/views/auxiliaryManage/auxiliaryOut/index.vue b/src/views/auxiliaryManage/auxiliaryOut/index.vue
index a7749ac..f231e35 100644
--- a/src/views/auxiliaryManage/auxiliaryOut/index.vue
+++ b/src/views/auxiliaryManage/auxiliaryOut/index.vue
@@ -68,7 +68,7 @@
         <div class="page-table-title"></div>
         <div>
           <el-button type="primary" :disabled="state.button_state" @click="cancelHandleFn">取消备货</el-button>
-          <el-button type="primary" :disabled="state.button_state" @click="handleFn">确认备货</el-button>
+          <el-button type="primary" :disabled="state.button_state" @click="confimStockUp">确认备货</el-button>
         </div>
       </div>
         <div class="vue-element-page-table">
@@ -102,7 +102,7 @@
         </el-form-item>
       </div>
       <div class="page-search-btns">
-        <el-button type="primary" @click="handleStockOut"  :disabled="state.button_state">出库</el-button>
+        <el-button type="primary" @click="confimStockOut"  :disabled="state.button_state">出库</el-button>
       </div>
     </el-row>
   </div>
@@ -117,10 +117,11 @@ export default {
 <script lang="ts" setup>
 import { reactive, ref, onMounted, toRefs, getCurrentInstance, nextTick } from "vue";
 import { ElForm, ElMessageBox, ElTable, ElMessage, ElNotification } from "element-plus";
-import { getQueryList,  bpelAuxiliary,AuxiliaryReserve,AuxiliaryDessign } from '@/api/common'
+import { getQueryList,  bpelAuxiliary,AuxiliaryReserve,AuxiliaryDessign,auxiliaryStockOut } from '@/api/common'
 import { useRouter } from "vue-router";
 import { bTableHeight } from "../../../composables/calcTableHeight";
 import { areAllNotEmpty } from "@/utils/CommonUtil"
+import { localStorage } from '@/utils/storage'
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(500);
 const queryFormRef = ref(ElForm);
 const operateFormRef = ref(ElForm);
@@ -192,7 +193,7 @@ const state: any = reactive({
   ChangeParams: {
     header: {
       MESSAGENAME: '',
-      EventUser: localStorage.getItem('userId') ,
+      EventUser: localStorage.get('userId') ,
       LANGUAGE: 'Chinese',
       Flag: 'LK'//立库标志
     },
@@ -259,7 +260,7 @@ onMounted(() => {
     { header: "物料编号", field: "MATERIALSPECNAME", hide: false },
     { header: "品名", field: "DESC_CN", hide: false },
     { header: "物料规格", field: "SDK_ID", hide: true },
-    { header: "物料规格", field: "SPECNAME", hide: false },
+    { header: "物料规格", field: "DESCRIPTION", hide: false },
     { header: "组织", field: "ERPFACTORY", hide: false },
     { header: "仓库", field: "ERPLOCATION", hide: false },
     { header: "货位", field: "LOCATIONNAME", hide: false },
@@ -267,7 +268,9 @@ onMounted(() => {
     { header: "单位", field: "MATERIALUNIT", hide: false },
     { header: "入库日期", field: "RECEIVETIME", hide: false },
     { header: "生产日期", field: "MAKEDATE", hide: false },
-    { header: "过期时间", field: "EXPIRINGDATE", hide: false }
+    { header: "过期时间", field: "EXPIRINGDATE", hide: false },
+    { header: "阶段", field: "PHASE", hide: false },
+
   ];
   updateTableHeight();
   window.addEventListener('resize', handleResize);
@@ -380,7 +383,7 @@ function handleQuery() {
   let flag = true;
   if ((state.queryParams.params.SHIPREQUESTNAME != '') && (state.queryParams.params.SHIPREQUESTNAME != null) && (state.queryParams.params.SHIPREQUESTNAME != undefined)) {
     state.queryParams.queryId = 'GetShipRequestDetailList';
-    state.queryParams.version = '00054';
+    state.queryParams.version = '00055';
     getQueryList(state.queryParams).then((res: any) => {
       if (res.data.length > 0) {
         state.ShipList = res.data;
@@ -400,7 +403,7 @@ function handleQuery() {
 
   if ((state.queryParams.params.SHIPREQUESTNAME != '') && (state.queryParams.params.SHIPREQUESTNAME != null) && (state.queryParams.params.SHIPREQUESTNAME != undefined)) {
     state.queryParams.queryId = 'GetPackingRow';
-    state.queryParams.version = '00054';
+    state.queryParams.version = '00056';
     getQueryList(state.queryParams).then((res: any) => {
       if (res.data.length > 0) {
         state.MaterialPackingList = res.data;
@@ -450,6 +453,45 @@ function handleFn () {
   });
 }
 
+function confimStockUp () {
+  if (state.ShipList.length <= 0) {
+    ElMessageBox.alert('没有单据明细，请确认')
+    return
+  }
+  state.loading = true
+  state.button_state = true
+ /* state.ReserveParams.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName");
+  state.ReserveParams.SHIPREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME //单据
+  state.ReserveParams.user = localStorage.getItem('userId')
+  state.ReserveParams.boxList = state.ShipList*/
+  AuxiliaryReserve({
+    commitDate : state.commitDate,
+    USER : localStorage.get("userId"),
+    SITENAME: localStorage.get('siteName') || 'SDK',
+    SHIPREQUESTNAME: state.queryParams.params.SHIPREQUESTNAME,
+    BOXLIST: state.ShipList
+  }).then((res: any) => {
+    if (res.success){
+      state.button_state = false;
+      state.loading = false;
+      handleQuery();
+    } else {
+      state.button_state = false;
+      state.loading = false;
+      ElMessageBox.alert(res.message, '', {
+        confirmButtonText: 'OK',
+      })
+    }
+  }).catch((error: any) => {
+    ElMessageBox.alert(error, '提示框', {
+      confirmButtonText: 'OK',
+    })
+    state.loading = false
+    state.button_state = true
+  });
+}
+
+
 /**
  * 取消备货
  */
@@ -460,7 +502,7 @@ function cancelHandleFn() {
   }
   state.loading = true
   state.button_state = true
-  state.ReserveParams.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName");
+  state.ReserveParams.SITENAME = localStorage.get("siteName") == null ? "SDK" : localStorage.get("siteName");
   state.ReserveParams.SHIPREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME //单据
   state.ReserveParams.user = localStorage.getItem('userId')
   state.ReserveParams.boxList = state.ShipList
@@ -540,6 +582,60 @@ function handleStockOut() {
   state.button_state2 = true
   state.loading = false;
 }
+
+function confimStockOut() {
+  console.log(state.commitDate)
+  if(state.commitDate == null){
+    ElMessageBox.alert('辅材出库失败，过账时间不可清空', {
+      confirmButtonText: 'OK',
+    })
+    return;
+  }
+  if (state.ShipList.length <= 0) {
+    ElMessageBox.alert('辅材出库失败，没有出库明细，请确认')
+    return
+  }
+  state.loading = true
+  state.button_state = true
+  /*
+  state.ReserveParams.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName");
+  state.ReserveParams.SHIPREQUESTDETAILNAME =  state.queryParams.params.SHIPREQUESTDETAILNAME
+  state.ReserveParams.SHIPREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME //单据
+  state.ReserveParams.SHIPREQUESTTYPE = state.ShipList[0]['SHIPREQUESTTYPE'] //发货类型
+  state.ReserveParams.user = localStorage.getItem('userId')
+  state.ReserveParams.commitDate = state.commitDate
+  state.MaterialPackingList.key = {}
+  state.ReserveParams.MaterialPackingList = state.MaterialPackingList
+  */
+  auxiliaryStockOut({
+    commitDate : state.commitDate,
+    USER : localStorage.get("userId"),
+    SITENAME: localStorage.get('siteName') || 'SDK',
+    SHIPREQUESTNAME: state.queryParams.params.SHIPREQUESTNAME,
+    BOXLIST: state.MaterialPackingList
+  }).then((res: any) => {
+    if (res.success){
+      handleQuery();
+      ElMessageBox.alert('辅材出库完成', '提示框', {
+        confirmButtonText: 'OK',
+      })
+    } else {
+      /*state.button_state = false;
+      state.loading = false;*/
+      ElMessageBox.alert('辅材出库失败，' + res.message, '', {
+        confirmButtonText: 'OK',
+      })
+    }
+  }).catch((error: any) => {
+    ElMessageBox.alert('辅材出库失败，' + error, '提示框', {
+      confirmButtonText: 'OK',
+    })
+    state.button_state = false;
+    state.loading = false;
+  });
+  state.button_state = false;
+  state.loading = false;
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/stockIn/NoPoStockIn/index.vue b/src/views/stockIn/NoPoStockIn/index.vue
index 9d3598a..64db23b 100644
--- a/src/views/stockIn/NoPoStockIn/index.vue
+++ b/src/views/stockIn/NoPoStockIn/index.vue
@@ -376,10 +376,10 @@ function getStorageSpec(value: any) {
   state.POCreateLocationList = []
   getQueryList({
     queryId: "GetLocationForCreatePO",
-    version: "00001",
+    version: "00002",
     params: {
       SITENAME: "SDK",
-      ERPLOCATION: value//PO
+      //ERPLOCATION: value
     } as any,
   }).then((res: any) => {
     state.POCreateLocationList = res.data