From fb0b1f687af8a2e35bae120ea06fafbc5b5873cb Mon Sep 17 00:00:00 2001 From: guoshuang Date: Sat, 21 Sep 2024 14:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90&=E9=A2=86=E6=96=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 2 +- src/pages/wms/Raw/ProductionREQ/index.vue | 24 +-- src/pages/wms/Raw/ReceivePO/index.vue | 148 ++++++------- src/pages/wms/Raw/ReceivePO/model.ts | 2 +- src/pages/wms/Raw/ReceiveSRM/index.vue | 243 ++++++---------------- src/pages/wms/Raw/ReceiveSRM/model.ts | 2 +- src/utils/url.ts | 2 + 7 files changed, 137 insertions(+), 286 deletions(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index ae16342..6a2c7c0 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.107'; //正式版本号 + version = '0.0.108'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue index 0ee3d9d..4014bb6 100644 --- a/src/pages/wms/Raw/ProductionREQ/index.vue +++ b/src/pages/wms/Raw/ProductionREQ/index.vue @@ -72,24 +72,6 @@ 物料名称: {{ item.materialDesc }} - - - 仓库: - {{ item.whCode }} - - - 库区: - {{ item.waCode }} - - - - 托盘号: - {{ item.sn }} - - - 批次: - {{ item.userDefined2 }} - 数量: @@ -214,7 +196,7 @@ export default class ProductionREQ extends BasePage { alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); this.materilist.forEach((item) => { if (item.materialCode == alreadyList.materialCode) { - item.outNumber += alreadyList.amount; + item.outNumber = item.outNumber + alreadyList.amount; alreadyList.produceCode = item.produceCode; } }); @@ -227,12 +209,12 @@ export default class ProductionREQ extends BasePage { let addnumber = 0; this.list.forEach((item) => { if (item.materialCode == changeobj.materialCode) { - addnumber += parseFloat(changeobj.amount); + addnumber += parseFloat(item.amount ? item.amount : '0'); } }); this.materilist.forEach((item) => { if (item.materialCode == changeobj.materialCode) { - item.outNumber = addnumber; + item.outNumber = item.returnoutNumber + addnumber; } }); } diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index c8d3ef7..786dc85 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -19,10 +19,9 @@ - - + @@ -113,7 +112,7 @@ 实际收货: - + 删除 @@ -245,31 +244,31 @@ export default class receivePO extends BasePage { if (model.getidcardcode == '200') { let alreadyList = model.byidcardobj; alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); + let id = alreadyList.userDefined1.split('-')[4]; + this.list.forEach((item) => { + if (item.id == id) { + item.realityNumber += alreadyList.planNumber; + } + }); this.receivedlist.push(alreadyList); - this.confirmNumber(); + //this.confirmNumber(); this.Idcard = ''; } } - confirmNumber() { + confirmNumber(changeobj) { let addNumber = 0; + let id = changeobj.userDefined1.split('-')[4]; this.receivedlist.forEach((item) => { - addNumber += parseFloat(item.planNumber ? item.planNumber : '0'); + if (item.userDefined1.split('-')[4] === id) { + addNumber += parseFloat(item.planNumber ? item.planNumber : '0'); + } + }); + this.list.forEach((item) => { + if (item.id === id) { + item.realityNumber = item.realityaddNumber + addNumber; + } }); - - this.list[0].realityNumber = this.realityaddNumber + addNumber; } - //收货按钮 - // onPass(item) { - // this.clickitem = item; - // this.show = true; - // this.form3 = {}; - // this.productCodeTypeList = {}; - // this.waCodeTypeList = {}; - // this.waCodeList = []; - // this.showshow = true; - // this.bimWl = this.waylist[0]; - // this.selectway = true; - // } nopoup() { this.show = false; this.form3 = {}; @@ -312,24 +311,15 @@ export default class receivePO extends BasePage { }; await this.model.PurchaseOrderPda(query); let materilist = model.orderNoItemList; - this.materilist = materilist.map((item) => { + this.list = materilist.map((item) => { let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); return { ...item, handlematerialCode: newmaterialCode, + realityaddNumber: item.realityNumber, }; }); - this.list = []; - if (this.materilist.length) { - this.aimWl = this.materilist[0]; - this.list.push(this.materilist[0]); - this.procureCode = this.list[0].procureCode; - this.realityaddNumber = this.list[0].realityNumber; - } else { - this.aimWl = {} as OptionType; - } - //this.ProcureOrderAlready(); - //this.list = model.orderNoItemList; + this.receivedlist = []; } //提单按钮 @@ -351,25 +341,6 @@ export default class receivePO extends BasePage { this.query(); } } - //查询所有已经收货的信息 - async ProcureOrderAlready() { - let item = { - procureCode: this.procureCode, - factoryCode: session.FactoryCode, - }; - await this.model.selectOdsProcureOrderAlready(item); - if (model.Alreadycode == '200') { - let alreadyList = model.ProcureOrderAlreadylist; - this.receivedlist = alreadyList.map((item) => { - let newmsrmMater = item.materialCode.slice(item.materialCode.search(/[1-9]/)); - return { - ...item, - handlematerialCode: newmsrmMater, - }; - }); - //this.receivedlist = model.ProcureOrderAlreadylist; - } - } histroyItem: any = {}; barcode: any = ''; async selectProductlocCode(e: any) { @@ -394,13 +365,6 @@ export default class receivePO extends BasePage { } //完成送货单 async onSubmit() { - if (this.procureCode == '' || this.procureCode.length == 0) { - (this.$refs.uToast as any).show({ - title: '请输入采购单号查询', - type: 'default', - }); - return; - } if (this.areaCode == '') { (this.$refs.uToast as any).show({ title: '请先扫描或输入库区', @@ -423,6 +387,7 @@ export default class receivePO extends BasePage { return; } let filteredList = []; + let paramsList = []; if (this.receivedlist.length == 0) { (this.$refs.uToast as any).show({ title: '没有扫描标志卡收货', @@ -431,32 +396,38 @@ export default class receivePO extends BasePage { return; } else { filteredList = this.receivedlist.filter((item) => item.userDefined10 !== '1'); - filteredList.forEach((item) => { - item.userDefined6 = item.userDefined1; + paramsList = filteredList.map((item) => { + return { + userDefined5: item.userDefined5, + factoryCode: session.FactoryCode, + whCode: this.waCodeList.warehouseCode, + waCode: this.areaCode, + receiptNoCode: this.receiptNoCode, + planNumber: parseFloat(item.planNumber), + procureCode: item.procureCode, //包材采购单号, + userDefined6: item.userDefined1, //标识卡 + materialCode: item.materialCode, + materialDesc: item.materialDesc, //物料描述 + userDefined1: '0', + sn: item.sn, //托盘 + userDefined4: item.userDefined4, //标志卡 + }; }); - } - - let params = { - id: this.list[0].id, //采购单id - factoryCode: session.FactoryCode, - whCode: this.waCodeList.warehouseCode, //仓库编码 - waCode: this.areaCode, //库区 - receiptNoCode: this.receiptNoCode, //收货单 - poLine: this.list[0].userDefined3, //采购行 - createBy: session.loginName, - list: filteredList, - }; - await this.model.OnSubmit(params); - if (this.model.submitcode == '200') { - (this.$refs.uToast as any).show({ - title: '成功', - type: 'success', - }); - await this.query(); - this.receiptNoCode = ''; - this.Idcard = ''; - this.areaCode = ''; - this.waCodeList = {}; + // console.log('paramsList', paramsList); + await this.model.OnSubmit(paramsList); + if (this.model.submitcode == '200') { + (this.$refs.uToast as any).show({ + title: '成功', + type: 'success', + }); + this.receiptNoCode = ''; + this.receivedlist = []; + this.list = []; + this.Idcard = ''; + this.areaCode = ''; + this.waCodeList = {}; + this.query(); + } } } bookTypeChange(e: any) { @@ -469,9 +440,14 @@ export default class receivePO extends BasePage { //this.queryinformation(); //this.getlist(); } - delet(item, index) { + delet(deletobj: any, index: number) { this.receivedlist.splice(index, 1); - this.list[0].realityNumber -= item.planNumber; + let id = deletobj.userDefined1.split('-')[4]; + this.list.forEach((item) => { + if (item.id == id) { + item.realityNumber -= deletobj.planNumber; + } + }); (this.$refs.uToast as any).show({ title: '删除成功', type: 'success', diff --git a/src/pages/wms/Raw/ReceivePO/model.ts b/src/pages/wms/Raw/ReceivePO/model.ts index 59c6ef8..a3576c9 100644 --- a/src/pages/wms/Raw/ReceivePO/model.ts +++ b/src/pages/wms/Raw/ReceivePO/model.ts @@ -98,7 +98,7 @@ export class receivePO extends VuexModule { submitmsg: any = ''; @MutationAction async OnSubmit(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceivePO.addOrderCard, data); + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.addOrderCardX, data); const submitcode = result.code; const submitmsg = result.msg; return { diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue index cca16b5..b6290e9 100644 --- a/src/pages/wms/Raw/ReceiveSRM/index.vue +++ b/src/pages/wms/Raw/ReceiveSRM/index.vue @@ -27,14 +27,6 @@ {{ waCodeList.warehouseName }} - - - - - - - - @@ -89,7 +81,7 @@ - + @@ -126,7 +118,7 @@ 实际收货: - + 删除 @@ -176,33 +168,6 @@ export default class receiveSRM extends BasePage { czNumber = ''; Idcard = ''; areaCode = ''; - // receivedlist=[{ - // orderStatus:'1', - // procureCode:'111', - // materialCode:'ddewcc', - // materialDesc:'ewdcxw', - // siteCode:'1061', - // planNumber:'1', - // realityNumber:'1' - // },{ - // orderStatus:'1', - // procureCode:'111', - // materialCode:'ddewcc', - // materialDesc:'ewdcxw', - // siteCode:'1061', - // planNumber:'1', - // realityNumber:'1' - // }, - // { - // orderStatus:'1', - // procureCode:'111', - // materialCode:'ddewcc', - // materialDesc:'ewdcxw', - // siteCode:'1061', - // planNumber:'1', - // realityNumber:'1' - // } - // ] whList: any = []; waCodeList: any = {}; show = false; @@ -229,14 +194,6 @@ export default class receiveSRM extends BasePage { bimWl: any = {}; selectway = true; showshow = true; - // remove: any = {}; - // async onReady() { - // await this.model.queryLocation(); - // this.remove = this.model.WlList[0]; - // } - // selectItem(e: any) { - // this.remove = e.pickerName; - // } procureCode: any = ''; userDefined5: any = ''; materialCode: any = ''; @@ -268,18 +225,6 @@ export default class receiveSRM extends BasePage { const today = dayjs().format('YYYYMMDDHHmmss'); this.receiptNoCode = `sn${today}`; } - //收货按钮 - // onPass(item) { - // this.clickitem = item; - // this.show = true; - // this.form3 = {}; - // this.productCodeTypeList = {}; - // this.waCodeTypeList = {}; - // this.waCodeList = []; - // this.showshow = true; - // this.bimWl = this.waylist[0]; - // this.selectway = true; - // } nopoup() { this.show = false; this.form3 = {}; @@ -399,67 +344,17 @@ export default class receiveSRM extends BasePage { }; await this.model.PurchaseOrderPda(query); let prodlist = model.orderNoItemList; - this.prodlist = prodlist.map((item) => { + this.list = prodlist.map((item) => { let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); return { ...item, handlematerialCode: newmaterialCode, + realityaddNumber: item.realityNumber, }; }); - //this.list = []; - if (this.prodlist.length) { - this.prodobj = this.prodlist[0]; - //this.list.push(this.materilist[0]); - this.procureCode = this.prodobj.procureCode; - } else { - this.prodobj = {} as OptionType; - } - this.querybyprod(); this.receivedlist = []; - //this.ProcureOrderAlready(); - //this.list = model.orderNoItemList; } - async querybyprod() { - console.log(session); - // if (this.procureCode == '' || this.procureCode.length == 0) { - // (this.$refs.uToast as any).show({ - // title: '请输入rfid', - // type: 'default', - // }); - // return; - // } - this.aimWl = {} as OptionType; - let query = { - // materialCode: this.aimWl.value ? this.aimWl.value : '', - // userDefined5: this.userDefined5, - id: this.prodobj.id, - //procureCode: this.prodobj.procureCode, - - //this.materialCode, - factoryCode: session.FactoryCode, - }; - await this.model.PurchaseOrderPda(query); - let materilist = model.orderNoItemList; - this.materilist = materilist.map((item) => { - let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); - return { - ...item, - handlematerialCode: newmaterialCode, - }; - }); - this.list = []; - if (this.prodlist.length) { - this.aimWl = this.materilist[0]; - this.list.push(this.materilist[0]); - this.realityaddNumber = this.list[0].realityNumber; - this.procureCode = this.list[0].procureCode; - } else { - this.prodobj = {} as OptionType; - } - //this.ProcureOrderAlready(); - //this.list = model.orderNoItemList; - } //送货单提单 async tidandelivery() { if (this.userDefined5 == '' || this.userDefined5.length == 0) { @@ -501,8 +396,14 @@ export default class receiveSRM extends BasePage { if (model.getidcardcode == '200') { let alreadyList = model.byidcardobj; alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); + let id = alreadyList.userDefined1.split('-')[4]; + this.list.forEach((item) => { + if (item.id == id) { + item.realityNumber += alreadyList.planNumber; + } + }); this.receivedlist.push(alreadyList); - this.confirmNumber(); + //this.confirmNumber(); this.Idcard = ''; } } @@ -521,13 +422,6 @@ export default class receiveSRM extends BasePage { } //完成送货单 async onSubmit() { - if (Object.keys(this.prodobj).length == 0) { - (this.$refs.uToast as any).show({ - title: '请选择采购单或者用送货单去查询', - type: 'default', - }); - return; - } if (this.areaCode == '') { (this.$refs.uToast as any).show({ title: '请先扫描或输入库区', @@ -550,6 +444,7 @@ export default class receiveSRM extends BasePage { return; } let filteredList = []; + let paramsList = []; if (this.receivedlist.length == 0) { (this.$refs.uToast as any).show({ title: '没有扫描标志卡收货', @@ -558,75 +453,71 @@ export default class receiveSRM extends BasePage { return; } else { filteredList = this.receivedlist.filter((item) => item.userDefined10 !== '1'); - filteredList.forEach((item) => { - item.userDefined6 = item.userDefined1; + paramsList = filteredList.map((item) => { + return { + userDefined5: item.userDefined5, + factoryCode: session.FactoryCode, + whCode: this.waCodeList.warehouseCode, + waCode: this.areaCode, + receiptNoCode: this.receiptNoCode, + planNumber: parseFloat(item.planNumber), + procureCode: item.procureCode, //包材采购单号, + userDefined6: item.userDefined1, //标识卡 + materialCode: item.materialCode, + materialDesc: item.materialDesc, //物料描述 + userDefined1: '1', + sn: item.sn, //托盘 + userDefined4: item.userDefined4, //标志卡 + }; }); + //console.log('提交数据----',paramsList); + await this.model.OnSubmit(paramsList); + if (this.model.submitcode == '200') { + (this.$refs.uToast as any).show({ + title: model.submitmsg, + type: 'primary', + }); + this.receiptNoCode = ''; + this.receivedlist = []; + this.list = []; + this.Idcard = ''; + this.areaCode = ''; + this.waCodeList = {}; + this.query(); + } } + } + // bookprodeChange(e: any) { + // this.prodobj = e.pickerName; + // this.procureCode = this.prodobj.procureCode; + // this.querybyprod(); + // this.receivedlist = []; + // } - let params = { - id: this.prodobj.id, //采购单id - factoryCode: session.FactoryCode, - whCode: this.waCodeList.warehouseCode, //仓库编码 - waCode: this.areaCode, //库区 - receiptNoCode: this.receiptNoCode, //收货单 - poLine: this.prodobj.userDefined3, //采购行 - createBy: session.loginName, - list: filteredList, //标志卡 - }; - //console.log('提交数据----',params); - await this.model.OnSubmit(params); - if (this.model.submitcode == '200') { - (this.$refs.uToast as any).show({ - title: model.submitmsg, - type: 'primary', - }); - this.receiptNoCode = ''; - this.receivedlist = []; - this.Idcard = ''; - this.areaCode = ''; - this.waCodeList = {}; - this.query(); - } - } - bookprodeChange(e: any) { - this.prodobj = e.pickerName; - this.procureCode = this.prodobj.procureCode; - this.querybyprod(); - this.receivedlist = []; - } - bookTypeChange(e: any) { - this.aimWl = e.pickerName; - this.list = []; - this.list.push(e.pickerName); - this.procureCode = this.list[0].procureCode; - this.realityaddNumber = this.list[0].realityNumber; - // - //this.queryinformation(); - //this.getlist(); - } - bookTypeChangeway(e) { - //this.showshow = true; - this.bimWl.value = e.pickerName.value; - console.log(e); - // if (e.pickerName.value == '0') { - // this.selectway = false; - // } else { - // this.selectway = true; - // } - } - confirmNumber() { + confirmNumber(changeobj) { let addNumber = 0; + let id = changeobj.userDefined1.split('-')[4]; this.receivedlist.forEach((item) => { - addNumber += parseFloat(item.planNumber ? item.planNumber : '0'); + if (item.userDefined1.split('-')[4] === id) { + addNumber += parseFloat(item.planNumber ? item.planNumber : '0'); + } + }); + this.list.forEach((item) => { + if (item.id === id) { + item.realityNumber = item.realityaddNumber + addNumber; + } }); - - this.list[0].realityNumber = this.realityaddNumber + addNumber; //console.log('1239999999',this.list[0].realityNumber) } - delet(item, index: number) { + delet(deletobj: any, index: number) { this.receivedlist.splice(index, 1); - this.list[0].realityNumber -= item.planNumber; + let id = deletobj.userDefined1.split('-')[4]; + this.list.forEach((item) => { + if (item.id == id) { + item.realityNumber -= deletobj.planNumber; + } + }); (this.$refs.uToast as any).show({ title: '删除成功', type: 'success', diff --git a/src/pages/wms/Raw/ReceiveSRM/model.ts b/src/pages/wms/Raw/ReceiveSRM/model.ts index 4501428..7b4b498 100644 --- a/src/pages/wms/Raw/ReceiveSRM/model.ts +++ b/src/pages/wms/Raw/ReceiveSRM/model.ts @@ -113,7 +113,7 @@ export class receiveSRM extends VuexModule { submitmsg: any = ''; @MutationAction async OnSubmit(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.addOrderCard, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.addOrderCardX, data); const submitcode = result.code; const submitmsg = result.msg; return { diff --git a/src/utils/url.ts b/src/utils/url.ts index 5f063e2..4bc0f2f 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -117,6 +117,7 @@ export const url = { selectOrderCard: qianzhuione + '/wms/WmsToWCSmission/selectOrderCard', listTableCK: qianzhuione + '/wms/WmsToWCSmission/listTableCK', SweepMaterialCardSC: qianzhuione + '/wms/WmsToWCSmission/SweepMaterialCardSC', + addOrderCardX: qianzhuione + '/wms/WmsToWCSmission/addOrderCardX', }, ReceiveSRM: { // 手持 －－包材采购单采购收货查询 @@ -138,6 +139,7 @@ export const url = { listTableCK: qianzhuione + '/wms/WmsToWCSmission/listTableCK', selectOrderCard: qianzhuione + '/wms/WmsToWCSmission/selectOrderCard', addOrderCard: qianzhuione + '/wms/WmsToWCSmission/addOrderCard', + addOrderCardX: qianzhuione + '/wms/WmsToWCSmission/addOrderCardX', }, PurchaseWHPO: { // 手持 －－包材采购单采购收货查询