From ed36cc369ff998852908d6bb2ed86da6ce765e9d Mon Sep 17 00:00:00 2001 From: guoshuang Date: Fri, 9 Aug 2024 14:53:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7po=E4=B8=8E?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7srm=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/wms/Raw/ReceivePO/index.vue | 41 +++++++++++++++++++++---- src/pages/wms/Raw/ReceivePO/model.ts | 15 +++++++++ src/pages/wms/Raw/ReceiveSRM/index.vue | 42 +++++++++++++++++++++----- src/pages/wms/Raw/ReceiveSRM/model.ts | 36 ++++++++++++++++------ src/utils/url.ts | 22 +++++++++++++- 5 files changed, 132 insertions(+), 24 deletions(-) diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index 7d8012b..3d22ac6 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -151,6 +151,10 @@ 收货仓库： + + 库区： + +
@@ -244,13 +248,16 @@ export default class receivePO extends BasePage { // } // ] whList: any = []; + waCodeList: any = []; show = false; singshow = false; form3: any = {}; aimWl = {} as OptionType; materilist = []; productCodeTypeList: any = {}; + waCodeTypeList: any = {}; moren = '选择仓库'; + moren1 = '选择库区'; waylist = [ { value: '0', @@ -308,6 +315,8 @@ export default class receivePO extends BasePage { this.show = true; this.form3 = {}; this.productCodeTypeList = {}; + this.waCodeTypeList = {}; + this.waCodeList = []; this.showshow = false; this.bimWl = {} as OptionType; this.selectway = null; @@ -354,6 +363,13 @@ export default class receivePO extends BasePage { }); return; } + if (this.waCodeTypeList.value == '' || this.waCodeTypeList.value == undefined) { + (this.$refs.uToast as any).show({ + title: '请选择库区', + type: 'default', + }); + return; + } if (this.receiptNoCode == '' || this.receiptNoCode == undefined) { (this.$refs.uToast as any).show({ title: '请先生成收货单号', @@ -372,6 +388,7 @@ export default class receivePO extends BasePage { } query.planNumber = this.form3.planNumber; query.whCode = this.productCodeTypeList.warehouseCode; + query.waCode = this.waCodeTypeList.value; query.factoryCode = session.FactoryCode; query.userDefined6 = this.form3.userDefined6; query.receiptNoCode = this.receiptNoCode; @@ -512,12 +529,22 @@ export default class receivePO extends BasePage { async selectProductlocCode(e: any) { console.log(e.pickerName.warehouseName); this.productCodeTypeList = e.pickerName; - // let params = { - // factoryCode: session.FactoryCode, - // equipmentTypeCode: this.productCodeTypeList.value, - // }; - // await this.model.getAllEquipmentsle(params); - // this.whList = model.DictTypeList; + let params = { + factoryCode: session.FactoryCode, + whCode: this.productCodeTypeList.value, + }; + await this.model.WarehouseList(params); + let whlist = model.wacodelist; + if (whlist.length) { + this.waCodeList = whlist; + this.waCodeTypeList = this.waCodeList[0]; + } else { + this.waCodeList = []; + this.waCodeTypeList = {} as OptionType; + } + } + selectProductwaCode(e: any) { + this.waCodeTypeList = e.pickerName; } //完成送货单 async onSubmit() { @@ -539,6 +566,8 @@ export default class receivePO extends BasePage { factoryCode: session.FactoryCode, procureCode: this.procureCode, receiptNoCode: this.receiptNoCode, + id: this.list[0].id, + createBy: session.loginName, }; await this.model.OnSubmit(params); if (this.model.submitcode == '200') { diff --git a/src/pages/wms/Raw/ReceivePO/model.ts b/src/pages/wms/Raw/ReceivePO/model.ts index b4aa10e..2cade48 100644 --- a/src/pages/wms/Raw/ReceivePO/model.ts +++ b/src/pages/wms/Raw/ReceivePO/model.ts @@ -79,6 +79,21 @@ export class receivePO extends VuexModule { })); return { DictTypeList }; } + wacodelist: any = []; + @MutationAction + async WarehouseList(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.WarehouseList, data); + const oldwacode = result.data; + let wacodelist = oldwacode.map((item: any) => ({ + label: item.areaDesc, + value: item.areaCode, + ...item, + })); + if (!wacodelist.length) { + wacodelist = []; + } + return { wacodelist }; + } submitcode: any = ''; @MutationAction async OnSubmit(data: any) { diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue index 2aa5761..ec9c7a0 100644 --- a/src/pages/wms/Raw/ReceiveSRM/index.vue +++ b/src/pages/wms/Raw/ReceiveSRM/index.vue @@ -154,6 +154,10 @@ 收货仓库： + + 库区： + +
@@ -247,6 +251,7 @@ export default class receiveSRM extends BasePage { // } // ] whList: any = []; + waCodeList: any = []; show = false; singshow = false; form3: any = {}; @@ -255,7 +260,9 @@ export default class receiveSRM extends BasePage { materilist = []; prodlist: any = []; productCodeTypeList: any = {}; + waCodeTypeList: any = {}; moren = '选择仓库'; + moren1 = '选择库区'; waylist = [ { value: '0', @@ -314,6 +321,8 @@ export default class receiveSRM extends BasePage { this.show = true; this.form3 = {}; this.productCodeTypeList = {}; + this.waCodeTypeList = {}; + this.waCodeList = []; this.showshow = false; this.bimWl = {} as OptionType; this.selectway = null; @@ -360,6 +369,13 @@ export default class receiveSRM extends BasePage { }); return; } + if (this.waCodeTypeList.value == '' || this.waCodeTypeList.value == undefined) { + (this.$refs.uToast as any).show({ + title: '请选择库区', + type: 'default', + }); + return; + } if (this.receiptNoCode == '' || this.receiptNoCode == undefined) { (this.$refs.uToast as any).show({ title: '请先生成收货单号', @@ -378,6 +394,7 @@ export default class receiveSRM extends BasePage { } query.planNumber = this.form3.planNumber; query.whCode = this.productCodeTypeList.warehouseCode; + query.waCode = this.waCodeTypeList.value; query.factoryCode = session.FactoryCode; query.userDefined6 = this.form3.userDefined6; query.receiptNoCode = this.receiptNoCode; @@ -562,14 +579,23 @@ export default class receiveSRM extends BasePage { histroyItem: any = {}; barcode: any = ''; async selectProductlocCode(e: any) { - console.log(e.pickerName.warehouseName); this.productCodeTypeList = e.pickerName; - // let params = { - // factoryCode: session.FactoryCode, - // equipmentTypeCode: this.productCodeTypeList.value, - // }; - // await this.model.getAllEquipmentsle(params); - // this.whList = model.DictTypeList; + let params = { + factoryCode: session.FactoryCode, + whCode: this.productCodeTypeList.value, + }; + await this.model.WarehouseList(params); + let whlist = model.wacodelist; + if (whlist.length) { + this.waCodeList = whlist; + this.waCodeTypeList = this.waCodeList[0]; + } else { + this.waCodeList = []; + this.waCodeTypeList = {} as OptionType; + } + } + selectProductwaCode(e: any) { + this.waCodeTypeList = e.pickerName; } //完成送货单 async onSubmit() { @@ -591,6 +617,8 @@ export default class receiveSRM extends BasePage { factoryCode: session.FactoryCode, procureCode: this.procureCode, receiptNoCode: this.receiptNoCode, + id: this.list[0].id, + createBy: session.loginName, }; await this.model.OnSubmit(params); if (this.model.submitcode == '200') { diff --git a/src/pages/wms/Raw/ReceiveSRM/model.ts b/src/pages/wms/Raw/ReceiveSRM/model.ts index 38b2385..9a4c5e8 100644 --- a/src/pages/wms/Raw/ReceiveSRM/model.ts +++ b/src/pages/wms/Raw/ReceiveSRM/model.ts @@ -15,7 +15,7 @@ export class receiveSRM extends VuexModule { orderNoItemListdes: any = []; @MutationAction async PurchaseOrderPda(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderPda, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.PurchaseOrderPda, data); let orderNoItemList: any = []; if (result.data.length) { orderNoItemList = result.data.map((item: any) => ({ @@ -32,7 +32,7 @@ export class receiveSRM extends VuexModule { ProcureOrderAlreadylist: any = ''; @MutationAction async selectOdsProcureOrderAlready(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.selectOdsProcureOrderAlready, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.selectOdsProcureOrderAlready, data); const Alreadycode = result.code; const ProcureOrderAlreadylist = result.data; return { Alreadycode, ProcureOrderAlreadylist }; @@ -40,35 +40,35 @@ export class receiveSRM extends VuexModule { sapPurchasecode: any = ''; @MutationAction async sapPurchaseOrderSync(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.sapPurchaseOrderSync, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.sapPurchaseOrderSync, data); const sapPurchasecode = result.code; return { sapPurchasecode }; } deliverycode: any = ''; @MutationAction async getDeliveryNoteDetail(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.getDeliveryNoteDetail, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.getDeliveryNoteDetail, data); const deliverycode = result.code; return { deliverycode }; } SubmitCode: any = ''; @MutationAction async PurchaseOrderdeliPda(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdeliPda, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.PurchaseOrderdeliPda, data); const SubmitCode: [] = result; return { SubmitCode }; } @MutationAction async PurchaseOrderdetailPda(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdetailPda, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.PurchaseOrderdetailPda, data); const orderNoItemListdes = result.data; return { orderNoItemListdes }; } DictTypeList: any = []; @MutationAction async Stashlist() { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.list, { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.list, { factoryCode: session.FactoryCode, }); const DictTypeListoild: [] = result.data; @@ -79,10 +79,26 @@ export class receiveSRM extends VuexModule { })); return { DictTypeList }; } + //库区查询 + wacodelist: any = []; + @MutationAction + async WarehouseList(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.WarehouseList, data); + const oldwacode = result.data; + let wacodelist = oldwacode.map((item: any) => ({ + label: item.areaDesc, + value: item.areaCode, + ...item, + })); + if (!wacodelist.length) { + wacodelist = []; + } + return { wacodelist }; + } submitcode: any = ''; @MutationAction async OnSubmit(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdeliPdaConfirm, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.PurchaseOrderdeliPdaConfirm, data); const submitcode = result.code; return { submitcode, @@ -91,7 +107,7 @@ export class receiveSRM extends VuexModule { Arrivalcode: any = ''; @MutationAction async ArrivalRegistration(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.ArrivalRegistration, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.ArrivalRegistration, data); const Arrivalcode = result.code; return { Arrivalcode, @@ -101,7 +117,7 @@ export class receiveSRM extends VuexModule { singobj: any = {}; @MutationAction async selectArrivalRegistration(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.selectArrivalRegistration, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.selectArrivalRegistration, data); const singcode = result.code; const singobj = result.data; return { singcode, singobj }; diff --git a/src/utils/url.ts b/src/utils/url.ts index 2b80fca..7b01d0b 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -95,7 +95,8 @@ export const url = { raw: { ReceivePO: { // 手持 －－包材采购单采购收货查询 - PurchaseOrderPda: qianzhuione + '/wms/order/PurchaseOrderPda', + PurchaseOrderPda: qianzhuione + '/wms/WmsToWCSmission/PurchaseOrderPda', + //'/wms/order/PurchaseOrderPda', // 手持 －－包材采购单采购收货操作 PurchaseOrderdeliPda: qianzhuione + '/wms/order/PurchaseOrderdeliPda', // 手持 －－包材采购单采购查询明细 @@ -108,6 +109,25 @@ export const url = { ArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistration', selectArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/selectArrivalRegistration', getDeliveryNoteDetail: qianzhuione + '/wms/WmsToWCSmission/getDeliveryNoteDetail', + WarehouseList: qianzhuione + '/wms/WmsToWCSmission/listTableDataInfo', + }, + ReceiveSRM: { + // 手持 －－包材采购单采购收货查询 + PurchaseOrderPda: qianzhuione + '/wms/WmsToWCSmission/PurchaseOrderPda', + //'/wms/order/PurchaseOrderPda', + // 手持 －－包材采购单采购收货操作 + PurchaseOrderdeliPda: qianzhuione + '/wms/order/PurchaseOrderdeliPda', + // 手持 －－包材采购单采购查询明细 + PurchaseOrderdetailPda: qianzhuione + '/wms/order/PurchaseOrderdetailPda', + // 手持 查询仓库管理列表 + list: qianzhuione + '/wms/order/listCK', + sapPurchaseOrderSync: qianzhuione + '/wms/WmsToWCSmission/sapPurchaseOrderSync', + selectOdsProcureOrderAlready: qianzhuione + '/wms/WmsToWCSmission/selectOdsProcureOrderAlready', + PurchaseOrderdeliPdaConfirm: qianzhuione + '/wms/WmsToWCSmission/PurchaseOrderdeliPdaConfirm', + ArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistration', + selectArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/selectArrivalRegistration', + getDeliveryNoteDetail: qianzhuione + '/wms/WmsToWCSmission/getDeliveryNoteDetail', + WarehouseList: qianzhuione + '/wms/WmsToWCSmission/listTableDataInfo', }, PurchaseWHPO: { // 手持 －－包材采购单采购收货查询