包材&领料逻辑修改

master
guoshuang 9 months ago
parent 203d852d95
commit fb0b1f687a

@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///******************
version = '0.0.107'; //
version = '0.0.108'; //
//version = '0.0.14'; //
//*************** false true ****************
//isTest = true;

@ -72,24 +72,6 @@
<view style="width: 30%" class="list-item"> 物料名称: </view>
<view> {{ item.materialDesc }} </view>
</view>
<view class="row-list">
<view class="row-list-item">
<view class="list-item"> 仓库: </view>
<view> {{ item.whCode }} </view>
</view>
<view class="row-list-item">
<view class="list-item"> 库区: </view>
<view> {{ item.waCode }} </view>
</view>
</view>
<view class="row-list">
<view style="width: 30%" class="list-item"> 托盘号: </view>
<view> {{ item.sn }} </view>
</view>
<view class="row-list">
<view style="width: 30%" class="list-item"> 批次: </view>
<view> {{ item.userDefined2 }} </view>
</view>
<view class="row-list">
<view class="list-item"> 数量: </view>
<u-input border placeholder="" @blur="confirmNumber(item)" v-model="item.amount" />
@ -214,7 +196,7 @@ export default class ProductionREQ extends BasePage {
alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
this.materilist.forEach((item) => {
if (item.materialCode == alreadyList.materialCode) {
item.outNumber += alreadyList.amount;
item.outNumber = item.outNumber + alreadyList.amount;
alreadyList.produceCode = item.produceCode;
}
});
@ -227,12 +209,12 @@ export default class ProductionREQ extends BasePage {
let addnumber = 0;
this.list.forEach((item) => {
if (item.materialCode == changeobj.materialCode) {
addnumber += parseFloat(changeobj.amount);
addnumber += parseFloat(item.amount ? item.amount : '0');
}
});
this.materilist.forEach((item) => {
if (item.materialCode == changeobj.materialCode) {
item.outNumber = addnumber;
item.outNumber = item.returnoutNumber + addnumber;
}
});
}

@ -19,10 +19,9 @@
</view>
</view>
<!-- 订单 -->
<u-form-item label="物料描述">
<!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
<!-- <u-form-item label="物料描述">
<jPicker sureColor="#ff0000" :showCode="true" @bindpicker="bookTypeChange" duoyukey="procureCode" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" />
</u-form-item>
</u-form-item> -->
<u-form-item label="库区">
<u-search placeholder="请扫描" v-model="areaCode" @search="queryloc" :show-action="false"></u-search>
<!-- <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="productCodeTypeList.value" :options="whList" /> -->
@ -113,7 +112,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>
@ -245,31 +244,31 @@ export default class receivePO 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 = '';
}
}
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;
}
//
// 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 = {};
@ -312,24 +311,15 @@ export default class receivePO extends BasePage {
};
await this.model.PurchaseOrderPda(query);
let materilist = model.orderNoItemList;
this.materilist = materilist.map((item) => {
this.list = materilist.map((item) => {
let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
return {
...item,
handlematerialCode: newmaterialCode,
realityaddNumber: item.realityNumber,
};
});
this.list = [];
if (this.materilist.length) {
this.aimWl = this.materilist[0];
this.list.push(this.materilist[0]);
this.procureCode = this.list[0].procureCode;
this.realityaddNumber = this.list[0].realityNumber;
} else {
this.aimWl = {} as OptionType;
}
//this.ProcureOrderAlready();
//this.list = model.orderNoItemList;
this.receivedlist = [];
}
//
@ -351,25 +341,6 @@ export default class receivePO extends BasePage {
this.query();
}
}
//
async ProcureOrderAlready() {
let item = {
procureCode: this.procureCode,
factoryCode: session.FactoryCode,
};
await this.model.selectOdsProcureOrderAlready(item);
if (model.Alreadycode == '200') {
let alreadyList = model.ProcureOrderAlreadylist;
this.receivedlist = alreadyList.map((item) => {
let newmsrmMater = item.materialCode.slice(item.materialCode.search(/[1-9]/));
return {
...item,
handlematerialCode: newmsrmMater,
};
});
//this.receivedlist = model.ProcureOrderAlreadylist;
}
}
histroyItem: any = {};
barcode: any = '';
async selectProductlocCode(e: any) {
@ -394,13 +365,6 @@ export default class receivePO extends BasePage {
}
//
async onSubmit() {
if (this.procureCode == '' || this.procureCode.length == 0) {
(this.$refs.uToast as any).show({
title: '请输入采购单号查询',
type: 'default',
});
return;
}
if (this.areaCode == '') {
(this.$refs.uToast as any).show({
title: '请先扫描或输入库区',
@ -423,6 +387,7 @@ export default class receivePO extends BasePage {
return;
}
let filteredList = [];
let paramsList = [];
if (this.receivedlist.length == 0) {
(this.$refs.uToast as any).show({
title: '没有扫描标志卡收货',
@ -431,32 +396,38 @@ export default class receivePO 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: '0',
sn: item.sn, //
userDefined4: item.userDefined4, //
};
});
}
let params = {
id: this.list[0].id, //id
factoryCode: session.FactoryCode,
whCode: this.waCodeList.warehouseCode, //
waCode: this.areaCode, //
receiptNoCode: this.receiptNoCode, //
poLine: this.list[0].userDefined3, //
createBy: session.loginName,
list: filteredList,
};
await this.model.OnSubmit(params);
if (this.model.submitcode == '200') {
(this.$refs.uToast as any).show({
title: '成功',
type: 'success',
});
await this.query();
this.receiptNoCode = '';
this.Idcard = '';
this.areaCode = '';
this.waCodeList = {};
// console.log('paramsList', paramsList);
await this.model.OnSubmit(paramsList);
if (this.model.submitcode == '200') {
(this.$refs.uToast as any).show({
title: '成功',
type: 'success',
});
this.receiptNoCode = '';
this.receivedlist = [];
this.list = [];
this.Idcard = '';
this.areaCode = '';
this.waCodeList = {};
this.query();
}
}
}
bookTypeChange(e: any) {
@ -469,9 +440,14 @@ export default class receivePO extends BasePage {
//this.queryinformation();
//this.getlist();
}
delet(item, index) {
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',

@ -98,7 +98,7 @@ export class receivePO extends VuexModule {
submitmsg: any = '';
@MutationAction
async OnSubmit(data: any) {
const result: any = await http.post(url.lanjuwms.raw.ReceivePO.addOrderCard, data);
const result: any = await http.post(url.lanjuwms.raw.ReceivePO.addOrderCardX, data);
const submitcode = result.code;
const submitmsg = result.msg;
return {

@ -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',

@ -113,7 +113,7 @@ export class receiveSRM extends VuexModule {
submitmsg: any = '';
@MutationAction
async OnSubmit(data: any) {
const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.addOrderCard, data);
const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.addOrderCardX, data);
const submitcode = result.code;
const submitmsg = result.msg;
return {

@ -117,6 +117,7 @@ export const url = {
selectOrderCard: qianzhuione + '/wms/WmsToWCSmission/selectOrderCard',
listTableCK: qianzhuione + '/wms/WmsToWCSmission/listTableCK',
SweepMaterialCardSC: qianzhuione + '/wms/WmsToWCSmission/SweepMaterialCardSC',
addOrderCardX: qianzhuione + '/wms/WmsToWCSmission/addOrderCardX',
},
ReceiveSRM: {
// 手持 --包材采购单采购收货查询
@ -138,6 +139,7 @@ export const url = {
listTableCK: qianzhuione + '/wms/WmsToWCSmission/listTableCK',
selectOrderCard: qianzhuione + '/wms/WmsToWCSmission/selectOrderCard',
addOrderCard: qianzhuione + '/wms/WmsToWCSmission/addOrderCard',
addOrderCardX: qianzhuione + '/wms/WmsToWCSmission/addOrderCardX',
},
PurchaseWHPO: {
// 手持 --包材采购单采购收货查询

Loading…
Cancel
Save