Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

包材领料&&到货调整

Browse Source
master
guoshuang 9 months ago
parent 32f78bd5cc
commit 73c95af284
3 changed files with 63 additions and 192 deletions
Show Stats Download Patch File Download Diff File

2
src/pages/login/login/index.vue
Unescape Escape View File

@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///********版本号修改区域**********
version = '0.0.110'; //正式版本号
version = '0.0.111'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;

241
src/pages/wms/Raw/ArrivalRegistration/index.vue
Unescape Escape View File

@ -18,19 +18,15 @@
<u-button type="primary" @click="tidandelivery">提单</u-button>
</view>
</view>
<u-form-item label="采购单">
<!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
<jPicker sureColor="#ff0000" @bindpicker="bookprodeChange" showKey="procureCode" valKey="procureCode" :val="prodobj.procureCode" :options="prodlist" />
<u-form-item label="物料编码">
<jPicker sureColor="#ff0000" @bindpicker="selectProductCodeType" showKey="value" valKey="value" :val="bimWl.value" :options="reducelist" />
</u-form-item>
<!-- 订单 -->
<u-form-item label="物料描述">
<!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
<jPicker sureColor="#ff0000" :showCode="true" @bindpicker="bookTypeChange" duoyukey="procureCode" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" />
<u-input border height="50" placeholder="" disabled v-model="bimWl.label" />
</u-form-item>
<u-form-item label="采购单号">
<jPicker sureColor="#ff0000" @bindpicker="selectprodCodeType" showKey="value" valKey="value" :val="prodobj.value" :options="materilist" />
</u-form-item>
<!-- <view class="creatshow">
<u-button class="buttonshow" type="primary" @click="generate">生成收货单号</u-button>
<u-input border placeholder="" class="inputshow" disabled v-model="receiptNoCode" />
</view> -->
</u-form>
<view class="matshow">
<view v-for="item in list" :key="item.id">
@ -40,26 +36,14 @@
<!-- ０是未收货，１是正在收货，２是收货完成 -->
<view class="boder-icon-top zhuangtai" data-state="0">{{ item.orderStatus == 0 ? '未收货' : item.orderStatus == 1 ? '正在收货' : '收货完成' }}</view>
</view>
<view v-if="item.userDefined5" class="row-list">
<view class="list-item"> 送货单号: </view>
<view> {{ item.userDefined5 }} </view>
</view>
<view class="row-list">
<view class="list-item"> 行项目: </view>
<view> {{ item.userDefined3 }} </view>
<view v-if="item.procureCode" class="row-list">
<view class="list-item"> 采购单: </view>
<view> {{ item.procureCode }} </view>
</view>
<view class="row-list">
<view class="list-item"> 物料编码: </view>
<view> {{ item.handlematerialCode }}</view>
</view>
<view class="row-list">
<view class="list-item"> 物料描述: </view>
<view>{{ item.materialDesc }}</view>
</view>
<view class="row-list">
<view class="list-item"> 工厂号: </view>
<view>{{ item.siteCode }}</view>
</view>
<view class="row-list">
<view class="list-item"> 应收/已收: </view>
<view>{{ item.planNumber }}/{{ item.realityNumber }}</view>
@ -71,48 +55,6 @@
</u-form>
</view>
</view>
<!-- <view class="scroll">
<view v-for="item in receivedlist" :key="item.id" @dblclick="onFormDoubleClick(item)">
<u-form style="margin-top: 10rpx" class="form2">
<view class="list">
<view class="righttitle">
<view class="boder-icon-top zhuangtai" data-state="0">已收货</view>
</view>
<view v-if="item.userDefined5" class="row-list">
<view class="list-item"> 送货单号: </view>
<view> {{ item.userDefined5 }} </view>
</view>
<view v-if="item.procureCode" class="row-list">
<view class="list-item"> 采购单号: </view>
<view> {{ item.procureCode }} </view>
</view>
<view class="row-list">
<view class="list-item"> 行项目: </view>
<view> {{ item.userDefined3 }} </view>
</view>
<view class="row-list">
<view class="list-item"> 物料编码: </view>
<view> {{ item.handlematerialCode }}</view>
</view>
<view class="row-list">
<view class="list-item"> 物料描述: </view>
<view>{{ item.materialDesc }}</view>
</view>
<view class="row-list">
<view class="list-item"> 工厂号: </view>
<view>{{ item.siteCode }}</view>
</view>
<view class="row-list">
<view class="list-item"> 应收/已收: </view>
<view>{{ item.planNumber }}/{{ item.realityNumber }}</view>
</view>
</view>
</u-form>
</view>
</view> -->
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="12">
@ -125,52 +67,6 @@
<!-- 返回 -->
</u-row>
</view>
<!-- <view>
<u-popup v-model="show" mode="center" width="580rpx" height="650rpx">
<view class="form3">
<view class="poupitem">
<view class="pouptitle">标识码：</view>
<u-search placeholder="请扫描" v-model="form3.userDefined6" :show-action="false"></u-search>
</view>
<view class="poupitem">
<view class="pouptitle">数量：</view>
<u-input class="poupcontent" :clearable="false" v-model="form3.planNumber" placeholder="" style="overflow: hidden" />
</view>
<view class="poupitem">
<view class="pouptitle">收货方式：</view>
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChangeway" showKey="lable" valKey="value" :val="bimWl.value" :options="waylist" />
</view>
<view v-show="showshow">
<view v-show="!selectway" class="poupitem">
<view class="pouptitle">物料号：</view>
<u-input disabled class="poupcontent" :clearable="false" v-model="aimWl.value" placeholder="" style="overflow: hidden" />
</view>
<view v-show="selectway" class="poupitem">
<view class="pouptitle">托盘号：</view>
<u-input class="poupcontent" :clearable="false" v-model="form3.sn" placeholder="" style="overflow: hidden" />
</view>
</view>
<view class="poupitem">
<view class="pouptitle">收货仓库：</view>
<jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="productCodeTypeList.value" :options="whList" />
</view>
<view class="poupitem">
<view class="pouptitle">库区：</view>
<jPicker sureColor="#ff0000" :moren="moren1" @bindpicker="selectProductwaCode" showKey="label" valKey="value" :val="waCodeTypeList.value" :options="waCodeList" />
</view>
</view>
<view class="poupbutton" style="margin-top: 10px">
<div>
<u-button style="width: 100px; height: 35px" @click="onOk" size="mini" type="primary">确定</u-button>
</div>
<div>
<u-button style="width: 100px; height: 35px" size="mini" type="error" @click="nopoup">取消</u-button>
</div>
</view>
</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">
@ -237,10 +133,11 @@ export default class ArrivalRegistration extends BasePage {
waCodeTypeList: any = {};
moren = '选择仓库';
moren1 = '选择库区';
reducelist: any = [];
bimWl: any = {};
selectway = true;
showshow = true;
proobj: any = {};
// remove: any = {};
// async onReady() {
// await this.model.queryLocation();
@ -299,6 +196,14 @@ export default class ArrivalRegistration extends BasePage {
// url: this.page.wms.ReceivePODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)),
// });
// }
uniqueArray(arr) {
return arr.reduce((accumulator, current) => {
if (!accumulator.some((item) => item.materialCode === current.materialCode)) {
accumulator.push(current);
}
return accumulator;
}, []);
}
//查询货单关联采购单信息
async query() {
console.log(session);
@ -319,24 +224,36 @@ export default class ArrivalRegistration extends BasePage {
};
await this.model.PurchaseOrderPda(query);
let prodlist = model.orderNoItemList;
this.prodlist = prodlist.map((item) => {
let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
return {
...item,
handlematerialCode: newmaterialCode,
};
this.reducelist = this.uniqueArray(prodlist);
this.reducelist.forEach((item) => {
item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/));
item.label = item.materialDesc;
});
//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;
}
console.log('this.reducelist', this.reducelist);
this.bimWl = this.reducelist[0];
this.querybyprod();
//this.ProcureOrderAlready();
//this.list = model.orderNoItemList;
// this.oldprodlist = prodlist.map((item) => {
// let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
// return {
// ...item,
// handlematerialCode: newmaterialCode,
// realityaddNumber: item.realityNumber,
// };
// });
// this.list = this.oldprodlist.filter((item) => {
// return item.handlematerialCode == this.bimWl.value;
// });
}
selectProductCodeType(e) {
console.log(e);
this.bimWl = e.pickerName;
this.querybyprod();
}
selectprodCodeType(e) {
this.proobj = e.pickerName;
this.list = this.materilist.filter((item) => {
return item.procureCode == this.proobj.value;
});
}
async querybyprod() {
@ -350,9 +267,9 @@ export default class ArrivalRegistration extends BasePage {
// }
this.aimWl = {} as OptionType;
let query = {
materialCode: this.aimWl.value ? this.aimWl.value : '',
materialCode: this.bimWl.materialCode,
userDefined5: this.userDefined5,
procureCode: this.prodobj.procureCode,
//procureCode: this.prodobj.procureCode,
//this.materialCode,
factoryCode: session.FactoryCode,
@ -364,56 +281,15 @@ export default class ArrivalRegistration extends BasePage {
return {
...item,
handlematerialCode: newmaterialCode,
label: item.procureCode,
value: item.procureCode,
};
});
this.list = [];
if (this.prodlist.length) {
this.aimWl = this.materilist[0];
this.list.push(this.materilist[0]);
this.procureCode = this.list[0].procureCode;
} else {
this.prodobj = {} as OptionType;
}
//this.ProcureOrderAlready();
//this.list = model.orderNoItemList;
this.prodobj = this.materilist[0];
this.list.push(this.materilist[0]);
}
// async querydelivery() {
// console.log(session);
// if (this.userDefined5 == '' || this.userDefined5.length == 0) {
// (this.$refs.uToast as any).show({
// title: '请输入送货单号',
// type: 'default',
// });
// return;
// }
// this.aimWl = {} as OptionType;
// let query = {
// userDefined5: this.userDefined5,
// procureCode: this.procureCode,
// materialCode: this.aimWl.value ? this.aimWl.value : '',
// //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.materilist.length) {
// this.aimWl = this.materilist[0];
// this.list.push(this.materilist[0]);
// } else {
// this.aimWl = {} as OptionType;
// }
// this.ProcureOrderAlready();
// //this.list = model.orderNoItemList;
// }
//送货单提单
async tidandelivery() {
if (this.userDefined5 == '' || this.userDefined5.length == 0) {
@ -483,15 +359,7 @@ export default class ArrivalRegistration extends BasePage {
this.procureCode = this.prodobj.procureCode;
this.querybyprod();
}
bookTypeChange(e: any) {
this.aimWl = e.pickerName;
this.list = [];
this.list.push(e.pickerName);
this.procureCode = this.list[0].procureCode;
//
//this.queryinformation();
//this.getlist();
}
bookTypeChangeway(e) {
//this.showshow = true;
this.bimWl.value = e.pickerName.value;
@ -513,6 +381,7 @@ export default class ArrivalRegistration extends BasePage {
this.singshow = true;
this.operationNumber = model.singobj.operationNumber;
this.nooperationNumber = model.singobj.planNumber - model.singobj.operationNumber;
this.czNumber = this.list[0].planNumber;
}
}
//到货登记确定提交

12
src/pages/wms/Raw/ReceiveSRM/index.vue
Unescape Escape View File

@ -189,6 +189,7 @@ export default class receiveSRM extends BasePage {
moren1 = '选择库区';
reducelist: any = [];
oldprodlist: any = [];
zancunmatcode: any = {};
waylist = [
// {
// value: '0',
@ -280,11 +281,11 @@ export default class receiveSRM extends BasePage {
let prodlist = model.orderNoItemList;
this.reducelist = this.uniqueArray(prodlist);
this.reducelist.forEach((item) => {
item.value = item.materialCode;
item.value = item.materialCode.slice(item.materialCode.search(/[1-9]/));
item.label = item.materialDesc;
});
console.log('this.reducelist', this.reducelist);
this.bimWl = this.reducelist[0];
this.bimWl = Object.keys(this.zancunmatcode).length ? this.zancunmatcode : this.reducelist[0];
this.oldprodlist = prodlist.map((item) => {
let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
return {
@ -294,7 +295,7 @@ export default class receiveSRM extends BasePage {
};
});
this.list = this.oldprodlist.filter((item) => {
return item.materialCode == this.bimWl.value;
return item.handlematerialCode == this.bimWl.value;
});
this.receivedlist = [];
}
@ -303,7 +304,7 @@ export default class receiveSRM extends BasePage {
this.bimWl = e.pickerName;
this.receivedlist = [];
this.list = this.oldprodlist.filter((item) => {
return item.materialCode == this.bimWl.value;
return item.handlematerialCode == this.bimWl.value;
});
}
//送货单提单
@ -433,7 +434,8 @@ export default class receiveSRM extends BasePage {
duration: 6000,
});
this.receiptNoCode = '';
this.receivedlist = [];
this.zancunmatcode = this.bimWl;
//this.receivedlist = [];
this.list = [];
this.Idcard = '';
this.areaCode = '';

Write Preview
Loading…
Cancel
Save