diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue index aec11bf..cecb43d 100644 --- a/src/pages/wms/Raw/ProductionREQ/index.vue +++ b/src/pages/wms/Raw/ProductionREQ/index.vue @@ -96,10 +96,9 @@ import { Component } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import jPicker from '@/components/J-Picker/jPicker.vue'; -import model, {submitReverseMaterialList} from './model'; +import model, {submitReverseMaterialList,submitTransferMaterialList} from './model'; import { session } from '@/store/modules/session'; import LjListRow from "@/components/lanju/lj-list-row/index.vue"; -import {submitTransferMaterialList} from "@/pages/wms/Raw/ProductionREQ2/model"; interface OptionType { label: string; value: string; @@ -364,10 +363,14 @@ export default class ProductionREQ extends BasePage { } const list = [] + let x = '' //遍历列表 //获取需要过账列表与出账列表 for (const item of this.materilist){ + if (item.userDefined3 === "X"){ + x = "x" + } if (item.isPost + "" === "1"){ list.push(item) continue; @@ -382,24 +385,45 @@ export default class ProductionREQ extends BasePage { factoryCode:session.FactoryCode, orderList:list, } + if (x === "x"){ + data.userDefined3 = "X" + submitReverseMaterialList(data).then(res=>{ + if (res.code === 200){ + uni.showToast({ + title: '操作成功!', + mask:true + }) - submitReverseMaterialList(data).then(res=>{ - if (res.code === 200){ - uni.showToast({ - title: '操作成功!', - mask:true - }) + }else { + uni.showToast({ + title: '操作失败!', + mask:true + }) + } + setTimeout(()=>{ + this.query() + },1500) + }) + }else { + data.userDefined3 = "" + submitTransferMaterialList(data).then(res=>{ + if (res.code === 200){ + uni.showToast({ + title: '操作成功!', + mask:true + }) - }else { - uni.showToast({ - title: '操作失败!', - mask:true - }) - } - setTimeout(()=>{ - this.query() - },1500) - }) + }else { + uni.showToast({ + title: '操作失败!', + mask:true + }) + } + setTimeout(()=>{ + this.query() + },1500) + }) + } } diff --git a/src/pages/wms/Raw/ProductionREQ/model.ts b/src/pages/wms/Raw/ProductionREQ/model.ts index 54aadb5..d68e513 100644 --- a/src/pages/wms/Raw/ProductionREQ/model.ts +++ b/src/pages/wms/Raw/ProductionREQ/model.ts @@ -114,3 +114,9 @@ export function submitReverseMaterialList(data: any): Promise { return http.post(url.lanjuwms.raw.ProductionREQ.submitReverseMaterialList, data); } +export function submitTransferMaterialList(data: any): Promise { + return http.post(url.lanjuwms.raw.ProductionREQ2.submitTransferMaterialList, data); +} + + + diff --git a/src/pages/wms/Raw/ProductionREQ2/index.vue b/src/pages/wms/Raw/ProductionREQ2/index.vue index b904b6c..649da79 100644 --- a/src/pages/wms/Raw/ProductionREQ2/index.vue +++ b/src/pages/wms/Raw/ProductionREQ2/index.vue @@ -182,6 +182,7 @@ export default class Index extends BasePage { createBy:session.userName, factoryCode:session.FactoryCode, orderList:list, + userDefined3:"ZC" } submitTransferMaterialList(data).then(res=>{