diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index ea8b717..15f31c3 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.103'; //正式版本号
+ version = '0.0.104'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue
index 9894d62..c549160 100644
--- a/src/pages/wms/Raw/ProductionREQ/index.vue
+++ b/src/pages/wms/Raw/ProductionREQ/index.vue
@@ -24,31 +24,28 @@
-
-
-
+
+
-
-
-
-
-
-
-
+
- 物料编码:
+ 领料单:
+ {{ TraysList && TraysList.produceCode }}
+
+
+ 物料编码:
{{ TraysList && TraysList.materialCode }}
- 物料名称:
+ 物料名称:
{{ TraysList && TraysList.materialDesc }}
应出/已出:
- {{ TraysList && TraysList.planNumber }}/{{ TraysList && TraysList.outNumber }}
+ {{ TraysList && TraysList.planNumber }}/{{ outNumber }}
单位:
@@ -57,41 +54,46 @@
-
-
-
-
-
+
-
- 托盘号:
- {{ item.sn }}
-
-
- 出库数量:
- {{ item.amount }}
-
-
+ 标志卡:
+ {{ item.wlCode }}
-
- 库位码:
- {{ item.wlCode }}
-
+ 物料编码:
+ {{ item.materialCode }}
-
-
-
- 删除
+
+ 物料名称:
+ {{ item.materialDesc }}
+
+
+
+ 仓库:
+ {{ item.whCode }}
+
+
+ 库区:
+ {{ item.waCode }}
+
+
+
+ 托盘号:
+ {{ item.sn }}
+
+
+ 批次:
+ {{ item.userDefined2 }}
+
+
+ 数量:
+
@@ -139,16 +141,8 @@ export default class ProductionREQ extends BasePage {
materilist = [];
userDefined1list = [];
warehouselist = [];
- TraysList = {
- outNumber: 0,
- planNumber: 0,
- id: '',
- produceCode: '',
- materialCode: '',
- materialDesc: '',
- userDefined1: '',
- unit: '',
- };
+ Idcard: any = '';
+ TraysList: any = {};
// remove: any = {};
// async onReady() {
// await this.model.queryLocation();
@@ -162,59 +156,29 @@ export default class ProductionREQ extends BasePage {
orderNoItemList: any = [];
showProduceCodeList: any = [];
itemdetail: any = '';
- outnumber: any = 0;
+ outNumber: any = 0;
+ realityaddNumber = 0;
async onReady() {
- await this.model.getwarehouselist();
- this.warehouselist = model.warehouselist;
- const cimWl = this.warehouselist.find((item) => item.value === 'WH02');
- if (cimWl) {
- this.cimWl = cimWl;
- } else {
- this.cimWl = this.warehouselist[0];
- }
+ // await this.model.getwarehouselist();
+ // this.warehouselist = model.warehouselist;
+ // const cimWl = this.warehouselist.find((item) => item.value === 'WH02');
+ // if (cimWl) {
+ // this.cimWl = cimWl;
+ // } else {
+ // this.cimWl = this.warehouselist[0];
+ // }
}
bookTypeChange(e: any) {
this.aimWl = e.pickerName;
this.list = [];
- this.queryinformation();
+ this.TraysList = e.pickerName;
+ this.realityaddNumber = e.pickerName.outNumber;
+ this.outNumber = e.pickerName.outNumber;
+
+ //this.queryinformation();
//this.getlist();
}
- userDefined1Change(e: any) {
- this.bimWl = e.pickerName;
- this.list = [];
- this.getlist();
- }
- //选择出库仓库
- warehouseChange(e: any) {
- this.cimWl = e.pickerName;
- this.list = [];
- }
- //收货按钮
- async ondelete(item, index) {
- console.log('1234567', item);
- console.log('index', index);
- this.list.splice(index, 1);
- this.TraysList.outNumber -= item.amount;
- //this.itemdetail = item;
- // this.showmodal = true;
- // this.content = '是否删除?';
- //this.itemdetail.orderNo = this.orderNo;
- //console.log(this.itemdetail, this.orderNo);
- //await this.model.deleteTray(this.itemdetail);
- // if (this.model.SubmitCode == '200') {
- // (this.$refs.uToast as any).show({
- // title: '删除成功',
- // type: 'success',
- // });
- // this.getlist();
- // } else {
- // (this.$refs.uToast as any).show({
- // title: '删除失败',
- // type: 'error',
- // });
- // this.getlist();
- // }
- }
+
//查询货单关联采购单信息
async query() {
if (this.orderNo == '' || this.orderNo.length == 0) {
@@ -235,32 +199,48 @@ export default class ProductionREQ extends BasePage {
// });
this.materilist = model.orderNoItemList;
this.aimWl = this.materilist[0];
- this.queryinformation();
+ this.TraysList = this.materilist[0];
+ //console.log('this.TraysList',this.TraysList);
+ this.realityaddNumber = this.materilist[0].outNumber;
+ this.outNumber = this.materilist[0].outNumber;
+ //this.queryinformation();
//this.getlist();
} else {
this.materilist = [];
}
}
- //查询批次
- async queryinformation() {
- if (this.orderNo == '' || this.orderNo.length == 0) {
- (this.$refs.uToast as any).show({
- title: '请输入领料单号',
- // url: '/pages/user/index'
- });
- return;
+
+ async querybyidcard() {
+ if (this.list.length) {
+ let ischongfu = this.list.some((item) => item.wlCode == this.Idcard);
+ if (ischongfu) {
+ (this.$refs.uToast as any).show({
+ title: '请勿重复扫描标志卡',
+ });
+ this.Idcard = '';
+ return;
+ }
}
- let item: any = {};
- item.produceCode = this.orderNo;
- item.materialCode = this.aimWl.value;
- await this.model.queryinformation(item);
- if (model.information) {
- this.userDefined1list = model.information;
- this.bimWl = this.userDefined1list[0];
- } else {
- this.userDefined1list = [];
+ let item = {
+ factoryCode: session.FactoryCode,
+ wlCode: this.Idcard,
+ };
+ await this.model.getByidcard(item);
+ if (model.getidcardcode == '200') {
+ let alreadyList = model.byidcardobj;
+ alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
+ this.list.push(alreadyList);
+ this.confirmNumber();
+ this.Idcard = '';
}
- this.getlist();
+ }
+ confirmNumber() {
+ let addNumber = 0;
+ this.list.forEach((item) => {
+ addNumber += parseFloat(item.amount ? item.amount : '0');
+ });
+
+ this.outNumber = this.realityaddNumber + addNumber;
}
async getlist() {
if (this.orderNo == '' || this.orderNo.length == 0) {
@@ -299,39 +279,7 @@ export default class ProductionREQ extends BasePage {
// }
console.log(model.TraysList);
}
- async addlist() {
- if (this.boxnumber == '') {
- (this.$refs.uToast as any).show({
- title: '请扫描托盘号',
- // url: '/pages/user/index'
- });
- return;
- }
- // 遍历this.list，检查是否存在重复的boxnumber
- const isDuplicate = this.list.some((item) => item.sn === this.boxnumber);
- if (isDuplicate) {
- (this.$refs.uToast as any).show({
- title: '请勿重复扫描托盘',
- // url: '/pages/user/index'
- });
- return;
- }
- await this.model.selloutconntray(this.boxnumber);
- if (this.model.SubmitCode == '200') {
- (this.$refs.uToast as any).show({
- title: '成功',
- type: 'success',
- });
- this.list.push(model.selloutconntraydata);
- this.TraysList.outNumber += model.selloutconntraydata.amount;
- } else {
- (this.$refs.uToast as any).show({
- title: '失败',
- type: 'error',
- });
- }
- }
async onSubmit() {
if (this.orderNo == '' || this.orderNo.length == 0) {
(this.$refs.uToast as any).show({
@@ -343,26 +291,20 @@ export default class ProductionREQ extends BasePage {
if (this.list.length == 0 || this.list == '') {
(this.$refs.uToast as any).show({
- title: '请先扫码箱码',
+ title: '请先扫描标志卡',
// url: '/pages/user/index'
});
return;
}
let params = [];
this.list.map((item) => {
- params.push({
- id: this.TraysList.id,
- produceCode: this.TraysList.produceCode,
- materialCode: this.TraysList.materialCode,
- materialDesc: this.TraysList.materialDesc,
- userDefined1: this.TraysList.userDefined1,
- locCode: this.cimWl.value,
- planNumber: item.amount,
- sn: item.sn,
- factoryCode: session.FactoryCode,
- });
+ item.produceCode = this.TraysList.produceCode;
+ item.id = this.TraysList.id;
+ item.createBy = session.loginName;
+ item.factoryCode = session.FactoryCode;
+ params.push(item);
});
- console.log('list', params);
+ //console.log('list', params);
await this.model.out(params);
if (this.model.SubmitCode == '200') {
(this.$refs.uToast as any).show({
@@ -380,24 +322,25 @@ export default class ProductionREQ extends BasePage {
}
}
mepty() {
- this.orderNo = '';
+ //this.orderNo = '';
this.list = [];
this.aimWl = {} as OptionType;
- this.bimWl = {} as OptionType;
- this.materilist = [];
- this.userDefined1list = [];
- //this.model.mepty();
- this.boxnumber = '';
- this.TraysList = {
- outNumber: 0,
- planNumber: 0,
- id: '',
- produceCode: '',
- materialCode: '',
- materialDesc: '',
- userDefined1: '',
- unit: '',
- };
+ this.query();
+ // this.bimWl = {} as OptionType;
+ // this.materilist = [];
+ // this.userDefined1list = [];
+ // //this.model.mepty();
+ // this.boxnumber = '';
+ // this.TraysList = {
+ // outNumber: 0,
+ // planNumber: 0,
+ // id: '',
+ // produceCode: '',
+ // materialCode: '',
+ // materialDesc: '',
+ // userDefined1: '',
+ // unit: '',
+ // };
}
}
@@ -446,12 +389,12 @@ body {
}
}
- .fiexdcontent {
- position: fixed;
- width: 92%;
- box-shadow: 0 0 14px 0 rgb(128 128 128 / 46%);
- z-index: 100;
- }
+ // .fiexdcontent {
+ // position: fixed;
+ // width: 92%;
+ // box-shadow: 0 0 14px 0 rgb(128 128 128 / 46%);
+ // z-index: 100;
+ // }
.form {
background-color: #fff;
padding: 15rpx;
@@ -508,7 +451,7 @@ body {
background-color: #fff;
padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx;
- height: 210rpx;
+ height: 280rpx;
overflow: scroll;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
//color: #8d8989;
@@ -572,11 +515,12 @@ body {
.scroll {
// margin-top: 2rpx;
height: 680rpx;
- position: absolute;
- width: 92%;
- top: 740rpx;
- /* bottom: 40px; */
- overflow: auto;
+ overflow: scroll;
+ // position: absolute;
+ // width: 92%;
+ // top: 740rpx;
+ // /* bottom: 40px; */
+ // overflow: auto;
// background-color: #f2f2f2;
.form2 {
background-color: #fff;
@@ -585,10 +529,10 @@ body {
box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
color: #8d8989;
.list {
- display: flex;
- flex-direction: row;
+ // display: flex;
+ // flex-direction: row;
.rowleft {
- width: 80%;
+ // width: 80%;
.row-list {
display: flex;
flex-direction: row;
@@ -602,7 +546,7 @@ body {
.list-item {
display: flex;
flex-direction: row;
- flex: 1;
+ //flex: 1;
}
}
}
diff --git a/src/pages/wms/Raw/ProductionREQ/model.ts b/src/pages/wms/Raw/ProductionREQ/model.ts
index e0cd215..7dce89b 100644
--- a/src/pages/wms/Raw/ProductionREQ/model.ts
+++ b/src/pages/wms/Raw/ProductionREQ/model.ts
@@ -13,11 +13,11 @@ export class ProductionREQ extends VuexModule {
orderNoItemList: any = [];
@MutationAction
async ProductionMaterialRequisition(orderNo: any) {
- const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisition, {
+ const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisitionSC, {
// headers: {
// poolName: session.PoolName,
// },
- produceCode: orderNo,
+ userDefined4: orderNo,
factoryCode: session.FactoryCode,
});
// http.defaults.headers.common['Accept-Language'] = session.PoolName;
@@ -73,7 +73,7 @@ export class ProductionREQ extends VuexModule {
}
@MutationAction
async out(params: any) {
- const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.out, params);
+ const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.NewConMaterialOutSC, params);
const SubmitCode = result.code;
return { SubmitCode };
}
@@ -90,6 +90,17 @@ export class ProductionREQ extends VuexModule {
}));
return { warehouselist };
}
+
+ ///扫描标志卡
+ getidcardcode: any = '';
+ byidcardobj: any = {};
+ @MutationAction
+ async getByidcard(data: any) {
+ const result: any = await http.post(url.lanjuwms.raw.ReceivePO.SweepMaterialCardSC, data);
+ const getidcardcode = result.code;
+ const byidcardobj = result.data;
+ return { getidcardcode, byidcardobj };
+ }
}
export default getModule(ProductionREQ);
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 2447e98..5f063e2 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -116,6 +116,7 @@ export const url = {
addOrderCard: qianzhuione + '/wms/WmsToWCSmission/addOrderCard',
selectOrderCard: qianzhuione + '/wms/WmsToWCSmission/selectOrderCard',
listTableCK: qianzhuione + '/wms/WmsToWCSmission/listTableCK',
+ SweepMaterialCardSC: qianzhuione + '/wms/WmsToWCSmission/SweepMaterialCardSC',
},
ReceiveSRM: {
// 手持 －－包材采购单采购收货查询
@@ -153,6 +154,8 @@ export const url = {
warehouselist: qianzhuione + '/wms/order/listCK',
ProductionMaterialRequisitionsn: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionsn',
out: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionAdd',
+ ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionSC',
+ NewConMaterialOutSC: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSC',
},
TrayStatusUpdate: {
out: qianzhuione + '/wms/order/TraystatusUpdate',