wms包材修改&正式测试部署方案修改

master
guoshuang 1 year ago
parent 7c34e9f161
commit 48899291a0

@ -0,0 +1,21 @@
{
"absBase64Code":"",
"appId":"ALIPUBEEC9E24231702",
"appKey":"ALIPUBEEC9E24231702_ANDROID",
"base64Code":"",
"packageName":"lanju.test",
"rootPath":"mpaas/android/ALIPUBEEC9E24231702-default",
"v6Base64Code":"",
"workspaceId":"default",
"pushPort":"443",
"pushGW":"push.mpaas.cn-hangzhou.aliyuncs.com",
"rpcGW":"https://mgw.mpaas.cn-hangzhou.aliyuncs.com/mgw.htm",
"logGW":"https://mdap.mpaas.cn-hangzhou.aliyuncs.com",
"mpaasapi":"https://mpaasapi.mpaas.cn-hangzhou.aliyuncs.com/mgw.htm",
"mrtcserver":"wss://mrtc.mpaas.cn-hangzhou.aliyuncs.com/ws",
"mdc":"https://mdc.mpaas.cn-hangzhou.aliyuncs.com",
"mpaasConfigVersion":"V_1.0",
"mpaasConfigEnv":"ONEX_CLOUD",
"mpaasConfigPluginExpired":"",
"mpaasConfigLicense":"kwnoKUtCG0Ve+XYmxk8RLonTSXSVgd11g6x0XqXPWpQoef8BJEKJKzPE3efBdRTPe8002uCMa6j4DaZut+sjD/mBAeRtz1J93akhlgJD5RHPDe9Ck/EOjzqn/r3O17ensHUo/xy+Dhcvk2xn+yLjSGJOzjLyE3bi/NjCtdSXEHOSAYnguUgQfjDwv1XII0dl9ITzeOXyKzFWgj0RYvmQeTrV4h1WHJ33jfC1pIA5dj4vER5BMx82oW5je4v0IFuC7vfa9uBZhVVrT8O4U7W+KN1y3rXCAKfciHwHB7GPnsHCBfKEVB/Eh5H64CRSkd4rUkRWXSuIsljqABNq/X9Wnw=="
}

@ -142,10 +142,10 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///******************
version = '0.0.61';//
//version = '0.0.58';//
version = '0.0.62';//
//version = '0.0.2';//
//*************** false true ****************
isTest = false;
//isTest = true;
compareVersion(version1: any, version2: any) {
//version1 1 &&& version2 -1
@ -174,29 +174,31 @@ export default class LoginPage extends BasePage {
async checkupdate() {
try {
await this.model.checkupdate();
console.log('3333333',this.model.checkversion)
if(this.model.checkversion != undefined){
const fileName = this.model.checkversion.fileName;
const isTestUpdate = fileName.includes('test'); // fileName'test'
// const isTestUpdate = fileName.includes('test'); // fileName'test'
const queryversion = this.model.checkversion.version;
//const queryversion = this.checkversion.Version.match(/\d+\.\d+\.\d+/)[0];
let versionNumber = this.compareVersion(this.version, queryversion); //this.version, queryversion
if (versionNumber == -1) {
// test true isTestUpdatetrueisTestUpdatefalse
// test falseisTestUpdatetrueisTestUpdatefalse
if (isTestUpdate && !this.isTest) {
//
console.log('Test version update available, but running in production environment.');
uni.navigateTo({
url: page.shouye,
});
return;
} else if (!isTestUpdate && this.isTest) {
//
console.log('Production version update available, but running in test environment.');
uni.navigateTo({
url: page.shouye,
});
return;
}
// if (isTestUpdate && !this.isTest) {
// //
// console.log('Test version update available, but running in production environment.');
// uni.navigateTo({
// url: page.shouye,
// });
// return;
// } else if (!isTestUpdate && this.isTest) {
// //
// console.log('Production version update available, but running in test environment.');
// uni.navigateTo({
// url: page.shouye,
// });
// return;
// }
//
uni.showModal({
@ -240,6 +242,12 @@ export default class LoginPage extends BasePage {
// icon: 'none',
// });
}
}
else{
uni.navigateTo({
url: page.shouye,
});
}
} catch (e) {
console.log('error', e);
}

@ -19,7 +19,7 @@
</view>
</view>
<!-- 订单 -->
<u-form-item label="物料编码">
<u-form-item label="物料描述">
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="materialDesc" valKey="value" :val="aimWl.value" :options="materilistonly" />
<!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
</u-form-item>

@ -19,7 +19,7 @@
</view>
</view>
<!-- 订单 -->
<u-form-item label="物料编码">
<u-form-item label="物料描述">
<!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" />
</u-form-item>
@ -162,7 +162,33 @@
</u-popup>
<view v-if="show" class="mask"></view>
</view>
<u-toast ref="uToast" />
<view>
<u-popup v-model="singshow" mode="center" width="580rpx" height="500rpx">
<view class="form4">
<view class="poupitem">
<view class="pouptitle">已登记数量</view>
<u-input disabled class="poupcontent" :clearable="false" v-model="operationNumber" placeholder="" style="overflow: hidden;background-color: #ddd;" />
</view>
<view class="poupitem">
<view class="pouptitle">未登记数量</view>
<u-input disabled class="poupcontent" :clearable="false" v-model="nooperationNumber" placeholder="" style="overflow: hidden;background-color: #ddd;" />
</view>
<view class="poupitem">
<view class="pouptitle">登记数量</view>
<u-input class="poupcontent" type="number" :clearable="false" v-model="czNumber" placeholder="" style="overflow: hidden" />
</view>
<view class="poupbutton" style="margin-top: 10px">
<div>
<u-button style="width: 100px; height: 35px" @click="onOksing" size="mini" type="primary">确定</u-button>
</div>
<div>
<u-button style="width: 100px; height: 35px" size="mini" type="error" @click="nopoupsing"></u-button>
</div>
</view>
</view>
</u-popup>
<view v-if="singshow" class="mask"></view>
</view>
</view>
</template>
<script lang="ts">
@ -185,6 +211,9 @@ export default class receivePO extends BasePage {
model = model;
list: any = [];
receivedlist: any = [];
operationNumber = 0;
nooperationNumber = 0;
czNumber = 0;
// receivedlist=[{
// orderStatus:'1',
// procureCode:'111',
@ -214,6 +243,7 @@ export default class receivePO extends BasePage {
// ]
whList: any = [];
show = false;
singshow = false;
form3: any = {};
aimWl = {} as OptionType;
materilist = [];
@ -285,6 +315,12 @@ export default class receivePO extends BasePage {
this.form3 = {};
this.productCodeTypeList = {};
}
nopoupsing(){
this.singshow = false;
this.operationNumber =0;
this.nooperationNumber = 0;
this.czNumber = 0;
}
//
async onOk() {
console.log(this.form3);
@ -489,7 +525,21 @@ export default class receivePO extends BasePage {
this.selectway = true;
}
}
//
async SignIn() {
let params = {
factoryCode:session.FactoryCode,
id:this.list[0].id,
}
await this.model.selectArrivalRegistration(params);
if(this.model.singcode == '200'){
this.singshow = true;
this.operationNumber = model.singobj.operationNumber;
this.nooperationNumber =model.singobj.planNumber - model.singobj.operationNumber
}
}
//
async onOksing() {
if (this.procureCode == '' || this.procureCode.length == 0) {
(this.$refs.uToast as any).show({
title: '请输入采购单号',
@ -500,13 +550,18 @@ export default class receivePO extends BasePage {
let params = {
factoryCode: session.FactoryCode,
procureCode: this.procureCode,
id: this.list[0].id,
czNumber:this.czNumber,
lastUpdateBy: session.loginName,
};
//console.log('99999',params);
await this.model.ArrivalRegistration(params);
if (this.model.Arrivalcode == '200') {
(this.$refs.uToast as any).show({
title: '成功',
type: 'success',
});
this.nopoupsing();
}
}
}
@ -830,6 +885,25 @@ export default class receivePO extends BasePage {
}
}
}
.form4 {
padding: 20rpx;
//border-radius: 10rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
.poupitem {
display: flex;
flex-direction: row;
justify-content: space-around;
margin: 20rpx;
.pouptitle {
width: 40%;
white-space: nowrap;
}
.poupcontent {
border: 1px solid rgba(128, 128, 128, 0.2);
}
}
}
.poupbutton {
display: flex;
justify-content: space-around;

@ -90,6 +90,15 @@ export class receivePO extends VuexModule {
Arrivalcode,
};
}
singcode: any = '';
singobj: any = {};
@MutationAction
async selectArrivalRegistration(data: any) {
const result: any = await http.post(url.lanjuwms.raw.ReceivePO.selectArrivalRegistration, data);
const singcode = result.code;
const singobj = result.data;
return { singcode, singobj };
}
}
export default getModule(receivePO);

@ -26,7 +26,9 @@ http.interceptors.request.use(
// if (config.url.includes('/api')) {
// config.baseURL = 'http://192.168.202.23:5001';
// } else {
// config.baseURL = 'http://192.168.202.34:30000';
// config.baseURL = 'http://192.168.202.34:30000'
// //'http://192.168.202.20:9000' ///测试
// //'http://192.168.202.34:30000'; //正式
// }
// 所有请求默认提示加载中
if (!loading) {

@ -99,6 +99,7 @@ export const url = {
selectOdsProcureOrderAlready: qianzhuione + '/wms/WmsToWCSmission/selectOdsProcureOrderAlready',
PurchaseOrderdeliPdaConfirm: qianzhuione + '/wms/WmsToWCSmission/PurchaseOrderdeliPdaConfirm',
ArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistration',
selectArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/selectArrivalRegistration',
},
PurchaseWHPO: {
// 手持 --包材采购单采购收货查询

Loading…
Cancel
Save