Merge remote-tracking branch 'origin/main'

src/api/StockOut/index.ts

@@ -72,6 +72,13 @@ export function DeAssignShipRequest(data: any) {
     data: data,
   });
 }
+export function AssignAndDessign(data: any) {
+  return request({
+    url: '/api/AssignAndDessign/AssignAndDessignM',
+    method: 'post',
+    data: data,
+  });
+}
 export function AssignShipRequestByCharge(data: any) {
   return request({
     url: '/api/SaleOut/AssignShipRequestByCharge',

src/views/stockOut/PurReturn/index.vue

@@ -128,6 +128,8 @@ import { useRouter } from "vue-router";
 import { create } from "sortablejs";
 import { FirstInFirstOut, IFTRUE } from '@/utils/CommonUtil'
 import { bTableHeight } from "../../../composables/calcTableHeight";
+import { AssignAndDessign } from '@/api/StockOut'
+import { localStorage } from '@/utils/storage'
 
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(440);
 const queryFormRef = ref(ElForm);
@@ -153,7 +155,7 @@ const state: any = reactive({
     queryId: "",
     version: "",
     params: {
-      SITENAME: 'SDK',//localStorage.getItem("siteName"),
+      SITENAME: 'SDK',//localStorage.get("siteName"),
       DELIVERYTYPE: "", //移动类型
       SUPPLIERNAME: "",
       RECEIVEREQUESTNAME: "",
@@ -211,7 +213,7 @@ const state: any = reactive({
     header: {
       MESSAGENAME: '',
       LANGUAGE: 'Chinese',
-      EventUser: localStorage.getItem('userId') || '10975133'
+      EventUser: localStorage.get('userId')
     },
     body: {
       RECEIVEREQUESTNAME: '',
@@ -388,25 +390,21 @@ async function LeftIn() {
   if (state.MaterialPackingList.length > 0 && state.column4.length > 0) {
 
     state.loading = true;
-    state.ChangeParams.header.MESSAGENAME = 'AssignReceiveRequestToBox2ForSDK';
+    let boxList = [];
-    state.ChangeParams.body.RECEIVEREQUESTDETAILNAME = state.queryParams.params.SHIPREQUESTDETAILNAME
-    // state.ChangeParams.body.RECEIVEREQUESTDETAILNAME = "0001"
-    state.ChangeParams.body.RECEIVEREQUESTNAME = state.queryParams.params.SHIPREQUESTNAME
-    state.ChangeParams.body.MATERIALQUANTITY = 0
-    // 遍历 state.column4，将 MATERIALPACKINGNAME 添加到 packingNames 数组中
-    state.ChangeParams.body.objPara = []
       for (const item of state.column4) {
-      state.ChangeParams.body.objPara.push(item.MATERIALPACKINGNAME);
+        boxList.push({
-      state.ChangeParams.body.MATERIALQUANTITY += item.MATERIALQUANTITY;
+          materialPackingName: item.MATERIALPACKINGNAME,
+          siteName: "SDK"
+        });
       }
-    // 如果 packingNames 数组不为空，则将其转换为一个由“、”分隔的字符串
+    let param = {
-    if (state.ChangeParams.body.objPara.length > 0) {
+        userId: localStorage.get('userId'),
-      state.ChangeParams.body.MATERIALPACKINGNAME = state.ChangeParams.body.objPara.join(";");
+        opType: "Assign",
-    } else {
+        receiveRequestName: state.queryParams.params.SHIPREQUESTNAME,
-      // 如果 packingNames 为空，可以根据需要设置初始值，或者保持为空字符串
+        receiveRequestDetailName: state.queryParams.params.SHIPREQUESTDETAILNAME,
-      state.ChangeParams.body.MATERIALPACKINGNAME = "";
+        boxList : boxList
-    }
+    };
-    await BpelEvent(state.ChangeParams).then((res: any) => {
+    AssignAndDessign(param).then((res: any) => {
       if (IFTRUE(res)) {
         handle(tempRow, tempevent, tempcolumn);
         handleQuery();
@@ -439,25 +437,22 @@ async function LeftIn() {
 async function RightIn() {
   if (state.column3.length > 0) {
     state.loading2 = true;
-    state.ChangeParams.header.MESSAGENAME = 'DeassignShipRequestFromBox2';
+    let boxList = [];
-    state.ChangeParams.body.RECEIVEREQUESTDETAILNAME = state.RightqueryParams.params.RECEIVEREQUESTDETAILNAME
-    state.ChangeParams.body.RECEIVEREQUESTNAME = state.RightqueryParams.params.RECEIVEREQUESTNAME
-    state.ChangeParams.body.MATERIALQUANTITY = 0
-    // 遍历 state.column4，将 MATERIALPACKINGNAME 添加到 packingNames 数组中
-    state.ChangeParams.body.objPara = []
     for (const item of state.column3) {
-      state.ChangeParams.body.objPara.push(item.MATERIALPACKINGNAME);
+      boxList.push({
-      state.ChangeParams.body.MATERIALQUANTITY += item.MATERIALQUANTITY;
+        materialPackingName: item.MATERIALPACKINGNAME,
+        siteName: "SDK"
+      });
     }
 
-    // 如果 packingNames 数组不为空，则将其转换为一个由“、”分隔的字符串
+    let param = {
-    if (state.ChangeParams.body.objPara.length > 0) {
+      userId: localStorage.get('userId'),
-      state.ChangeParams.body.MATERIALPACKINGNAME = state.ChangeParams.body.objPara.join(";");
+      opType: "Dessign",
-    } else {
+      receiveRequestName: state.queryParams.params.SHIPREQUESTNAME,
-      // 如果 packingNames 为空，可以根据需要设置初始值，或者保持为空字符串
+      receiveRequestDetailName: state.queryParams.params.SHIPREQUESTDETAILNAME,
-      state.ChangeParams.body.MATERIALPACKINGNAME = "";
+      boxList :  boxList
-    }
+    };
-    await BpelEvent(state.ChangeParams).then((res: any) => {
+    AssignAndDessign(param).then((res: any) => {
       if (IFTRUE(res)) {
         handle(tempRow, tempevent, tempcolumn);
         handleQuery();
@@ -496,7 +491,7 @@ async function handleStockOut() {
     state.button_state = true;
     state.button_loadings = true;
     state.ReserveParams.header.MESSAGENAME = 'CompleteShipRequestForPurReturn'
-    state.ReserveParams.body.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName");
+    state.ReserveParams.body.SITENAME = localStorage.get("siteName") == null ? "SDK" : localStorage.get("siteName");
     state.ReserveParams.body.RECEIVEREQUESTNAME = state.queryParams.params.RECEIVEREQUESTNAME
     state.ReserveParams.body.RECEIVEREQUESTNAME = state.queryParams.params.RECEIVEREQUESTNAME
     state.ReserveParams.body.RECEIVEREQUESTDETAILNAME = state.queryParams.params.SHIPREQUESTDETAILNAME

src/views/stocked/MoveLibrary/index.vue

@@ -419,13 +419,15 @@ async function handleReserve() {
   state.button_loading = true
   state.BoxList = []
   state.Button_state = true
-  if (state.column3.length > 0 || state.column4.length > 0) {
+  console.log(state.column3)
+  console.log(state.column4)
+  if (state.MaterialPackingUsername.length > 0 ) {
     state.ChangeParams.header.EVENTUSER = localStorage.getItem('userId') || '10975133'
     state.ChangeParams.header.MESSAGENAME = 'ModifyERPLocation'
     state.ChangeParams.body.AREANAME = state.StorageSelect[0]
     state.ChangeParams.body.LOCATIONNAME = state.StorageSelect[1]
-    for (let item = 0; item < state.column3.length; item++) {
+    for (let item = 0; item < state.MaterialPackingUsername.length; item++) {
-      state.BoxList.push({ BoxL: state.column3[item].MATERIALPACKINGNAME })
+      state.BoxList.push({ BoxL: state.MaterialPackingUsername[item].MATERIALPACKINGNAME })
     }
     state.ChangeParams.body.BOXList = state.BoxList
     // await BpelEvent(state.ChangeParams)