diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 4d208ec..e4b9b44 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.94'; //正式版本号
+ version = '0.0.95'; //正式版本号
//version = '0.0.7'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue
index 1b5b861..9894d62 100644
--- a/src/pages/wms/Raw/ProductionREQ/index.vue
+++ b/src/pages/wms/Raw/ProductionREQ/index.vue
@@ -31,7 +31,7 @@
-
+
diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue
index eb4a120..92508b1 100644
--- a/src/pages/wms/Raw/ReceivePO/index.vue
+++ b/src/pages/wms/Raw/ReceivePO/index.vue
@@ -120,7 +120,7 @@
-
+
标识码：
@@ -259,18 +259,18 @@ export default class receivePO extends BasePage {
moren = '选择仓库';
moren1 = '选择库区';
waylist = [
- {
- value: '0',
- lable: '根据物料',
- },
+ // {
+ // value: '0',
+ // lable: '根据物料',
+ // },
{
value: '1',
lable: '根据托盘',
},
];
- bimWl = {} as OptionType;
- selectway: boolean = null;
- showshow = false;
+ bimWl: any = {};
+ selectway = true;
+ showshow = true;
// remove: any = {};
// async onReady() {
// await this.model.queryLocation();
@@ -317,9 +317,9 @@ export default class receivePO extends BasePage {
this.productCodeTypeList = {};
this.waCodeTypeList = {};
this.waCodeList = [];
- this.showshow = false;
- this.bimWl = {} as OptionType;
- this.selectway = null;
+ this.showshow = true;
+ this.bimWl = this.waylist[0];
+ this.selectway = true;
}
nopoup() {
this.show = false;
@@ -597,14 +597,14 @@ export default class receivePO extends BasePage {
//this.getlist();
}
bookTypeChangeway(e) {
- this.showshow = true;
+ //this.showshow = true;
this.bimWl.value = e.pickerName.value;
console.log(e);
- if (e.pickerName.value == '0') {
- this.selectway = false;
- } else {
- this.selectway = true;
- }
+ // if (e.pickerName.value == '0') {
+ // this.selectway = false;
+ // } else {
+ // this.selectway = true;
+ // }
}
//到货登记查询
async SignIn() {
diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue
index aeae722..5113e6c 100644
--- a/src/pages/wms/Raw/ReceiveSRM/index.vue
+++ b/src/pages/wms/Raw/ReceiveSRM/index.vue
@@ -128,7 +128,7 @@
-
+
标识码：
@@ -268,18 +268,18 @@ export default class receiveSRM extends BasePage {
moren = '选择仓库';
moren1 = '选择库区';
waylist = [
- {
- value: '0',
- lable: '根据物料',
- },
+ // {
+ // value: '0',
+ // lable: '根据物料',
+ // },
{
value: '1',
lable: '根据托盘',
},
];
- bimWl = {} as OptionType;
- selectway: boolean = null;
- showshow = false;
+ bimWl: any = {};
+ selectway = true;
+ showshow = true;
// remove: any = {};
// async onReady() {
// await this.model.queryLocation();
@@ -327,9 +327,9 @@ export default class receiveSRM extends BasePage {
this.productCodeTypeList = {};
this.waCodeTypeList = {};
this.waCodeList = [];
- this.showshow = false;
- this.bimWl = {} as OptionType;
- this.selectway = null;
+ this.showshow = true;
+ this.bimWl = this.waylist[0];
+ this.selectway = true;
}
nopoup() {
this.show = false;
@@ -656,14 +656,14 @@ export default class receiveSRM extends BasePage {
//this.getlist();
}
bookTypeChangeway(e) {
- this.showshow = true;
+ //this.showshow = true;
this.bimWl.value = e.pickerName.value;
console.log(e);
- if (e.pickerName.value == '0') {
- this.selectway = false;
- } else {
- this.selectway = true;
- }
+ // if (e.pickerName.value == '0') {
+ // this.selectway = false;
+ // } else {
+ // this.selectway = true;
+ // }
}
//到货登记查询
async SignIn() {
diff --git a/src/pages/wms/product/BatchOfflineStorage/index.vue b/src/pages/wms/product/BatchOfflineStorage/index.vue
index 316a1f2..3606817 100644
--- a/src/pages/wms/product/BatchOfflineStorage/index.vue
+++ b/src/pages/wms/product/BatchOfflineStorage/index.vue
@@ -9,100 +9,75 @@
-
-
-
- 标志码:
-
-
-
-
-
-
-
-
-
-
-
- 生产订单:
- {{ orderNoItemList && orderNoItemList.productOrder }}
-
-
- 产品编码:
- {{ orderNoItemList && orderNoItemList.productCode }}
-
-
- 产品名称:
- {{ orderNoItemList && orderNoItemList.productName }}
-
-
- 批次号:
- {{ orderNoItemList && orderNoItemList.batchNumber }}
-
-
-
- 订单数量:
- {{ orderNoItemList && orderNoItemList.planQuantity }}
-
-
- 单位:
- {{ orderNoItemList && orderNoItemList.unitOfMeasure }}
-
-
-
- 入库数量:
-
-
-
-
- 入库仓库:
-
-
-
-
-
-
-
- 入库
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
- 箱数:
- {{ item.number }}
-
+ {{ orderNoItemList.remark == '1' ? '已入库' : '未入库' }}
+
+
+ 生产订单:
+ {{ orderNoItemList && orderNoItemList.productOrder }}
+
+
+ 产品编码:
+ {{ orderNoItemList && orderNoItemList.productCode }}
+
+
+ 产品名称:
+ {{ orderNoItemList && orderNoItemList.productName }}
+
+
+ 批次号:
+ {{ orderNoItemList && orderNoItemList.batchNumber }}
+
+
+
+ 订单数量:
+ {{ orderNoItemList && orderNoItemList.planQuantity }}
-
-
- 库位码:
- {{ item.wlCode }}
-
-
- 托盘码:
- {{ item.sn }}
-
+
+ 单位:
+ {{ orderNoItemList && orderNoItemList.unitOfMeasure }}
-
-
- 删除
+
+ 托盘号:
+ {{ orderNoItemList && orderNoItemList.batchNumber }}
+
+
+
+ 剩余数量:
+ {{ orderNoItemList && orderNoItemList.attr3 }}
+
+
+ 实际入库数量:
+
+
+ 删除
+
+
@@ -119,31 +94,6 @@
-
-
-
-
- 托盘号：
-
-
-
- 入库库位：
-
-
-
- 箱数：
-
-
-
-
-
- 确定
-
- 取消
-
-
-
-
@@ -172,6 +122,7 @@ export default class BatchOfflineStorage extends BasePage {
form5: any = {};
boxnumber: any = '';
itemdetail: any = '';
+ waCode: any = '';
showmodal = false;
content: any = '';
number1 = 0;
@@ -194,75 +145,70 @@ export default class BatchOfflineStorage extends BasePage {
async onReady() {
await this.model.getwarehouselist();
this.warehouselist = model.warehouselist;
- const cimWl = this.warehouselist.find((item) => item.value === '0004');
+ const cimWl = this.warehouselist.find((item) => item.value === '0021');
if (cimWl) {
this.cimWl = cimWl;
} else {
this.cimWl = this.warehouselist[0];
}
}
- //列表删除按钮
- async onPassdelet(item, index) {
- console.log('1234567', item);
- this.itemdetail = item;
- this.delindex = index;
- this.showmodal = true;
- this.content = '是否删除?';
- // let params = {
- // item
- // }
- }
- async confirm() {
- this.itemdetail.orderNo = this.orderNo;
- console.log(this.itemdetail, this.orderNo);
- this.list.splice(this.delindex, 1);
- // 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 delet(index) {
+ uni.showModal({
+ content: '是否删除？',
+ success: (res) => {
+ if (res.confirm) {
+ this.list.splice(index, 1);
+ (this.$refs.uToast as any).show({
+ title: '删除成功',
+ type: 'success',
+ });
+ } else if (res.cancel) {
+ //console.log('用户点击取消');
+ }
+ },
+ });
}
//选择出库仓库
warehouseChange(e: any) {
this.cimWl = e.pickerName;
}
- //取消按钮
- nopoup() {
- this.show = false;
- this.form5 = {};
- }
- //查询货单关联采购单信息
async query() {
if (this.orderNo == '' || this.orderNo.length == 0) {
(this.$refs.uToast as any).show({
- title: '请扫描标志码',
+ title: '请勿扫描标志码',
// url: '/pages/user/index'
});
return;
}
+
await this.model.queryOrderNo(this.orderNo);
if (model.orderNoItemList) {
this.orderNoItemList = model.orderNoItemList;
- this.number1 = this.orderNoItemList.attr3;
- } else {
- this.orderNoItemList = {};
+ let chongfuscan = this.list.some((item) => item.pallet === this.orderNoItemList.pallet);
+ if (chongfuscan) {
+ (this.$refs.uToast as any).show({
+ title: '重复扫描标志卡',
+ // url: '/pages/user/index'
+ });
+ return;
+ } else {
+ this.list.push(this.orderNoItemList);
+ }
}
//this.getlist();
}
//入库确认按钮
async onSubmit() {
- if (this.orderNo == '' || this.orderNo.length == 0) {
+ if (this.waCode == '') {
(this.$refs.uToast as any).show({
- title: '请扫描标志码',
+ title: '请扫描库区',
+ // url: '/pages/user/index'
+ });
+ return;
+ }
+ if (this.cimWl.value == '') {
+ (this.$refs.uToast as any).show({
+ title: '请先选择仓库',
// url: '/pages/user/index'
});
return;
@@ -270,54 +216,50 @@ export default class BatchOfflineStorage extends BasePage {
if (this.list.length == 0 || this.list == '') {
(this.$refs.uToast as any).show({
- title: '请先入库',
+ title: '请先扫描标志卡查询订单',
// url: '/pages/user/index'
});
return;
}
- let insertTarynumber = 0;
- this.list.forEach((item) => {
- insertTarynumber = insertTarynumber + parseInt(item.number);
- });
+ let hasRemarkOne = this.list.some((item) => item.remark === '1');
+ if (hasRemarkOne) {
+ (this.$refs.uToast as any).show({
+ title: '有已出库的订单',
+ // url: '/pages/user/index'
+ });
+ return;
+ }
+
//console.log(insertTarynumber, model.orderNoItemList.putQuantity, insertTarynumber == model.orderNoItemList.putQuantity);
- if (insertTarynumber <= this.number1) {
- let params = {
- workOrder: this.orderNoItemList.workOrder,
- factoryCode: session.FactoryCode,
- whCode: this.cimWl.value, //――仓库编号
- productName: this.orderNoItemList.productName,
- productCode: this.orderNoItemList.productCode,
- planQuantity: this.orderNoItemList.planQuantity,
- putQuantity: this.number1,
- batchNumber: this.orderNoItemList.batchNumbe, //――批次
- createBy: session.loginName,
- unitOfMeasure: this.orderNoItemList.unitOfMeasure,
- productOrder: this.orderNoItemList.productOrder, //――单位
- wmsProductPut: this.list,
- };
- //console.log('参数',params);
- await this.model.handPut(params);
- if (this.model.SubmitCode == '200') {
- (this.$refs.uToast as any).show({
- title: '成功',
- type: 'success',
- });
- this.show = false;
- this.list = [];
- this.query();
- //this.getlist();
- } else {
- (this.$refs.uToast as any).show({
- title: '失败',
- type: 'error',
- });
- this.show = false;
- //this.getlist();
- }
+ this.list.forEach((item) => {
+ item.whCode = this.cimWl.value;
+ item.waCode = this.waCode;
+ item.createBy = session.loginName;
+ item.pallet = this.orderNo;
+ item.wlCode = '0001-01';
+ });
+ let params = {
+ factoryCode: session.FactoryCode,
+ whCode: this.cimWl.value,
+ waCode: this.waCode,
+ createBy: session.loginName,
+ wmsProductPut: this.list,
+ };
+ //console.log('参数',params);
+ await this.model.handPut(params);
+ if (this.model.SubmitCode == '200') {
+ (this.$refs.uToast as any).show({
+ title: '成功',
+ type: 'success',
+ });
+
+ this.list = [];
+ this.orderNo = '';
+ this.waCode = '';
} else {
(this.$refs.uToast as any).show({
- title: '实际入库总数量不能超过入库数量,请正确入库',
- // url: '/pages/user/index'
+ title: '失败',
+ type: 'error',
});
}
}
@@ -330,72 +272,6 @@ export default class BatchOfflineStorage extends BasePage {
// }
// console.log(model.productCodeList);
// }
- async rukubutn() {
- this.form5 = {
- number: 50,
- };
- if (this.orderNo == '' || this.orderNo.length == 0) {
- (this.$refs.uToast as any).show({
- title: '请扫描标志码',
- // url: '/pages/user/index'
- });
- return;
- }
- if (this.list.length > 0) {
- let insertTarynumber = 0;
- this.list.forEach((item) => {
- insertTarynumber = insertTarynumber + parseInt(item.number);
- });
- let ordernumber = this.number1 || 0;
- if (insertTarynumber >= ordernumber) {
- (this.$refs.uToast as any).show({
- title: '实际入库数量不能大于入库数量,请先删除再入库',
- // url: '/pages/user/index'
- });
- return;
- }
- this.show = true;
- } else {
- this.show = true;
- }
- }
- //弹窗入库按钮
- async onOk() {
- console.log(this.form5);
- if (this.form5.sn == '' || this.form5.wlCode == '' || this.form5.number == '') {
- (this.$refs.uToast as any).show({
- title: '不能为空',
- // url: '/pages/user/index'
- });
- return;
- }
- this.list.push({
- number: this.form5.number,
- wlCode: this.form5.wlCode,
- sn: this.form5.sn,
- //batchNumber: this.orderNoItemList.batchNumber,
- });
- this.show = false;
- // await this.model.insertTary(this.form5);
- // if (this.model.SubmitCode == '200') {
- // (this.$refs.uToast as any).show({
- // title: '成功',
- // type: 'success',
- // });
- // this.show = false;
- // this.getlist();
- // } else {
- // (this.$refs.uToast as any).show({
- // title: '失败',
- // type: 'error',
- // });
- // this.show = false;
- // this.getlist();
- // }
- // //入库后的查询下面列表的接口
- // await this.model.queryOrderNo(this.form5);
- // this.list = model.orderNoItemList;
- }
}