diff --git a/src/pages.json b/src/pages.json index ed59125..147037a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -687,6 +687,14 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/TemporarilyCollected/index", + "style": { + "navigationBarTitleText": "105过账", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index c27b3bc..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.180'; //正式版本号 + version = '0.0.184'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; 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(); 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 242b9cf..7489950 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -122,6 +122,7 @@ export const url = { listTableCK: qianzhuione + '/wms/WmsToWCSmission/listTableCK', SweepMaterialCardSC: qianzhuione + '/wms/WmsToWCSmission/SweepMaterialCardSC', addOrderCardX: qianzhuione + '/wms/WmsToWCSmission/addOrderCardX', + sap105temporarilyCollected: qianzhuione + '/wms/odsRawOrderIn/sap105temporarilyCollected', }, ReceiveSRM: { // 手持 --包材采购单采购收货查询 @@ -150,6 +151,7 @@ export const url = { selectCardList: qianzhuione + '/wms/WmsToWCSmission/selectCardList', addOrderCardXnew: qianzhuione + '/wms/WmsToWCSmission/addOrderCardXNew', upbatCardXNew: qianzhuione + '/wms/WmsToWCSmission/upbatCardXNew', + sap105temporarilyCollected: qianzhuione + '/wms/odsRawOrderIn/sap105temporarilyCollected', }, PurchaseWHPO: { // 手持 --包材采购单采购收货查询 @@ -195,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: {