From b8093a2bc3c9534afa04e2160a38fdb2eabf48e0 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Mon, 16 Jun 2025 09:43:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=94=B9=E4=B8=BA103?= =?UTF-8?q?=E6=9A=82=E6=94=B6=E3=80=81=E6=96=B0=E5=A2=9E105=E8=BF=87?= =?UTF-8?q?=E8=B4=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/wms/Raw/ReceivePO/index.vue | 82 +++++++++++++++++++++++- src/pages/wms/Raw/ReceivePO/model.ts | 13 ++++ src/pages/wms/Raw/ReceiveSRM/index.vue | 88 ++++++++++++++++++++++++-- src/pages/wms/Raw/ReceiveSRM/model.ts | 13 ++++ src/utils/url.ts | 2 + 5 files changed, 190 insertions(+), 8 deletions(-) diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index 03e4a5f..d08ad90 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -137,11 +137,14 @@ - - 确认收货 + + 103暂收 + + + 105过账 - + 返回 @@ -157,6 +160,7 @@ import jPicker from '@/components/J-Picker/jPicker.vue'; import model from './model'; import { session } from '@/store/modules/session'; import dayjs from 'dayjs'; +import { removeLeadingZeros } from '@/utils/tool'; interface OptionType { label: string; value: string; @@ -233,6 +237,13 @@ export default class receivePO extends BasePage { oldprodlist: any = []; oncefouces = true; twofouces = false; + isDisabled105 = false; + showStatus105 = false; + contentStatus150 = ''; + qualityStatusCo = { + Y: '检验合格', + N: '检验不合格', + }; async onReady() { //await this.model.Stashlist(); //this.whList = model.DictTypeList; @@ -516,6 +527,71 @@ export default class receivePO extends BasePage { type: 'success', }); } + + /** + * 105过账按钮 + * **/ + async handelSubmit105() { + this.isDisabled105 = true; + const list = this.list; + let params: any = []; + if (list.length > 0) { + for (const item of list) { + if (!item.orderStatus || item.orderStatus === '0') { + (this.$refs.uToast as any).show({ + title: '请先完成收货！', + type: 'default', + duration: 3000, + }); + this.isDisabled105 = false; + return; + } + + //待检、不合格不在手持机上过账 + if (!item.qualityStatus || item.qualityStatus === 'N') { + this.contentStatus150 = '采购单号：' + item.procureCode + '，物料编码：' + removeLeadingZeros(item.materialCode) + '，' + (this.qualityStatusCo[item.qualityStatus] || '未检验'); + this.showStatus105 = true; + this.isDisabled105 = false; + return; + } + + //rawOrderInId不为空 + if (item.rawOrderInId) { + params.push({ id: item.rawOrderInId }); + } + } + + if (params.length > 0) { + //去重 + params = params.filter((item: any, index: any, self: any) => self.findIndex((t: { [x: string]: any }) => t['id'] === item['id']) === index); + + await this.model.sap105temporarilyCollected(params); + this.isDisabled105 = false; + if (this.model.sap105code + '' === '200') { + (this.$refs.uToast as any).show({ + title: this.model.sap105msg, + type: 'primary', + duration: 6000, + }); + } + await this.query(); + } else { + this.isDisabled105 = false; + (this.$refs.uToast as any).show({ + title: '无可过账数据', + type: 'default', + duration: 3000, + }); + } + } else { + this.isDisabled105 = false; + (this.$refs.uToast as any).show({ + title: '未选择数据', + type: 'default', + duration: 3000, + }); + } + } } diff --git a/src/pages/wms/Raw/TemporarilyCollected/model.ts b/src/pages/wms/Raw/TemporarilyCollected/model.ts new file mode 100644 index 0000000..d147264 --- /dev/null +++ b/src/pages/wms/Raw/TemporarilyCollected/model.ts @@ -0,0 +1,14 @@ +import http from '@/utils/request'; +import { url } from '@/utils/url'; + +export function getWmsRawOrderInListToPda(data: any): Promise { + return http.get(url.lanjuwms.raw.TemporarilyCollectedPo.getWmsRawOrderInListToPda, { + params: data, + }); +} + +export function sap105temporarilyCollected(data: any): Promise { + return http.get(url.lanjuwms.raw.TemporarilyCollectedPo.sap105temporarilyCollected, { + params: data, + }); +} diff --git a/src/utils/page.ts b/src/utils/page.ts index 71b309b..6cf81dc 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -49,5 +49,6 @@ export const page = { ArrivalRecord: '/pages/wms/Raw/ArrivalRecord/index', ProductionRecord: '/pages/wms/product/ProductionRecord/index', SapStock: '/pages/wms/Raw/SapStock/index', + TemporarilyCollected: '/pages/wms/Raw/TemporarilyCollected/index', }, }; diff --git a/src/utils/url.ts b/src/utils/url.ts index 699e9bc..7489950 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -197,6 +197,10 @@ export const url = { SapStockPo: { getSapStockList: qianzhuione + '/wms/matetowsn/saplist', }, + TemporarilyCollectedPo: { + getWmsRawOrderInListToPda: qianzhuione + '/wms/odsRawOrderIn/wmsRawOrderInListToPda', + sap105temporarilyCollected: qianzhuione + '/wms/odsRawOrderIn/sap105temporarilyCollected', + }, }, WhiteManagement: { WhiteInstorage: { From f67b0062b5f242fe6634c2c481d9a5eb987876cf Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Mon, 16 Jun 2025 09:45:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?sap=E5=BA=93=E5=AD=98=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/wms/Raw/SapStock/index.vue | 119 +++++++++++++++++---------- src/pages/wms/Raw/SapStock/model.ts | 35 ++------ 2 files changed, 82 insertions(+), 72 deletions(-) diff --git a/src/pages/wms/Raw/SapStock/index.vue b/src/pages/wms/Raw/SapStock/index.vue index d0ec491..e006b11 100644 --- a/src/pages/wms/Raw/SapStock/index.vue +++ b/src/pages/wms/Raw/SapStock/index.vue @@ -14,25 +14,21 @@ - - - - - - - - - - - - + + + + + + + + + + + - + - - - 查询 @@ -48,22 +44,16 @@ import { Component } from 'vue-property-decorator'; import jPicker from '@/components/J-Picker/jPicker.vue'; import LjRowList from '@/components/lanju/lj-list-row/index.vue'; import LjListRow from '@/components/lanju/lj-list-row/index.vue'; -import model from './model'; +import { getSapStockList } from './model'; import { removeLeadingZeros } from '@/utils/tool'; import ljPagination from '@/components/lanju/lj-pagination/index.vue'; interface QueryParamsPo { matnr: string; maktx: string; - pdaSearch: '1'; - pageNum: 1; - pageSize: 10; -} - -interface SapStockPo { - materialCode: string; - materialDesc: string; - storageAmount: string; + pdaSearch: string; + pageNum: number; + pageSize: number; } @Component({ @@ -76,11 +66,10 @@ interface SapStockPo { PageHead, }, }) -export default class sapStockPo extends BasePage implements SapStockPo { +export default class sapStockPo extends BasePage { materialCode: string; materialDesc: string; storageAmount: string; - model = model; queryParams: QueryParamsPo = { matnr: undefined, maktx: undefined, @@ -90,7 +79,32 @@ export default class sapStockPo extends BasePage implements SapStockPo { }; sapStockList: any[] = []; total = 0; - + listHeight = 500; + onReady() { + //等待页面加载完成 + this.$nextTick(() => { + let buttonTop = 0; + //获取底部按钮信息 + const query = uni.createSelectorQuery().in(this); + query + .select('#button') + .boundingClientRect((data) => { + //获取底部按钮到顶部距离 + buttonTop = data.top; + }) + .exec(); + //获取列表信息 + query + .select('#list') + .boundingClientRect((data) => { + //获取列表到顶部距离 + const listTop = data.top; + // + this.listHeight = buttonTop - listTop - 10; + }) + .exec(); + }); + } async search() { this.queryParams.pageNum = 1; this.getList(); @@ -106,10 +120,11 @@ export default class sapStockPo extends BasePage implements SapStockPo { this.getList(); } - async getList() { - await this.model.getSapStockList(this.queryParams); - this.sapStockList = this.model.rows; - this.total = this.model.total; + getList() { + getSapStockList(this.queryParams).then((res) => { + this.sapStockList = res.rows; + this.total = res.total; + }); } removeLastZeros(data: any) { @@ -118,6 +133,16 @@ export default class sapStockPo extends BasePage implements SapStockPo { } return data; } + //滚动到底部 + onScrollToLower() { + if (this.total === this.sapStockList.length) { + return; + } + this.queryParams.pageNum = this.queryParams.pageNum + 1; + getSapStockList(this.queryParams).then((res) => { + this.sapStockList = this.sapStockList.concat(res.rows); + }); + } } @@ -134,16 +159,26 @@ export default class sapStockPo extends BasePage implements SapStockPo { } } -.scroll { - height: 100%; - overflow: scroll; +.list { + background-color: #fff; + margin-top: 20rpx; + padding: 20rpx 20rpx 25rpx; + border-radius: 10rpx; + box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2); + color: #8d8989; - .form2 { - background-color: #fff; - padding: 20rpx 20rpx 25rpx; - border-radius: 10rpx; - box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2); - color: #8d8989; + .list-item { + padding: 20rpx; + } + + /* 奇数行背景色 */ + .list-item:nth-child(odd) { + background-color: #ffffff; + } + + /* 偶数行背景色 */ + .list-item:nth-child(even) { + background-color: #f5f5f5; } } diff --git a/src/pages/wms/Raw/SapStock/model.ts b/src/pages/wms/Raw/SapStock/model.ts index 612cc9e..575ee23 100644 --- a/src/pages/wms/Raw/SapStock/model.ts +++ b/src/pages/wms/Raw/SapStock/model.ts @@ -1,33 +1,8 @@ -import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; -import store from '@/store'; import http from '@/utils/request'; import { url } from '@/utils/url'; -@Module({ - namespaced: true, - dynamic: true, - store, - name: 'page.raw.sapStockPo', -}) -export class sapStockPo extends VuexModule { - WlList = []; - rows: any = []; - total = 0; - @MutationAction - async getSapStockList(data: any): Promise<{ rows: any; total: number }> { - const result: any = await http.get(url.lanjuwms.raw.SapStockPo.getSapStockList, { - params: data, - }); - let rows: any; - let total: number; - if (result.total > 0) { - rows = result.rows; - total = result.total; - } else { - rows = []; - total = 0; - } - return { rows, total }; - } -} -export default getModule(sapStockPo); +export function getSapStockList(data: any): Promise { + return http.get(url.lanjuwms.raw.SapStockPo.getSapStockList, { + params: data, + }); +} From 97f65c17a9c0f54a5d05320808a8b986cbacd72c Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Mon, 16 Jun 2025 09:46:44 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index c27b3bc..4e43e41 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.180'; //正式版本号 + version = '0.0.182'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; From f80d61c38300b6162c6608e54aeab5f6b3154967 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 2 Jul 2025 11:08:03 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 4e43e41..545d789 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.182'; //正式版本号 + version = '0.0.183'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; From 105b50b13beec267162aae4129548ce38703e6a7 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 2 Jul 2025 11:09:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9C=AA=E6=9F=A5=E8=AF=A2=E5=87=BA=E6=95=B0=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/wms/Raw/SapStock/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/pages/wms/Raw/SapStock/index.vue b/src/pages/wms/Raw/SapStock/index.vue index e006b11..f991ac7 100644 --- a/src/pages/wms/Raw/SapStock/index.vue +++ b/src/pages/wms/Raw/SapStock/index.vue @@ -34,6 +34,7 @@ + @@ -122,6 +123,14 @@ export default class sapStockPo extends BasePage { getList() { getSapStockList(this.queryParams).then((res) => { + if (res.total === 0) { + uni.showModal({ + title: '提示', + content: '未查询到该物料，或该物料库存为0', + confirmText: '确认', + showCancel: false, + }); + } this.sapStockList = res.rows; this.total = res.total; }); From 08418b46e914a94296d315299acf6098942fb018 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 14 Aug 2025 10:12:04 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=99=E6=A0=B7?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/quality/ProductSample/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/quality/ProductSample/index.vue b/src/pages/quality/ProductSample/index.vue index 83149b9..d62462f 100644 --- a/src/pages/quality/ProductSample/index.vue +++ b/src/pages/quality/ProductSample/index.vue @@ -52,7 +52,7 @@ export default class ProductSample extends BasePage { queryDate: undefined, }; list: any = []; - + userinfo: any = uni.getStorageSync('userinfo'); clear() { this.checkTime = null; } @@ -81,6 +81,8 @@ export default class ProductSample extends BasePage { sampleTime: new Date(), sampleNum: '1盒', sampleAddress: '成品留样室', + sampleUserCode: this.userinfo.userName, + sampleUserName: this.userinfo.nickName, }); if (this.model.confirmCode === 200) { await this.getList(); From 64e86fa6d9a70c8b0f98ff3ba24b6d23c3ac1ef4 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 14 Aug 2025 11:17:39 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 545d789..6ea8b74 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.183'; //正式版本号 + version = '0.0.184'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true;