diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index bd9dde3..855bd70 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.147'; //正式版本号
+ version = '0.0.148'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue
index 21669d8..52d461b 100644
--- a/src/pages/wms/Raw/ReceiveSRM/index.vue
+++ b/src/pages/wms/Raw/ReceiveSRM/index.vue
@@ -25,21 +25,6 @@
-
-
-
-
-
- {{ waCodeList.warehouseName }}
-
-
-
-
-
-
- 生成收货单号
-
-
@@ -87,7 +72,7 @@
-
+
@@ -102,36 +87,37 @@
采购单号:
{{ item.procureCode }}
-
- 行项目:
- {{ item.userDefined3 }}
-
物料编码:
- {{ item.handlematerialCode }}
+ {{ item.materialCode }}
物料描述:
{{ item.materialDesc }}
- 工厂号:
- {{ item.siteCode }}
+ 标志卡:
+ {{ item.userDefined1 }}
- 托盘:
- {{ item.sn }}
+ 供应商:
+ {{ item.supplierName }}
打印顺序:
{{ item.userDefined9 }}
- 实际收货:
-
+ 数量:
+ {{ item.planNumber }}
-
- 删除
+
+ 仓库:
+ {{ item.whCode }}
+
+
+ 库区:
+ {{ item.waCode }}
@@ -158,7 +144,7 @@ import { BasePage } from '@/components/base/page';
import jPicker from '@/components/J-Picker/jPicker.vue';
import model from './model';
import { session } from '@/store/modules/session';
-import dayjs from 'dayjs';
+
interface OptionType {
label: string;
value: string;
@@ -231,22 +217,7 @@ export default class receiveSRM extends BasePage {
oncefouces = true;
twofouces = false;
locfouces = false;
- //生成收货单号
- generate() {
- const today = dayjs().format('YYYYMMDDHHmmss');
- this.receiptNoCode = `sn${today}`;
- }
- nopoup() {
- this.show = false;
- this.form3 = {};
- this.productCodeTypeList = {};
- }
- nopoupsing() {
- this.singshow = false;
- this.operationNumber = 0;
- this.nooperationNumber = 0;
- this.czNumber = '';
- }
+
//点击收货按钮，录入批次（或系统自动生成）、数量、托盘码进行收货。
async onFormDoubleClick(item) {
console.log('双击', item);
@@ -304,16 +275,20 @@ export default class receiveSRM extends BasePage {
this.list = this.oldprodlist.filter((item) => {
return item.handlematerialCode == this.bimWl.value;
});
- this.receivedlist = [];
- this.locfouces = false;
- this.$nextTick(() => {
- this.locfouces = true;
- });
+
+ //查询标志卡
+ let params = {
+ userDefined5: this.userDefined5,
+ factoryCode: session.FactoryCode,
+ };
+ await this.model.selectCardList(params);
+ if (this.model.rfidreturncode == '200') {
+ this.receivedlist = this.model.rfiddata;
+ }
}
selectProductCodeType(e) {
console.log(e);
this.bimWl = e.pickerName;
- this.receivedlist = [];
this.list = this.oldprodlist.filter((item) => {
return item.handlematerialCode == this.bimWl.value;
});
@@ -341,174 +316,27 @@ export default class receiveSRM extends BasePage {
this.query();
}
}
- //标志卡查询
- async querybyidcard() {
- if (this.receivedlist.length) {
- let ischongfu = this.receivedlist.some((item) => item.userDefined1 == this.Idcard);
- if (ischongfu) {
- (this.$refs.uToast as any).show({
- title: '请勿重复扫描标志卡',
- });
- this.Idcard = '';
- return;
- }
- }
- let item = {
- factoryCode: session.FactoryCode,
- userDefined1: 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]/));
- let id = alreadyList.userDefined4;
- let flage = this.list.some((item) => item.id === id);
- if (flage) {
- this.list.forEach((item) => {
- if (item.id == id) {
- item.realityNumber += alreadyList.planNumber;
- }
- });
- this.receivedlist.push(alreadyList);
- } else {
- (this.$refs.uToast as any).show({
- title: '该标志卡与上面的采购单不匹配',
- type: 'default',
- });
- return;
- }
- //this.confirmNumber();
-
- this.twofouces = false;
- this.$nextTick(() => {
- this.Idcard = '';
- this.twofouces = true;
- });
- }
- }
- histroyItem: any = {};
- barcode: any = '';
- async queryloc() {
- let params = {
- factoryCode: session.FactoryCode,
- areaCode: this.areaCode,
- };
- await this.model.getworkloc(params);
- this.waCodeList = model.workloclist;
- this.twofouces = false;
- this.$nextTick(() => {
- this.twofouces = true;
- });
- }
- selectProductwaCode(e: any) {
- this.waCodeTypeList = e.pickerName;
- }
//完成送货单
async onSubmit() {
- if (this.areaCode == '') {
+ let paramsList = {
+ userDefined5: this.userDefined5,
+ factoryCode: session.FactoryCode,
+ };
+ //console.log('提交数据----',paramsList);
+ await this.model.OnSubmit(paramsList);
+ if (this.model.submitcode == '200') {
(this.$refs.uToast as any).show({
- title: '请先扫描或输入库区',
- type: 'default',
+ title: model.submitmsg,
+ type: 'primary',
+ duration: 6000,
});
- return;
- }
- if (Object.keys(this.waCodeList).length == 0) {
- (this.$refs.uToast as any).show({
- title: '没有仓库信息',
- type: 'default',
- });
- return;
- }
- if (this.receiptNoCode == '') {
- (this.$refs.uToast as any).show({
- title: '请先生成收货单号',
- type: 'default',
- });
- return;
- }
- let filteredList = [];
- let paramsList = [];
- if (this.receivedlist.length == 0) {
- (this.$refs.uToast as any).show({
- title: '没有扫描标志卡收货',
- type: 'default',
- });
- return;
- } else {
- filteredList = this.receivedlist.filter((item) => item.userDefined10 !== '1');
- 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, //标志卡
- createBy: session.loginName,
- };
- });
- //console.log('提交数据----',paramsList);
- await this.model.OnSubmit(paramsList);
- if (this.model.submitcode == '200') {
- (this.$refs.uToast as any).show({
- title: model.submitmsg,
- type: 'primary',
- duration: 6000,
- });
- this.receiptNoCode = '';
- this.zancunmatcode = this.bimWl;
- //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 = [];
- // }
+ this.zancunmatcode = this.bimWl;
+ //this.receivedlist = [];
+ this.list = [];
- confirmNumber(changeobj) {
- let addNumber = 0;
- let id = changeobj.userDefined4;
- this.receivedlist.forEach((item) => {
- if (item.userDefined4 === id) {
- addNumber += parseFloat(item.planNumber ? item.planNumber : '0');
- }
- });
- this.list.forEach((item) => {
- if (item.id === id) {
- item.realityNumber = item.realityaddNumber + addNumber;
- }
- });
-
- //console.log('1239999999',this.list[0].realityNumber)
- }
- delet(deletobj: any, index: number) {
- this.receivedlist.splice(index, 1);
- let id = deletobj.userDefined4;
- this.list.forEach((item) => {
- if (item.id == id) {
- item.realityNumber -= deletobj.planNumber;
- }
- });
- (this.$refs.uToast as any).show({
- title: '删除成功',
- type: 'success',
- });
+ this.query();
+ }
}
}
diff --git a/src/pages/wms/Raw/ReceiveSRM/model.ts b/src/pages/wms/Raw/ReceiveSRM/model.ts
index 7b4b498..a2f32da 100644
--- a/src/pages/wms/Raw/ReceiveSRM/model.ts
+++ b/src/pages/wms/Raw/ReceiveSRM/model.ts
@@ -28,6 +28,15 @@ export class receiveSRM extends VuexModule {
}
return { orderNoItemList };
}
+ rfiddata: any = [];
+ rfidreturncode: any = '';
+ @MutationAction
+ async selectCardList(params) {
+ const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.selectCardList, params);
+ const rfiddata = result.data;
+ const rfidreturncode = result.code;
+ return { rfiddata, rfidreturncode };
+ }
Alreadycode: any = '';
ProcureOrderAlreadylist: any = '';
@MutationAction
@@ -113,7 +122,7 @@ export class receiveSRM extends VuexModule {
submitmsg: any = '';
@MutationAction
async OnSubmit(data: any) {
- const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.addOrderCardX, data);
+ const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.addOrderCardXnew, data);
const submitcode = result.code;
const submitmsg = result.msg;
return {
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 2f4472f..e7e5152 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -145,6 +145,8 @@ export const url = {
addOrderCard: qianzhuione + '/wms/WmsToWCSmission/addOrderCard',
addOrderCardX: qianzhuione + '/wms/WmsToWCSmission/addOrderCardX',
ArrivalRegistrationSH: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistrationSH',
+ selectCardList: qianzhuione + '/wms/WmsToWCSmission/selectCardList',
+ addOrderCardXnew: qianzhuione + '/wms/WmsToWCSmission/addOrderCardXNew',
},
PurchaseWHPO: {
// 手持 －－包材采购单采购收货查询