|
|
|
@ -27,14 +27,6 @@
|
|
|
|
|
{{ waCodeList.warehouseName }}
|
|
|
|
|
<!-- <jPicker sureColor="#ff0000" :moren="moren1" @bindpicker="selectProductwaCode" showKey="label" valKey="value" :val="waCodeTypeList.value" :options="waCodeList" /> -->
|
|
|
|
|
</u-form-item>
|
|
|
|
|
<u-form-item label="采购单">
|
|
|
|
|
<jPicker sureColor="#ff0000" @bindpicker="bookprodeChange" showKey="procureCode" valKey="procureCode" :val="prodobj.procureCode" :options="prodlist" />
|
|
|
|
|
</u-form-item>
|
|
|
|
|
<!-- 订单 -->
|
|
|
|
|
<u-form-item label="物料描述">
|
|
|
|
|
<u-input border height="50" placeholder="" class="inputshow" disabled v-model="prodobj.handlematerialCode" />
|
|
|
|
|
<!-- <jPicker sureColor="#ff0000" :showCode="true" @bindpicker="bookTypeChange" duoyukey="procureCode" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" /> -->
|
|
|
|
|
</u-form-item>
|
|
|
|
|
<u-form-item label="标志卡">
|
|
|
|
|
<u-search placeholder="请扫描" v-model="Idcard" @search="querybyidcard" :show-action="false"></u-search>
|
|
|
|
|
</u-form-item>
|
|
|
|
@ -89,7 +81,7 @@
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
<view class="scroll">
|
|
|
|
|
<view v-for="item in receivedlist" :key="item.id">
|
|
|
|
|
<view v-for="(item, index) in receivedlist" :key="item.id">
|
|
|
|
|
<u-form style="margin-top: 10rpx" class="form2">
|
|
|
|
|
<view class="list">
|
|
|
|
|
<view class="righttitle">
|
|
|
|
@ -126,7 +118,7 @@
|
|
|
|
|
</view>
|
|
|
|
|
<view class="row-list">
|
|
|
|
|
<view class="list-item">实际收货: </view>
|
|
|
|
|
<u-input border placeholder="" @blur="confirmNumber" v-model="item.planNumber" />
|
|
|
|
|
<u-input border placeholder="" @blur="confirmNumber(item)" v-model="item.planNumber" />
|
|
|
|
|
</view>
|
|
|
|
|
<view a:if="true" class="righttitle">
|
|
|
|
|
<view @click.stop="delet(item, index)" class="boder-icon-rigth"> 删除 </view>
|
|
|
|
@ -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',
|
|
|
|
|