diff --git a/common/record.js b/common/record.js
index f1184254..db2b1110 100644
--- a/common/record.js
+++ b/common/record.js
@@ -34,7 +34,7 @@ export function createDetailInfo(balance, pack) {
detail.qty = new Decimal(detail.qty).toNumber();
detail.stdPackQty = new Decimal(pack.stdPackQty).toNumber()
detail.stdPackUnit = pack.stdPackUnit
- detail.handleQty = new Decimal(detail.qty).toNumber() ;
+ detail.handleQty = new Decimal(detail.qty).toNumber() ;
detail.package = pack;
return detail;
diff --git a/mycomponents/qty/balanceQtyEdit.vue b/mycomponents/qty/balanceQtyEdit.vue
index fc8ec6ea..048afa71 100644
--- a/mycomponents/qty/balanceQtyEdit.vue
+++ b/mycomponents/qty/balanceQtyEdit.vue
@@ -141,6 +141,7 @@
openEditPopup(item, handleQty) {
this.dataContent = item
this.inventoryStatus = this.dataContent.inventoryStatus
+ this.originalInventoryStatus =this.dataContent.inventoryStatus;
this.toInventoryStatus = this.dataContent.toInventoryStatus
this.allQty = handleQty
setTimeout(res => {
diff --git a/pages/container/record/containerUnBindRecord.vue b/pages/container/record/containerUnBindRecord.vue
index cad024aa..881a7fe6 100644
--- a/pages/container/record/containerUnBindRecord.vue
+++ b/pages/container/record/containerUnBindRecord.vue
@@ -301,7 +301,7 @@
detail.itemCode = detail.itemCode;
detail.batch = detail.batch;
detail.inventoryStatus = detail.inventoryStatus;
-
+ detail.qty =detail.handleQty;
detail.package = null;
subList.push(detail)
}
diff --git a/pages/deliver/coms/comDeliverRequestPopup.vue b/pages/deliver/coms/comDeliverRequestPopup.vue
index 8e16f7f3..9aa7b43f 100644
--- a/pages/deliver/coms/comDeliverRequestPopup.vue
+++ b/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -42,7 +42,7 @@
数量 :
-
@@ -162,6 +162,7 @@
this.itemCode = "";
this.uom = ""
this.qty = 0
+ this.counQty =0;
this.itemCodeGetFocus();
}
diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue
index fa16f8c0..4fbe7262 100644
--- a/pages/deliver/record/deliverRecord.vue
+++ b/pages/deliver/record/deliverRecord.vue
@@ -172,9 +172,8 @@
}
})
if (item == undefined) {
- var itemp = createItemInfo(balance.qty, pack);
+ var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
- if(labelQty)
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
@@ -380,7 +379,7 @@
submitItem.fromLocationCode = detail.locationCode;
submitItem.toLocationCode = detail.toLocationCode;
- submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package ="";
subList.push(submitItem)
diff --git a/pages/inventoryMove/coms/comMoveRecord.vue b/pages/inventoryMove/coms/comMoveRecord.vue
index d9681136..4a51ef04 100644
--- a/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/pages/inventoryMove/coms/comMoveRecord.vue
@@ -421,7 +421,7 @@
submitItem.package = null;
submitItem.Records = null;
- submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+ submitItem.qty = detail.handleQty;
subList.push(submitItem)
}
diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index ef52b381..bff17718 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -163,7 +163,8 @@
} else {
this.itemCode = "";
this.uom = ""
- this.qty = 0
+ this.qty = 0;
+ this.count = 0;
this.itemCodeGetFocus();
}
diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue
index 29d09175..4644a651 100644
--- a/pages/package/record/mergePackageRecord.vue
+++ b/pages/package/record/mergePackageRecord.vue
@@ -271,7 +271,7 @@
detail.fromInventoryStatus = detail.inventoryStatus;
detail.toInventoryStatus = detail.inventoryStatus;
- detail.fromQty = detail.qty
+ detail.fromQty = detail.handleQty
detail.fromPackingNumber = detail.packingNumber;
detail.toPackingNumber = this.toPackingNumber;
diff --git a/pages/package/record/overPackageRecord.vue b/pages/package/record/overPackageRecord.vue
index 4dde0730..61f167f5 100644
--- a/pages/package/record/overPackageRecord.vue
+++ b/pages/package/record/overPackageRecord.vue
@@ -262,7 +262,7 @@
subItem.itemDesc2 = detail.package.itemDesc2;
subItem.fromInventoryStatus = detail.inventoryStatus;
- subItem.fromQty = detail.qty
+ subItem.fromQty = detail.handleQty
subItem.fromPackingNumber = detail.packingNumber;
subItem.fromBatch = detail.batch;
subItem.fromLocationCode = detail.locationCode;
diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue
index 644abbca..76f30d73 100644
--- a/pages/productPutaway/record/productPutawayRecord.vue
+++ b/pages/productPutaway/record/productPutawayRecord.vue
@@ -335,7 +335,7 @@
submitItem.fromLocationCode = detail.locationCode;
submitItem.toLocationCode = detail.toLocationCode;
- submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package ="";
subList.push(submitItem)
}
diff --git a/pages/productPutaway/request/putawayRequestCreate.vue b/pages/productPutaway/request/putawayRequestCreate.vue
index 414b0561..bc89b7b2 100644
--- a/pages/productPutaway/request/putawayRequestCreate.vue
+++ b/pages/productPutaway/request/putawayRequestCreate.vue
@@ -53,6 +53,7 @@
import {
goHome,
updateTitle,
+ deepCopyData,
getCurrDateTime,
getPackingNumberAndBatchByList
} from '@/common/basic.js';
@@ -210,14 +211,7 @@
},
calcHandleQty() {
- for (let item of this.detailSource) {
- item.qty = 0;
- for (let detail of item.subList) {
- if (detail != undefined) {
- item.qty = calc.add(item.qty,detail.qty)
- }
- }
- }
+ calcHandleQty(this.detailSource)
this.$forceUpdate();
},
@@ -283,7 +277,7 @@
productPutawayRequestSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成制品上架申请
" + res.data, )
+ this.showCommitSuccessMessage("提交成功
生成制品上架申请
" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -305,8 +299,7 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
- var subItem = {};
- Object.assign(subItem, detail)
+ var subItem = deepCopyData(detail)
subItem.fromLocationCode = detail.locationCode;
subItem.qty = detail.handleQty;
subItem.package = null;
diff --git a/pages/productReceipt/record/productReceiptRecord.vue b/pages/productReceipt/record/productReceiptRecord.vue
index f6495709..e1d9b0c2 100644
--- a/pages/productReceipt/record/productReceiptRecord.vue
+++ b/pages/productReceipt/record/productReceiptRecord.vue
@@ -64,6 +64,8 @@
import {
calc
} from '@/common/calc.js';
+
+ import { Decimal } from 'decimal.js';//引入
import {
getInventoryStatusDesc,
@@ -186,8 +188,8 @@
itemName: pack.itemName,
stdPackQty: pack.stdPackQty,
stdPackUnit: pack.stdPackUnit,
- qty: Number(label.qty),
- handleQty: 0,
+ qty: new Decimal(label.qty).toNumber(),
+ handleQty: new Decimal(0).toNumber(),
uom: pack.uom,
subList: []
}
@@ -195,11 +197,10 @@
},
createDetailInfo(label, pack) {
- let detail = {};
- Object.assign(detail, label)
+ let detail = deepCopyData(label);
detail.scaned = true;
- detail.qty = Number(label.qty);
- detail.handleQty = 0;
+ detail.qty = new Decimal(label.qty).toNumber();
+ detail.handleQty = new Decimal(label.qty).toNumber();
detail.inventoryStatus = "OK"
detail.stdPackQty = pack.stdPackQty;
detail.stdPackUnit = pack.stdPackUnit;
@@ -211,10 +212,10 @@
calcHandleQty() {
for (let item of this.detailSource) {
- item.qty = 0;
+ item.handleQty = new Decimal(0).toNumber();
for (let detail of item.subList) {
if (detail != undefined) {
- item.qty = calc.add(item.qty,detail.qty)
+ item.handleQty = calc.add(item.handleQty,detail.handleQty)
}
}
}
@@ -331,7 +332,7 @@
submitItem.productionlineCode = this.productionLineCode;
submitItem.workStationCode = this.workStationCode;
- submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package = "";
subList.push(submitItem)
diff --git a/pages/productionReceipt/record/productionReceiptRecord.vue b/pages/productionReceipt/record/productionReceiptRecord.vue
index 6a51526b..593a1b6c 100644
--- a/pages/productionReceipt/record/productionReceiptRecord.vue
+++ b/pages/productionReceipt/record/productionReceiptRecord.vue
@@ -316,6 +316,7 @@
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
this.fromLocationCode = '';
+ this.toLocationCode =""
})
},
diff --git a/pages/productionReturn/coms/comReturnRecord.vue b/pages/productionReturn/coms/comReturnRecord.vue
index b201da49..0f8d156a 100644
--- a/pages/productionReturn/coms/comReturnRecord.vue
+++ b/pages/productionReturn/coms/comReturnRecord.vue
@@ -5,8 +5,7 @@
-
+
@@ -17,7 +16,7 @@
+ :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation">
@@ -86,6 +85,10 @@
isShowToLocation: {
type: Boolean,
default: true
+ },
+ isShowFromLocation: {
+ type: Boolean,
+ default: true
}
},
watch: {
@@ -147,7 +150,7 @@
edit(item) {
this.editItem = item;
- this.$refs.recommendQtyEdit.openRecordEditPopup(item.qty);
+ this.$refs.recommendQtyEdit.openRecordEditPopup(item.handleQty);
// this.$refs.recommendQtyEdit.openEditPopup(item.qty);
},
@@ -165,7 +168,7 @@
});
},
confirm(qty) {
- this.editItem.qty = qty;
+ this.editItem.handleQty = qty;
this.$emit('updateData')
}
}
diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue
index e92aff05..838656d2 100644
--- a/pages/productionReturn/record/returnToHold.vue
+++ b/pages/productionReturn/record/returnToHold.vue
@@ -62,11 +62,15 @@
getPackingNumberAndBatchByList,
deepCopyData
} from '@/common/basic.js';
-
+
import {
calc
} from '@/common/calc.js';
+ import {
+ Decimal
+ } from 'decimal.js'; //引入
+
import {
getDirectoryItemArray
} from '@/common/directory.js';
@@ -168,7 +172,7 @@
this.$refs.scanPopup.openScanPopup(isEditPosition);
},
- async getScanResult(result, param) {
+ async getScanResult(result, param) {
this.positionInfo = param.positionInfo;
this.workshopCode = param.workshopCode;
this.productionLineCode = param.productionLineCode;
@@ -186,30 +190,30 @@
if (item == undefined) {
var filters = []
- filters.push({
- column: "itemCode",
- action: "==",
- value: label.itemCode
- })
- filters.push({
- column: "locationCode",
- action: "==",
- value: this.rawLocationCode
- })
-
- var params = {
- filters: filters,
- pageNo: 1,
- pageSize: 100,
- }
- var isCheckItemCode = await getBalanceByFilter(params);
- if(isCheckItemCode.data==null||isCheckItemCode.data.list==0){
+ filters.push({
+ column: "itemCode",
+ action: "==",
+ value: label.itemCode
+ })
+ filters.push({
+ column: "locationCode",
+ action: "==",
+ value: this.rawLocationCode
+ })
+
+ var params = {
+ filters: filters,
+ pageNo: 1,
+ pageSize: 100,
+ }
+ var isCheckItemCode = await getBalanceByFilter(params);
+ if (isCheckItemCode.data == null || isCheckItemCode.data.list == 0) {
this.showErrorMessage("未查询到物料号[" + label.itemCode + "]" +
- "库位[" + this.rawLocationCode + "]的信息")
- return
+ "库位[" + this.rawLocationCode + "]的信息")
+ return
}
-
-
+
+
var itemp = this.createItemInfo(label, pack);
let newDetail = this.createDetailInfo(label, pack);
newDetail.toLocationCode = "HOLD";
@@ -247,8 +251,8 @@
itemName: pack.itemName,
stdPackQty: pack.stdPackQty,
stdPackUnit: pack.stdPackUnit,
- qty: Number(label.qty),
- handleQty: 0,
+ qty: new Decimal(label.qty).toNumber(),
+ handleQty: new Decimal(0).toNumber(),
uom: pack.uom,
subList: []
}
@@ -256,11 +260,10 @@
},
createDetailInfo(label, pack) {
- let detail = {};
- Object.assign(detail, label)
+ let detail = deepCopyData(label);
detail.scaned = true;
- detail.qty = Number(label.qty);
- detail.handleQty = 0;
+ detail.qty = new Decimal(label.qty).toNumber();
+ detail.handleQty = new Decimal(label.qty).toNumber();
detail.inventoryStatus = "OK"
detail.stdPackQty = pack.stdPackQty;
detail.stdPackUnit = pack.stdPackUnit;
@@ -273,10 +276,10 @@
calcHandleQty() {
for (let item of this.detailSource) {
- item.qty = 0;
+ item.handleQty = new Decimal(0).toNumber();
for (let detail of item.subList) {
if (detail != undefined) {
- item.qty = calc.add(item.qty,detail.qty)
+ item.handleQty = calc.add(item.handleQty, detail.handleQty)
}
}
}
@@ -361,7 +364,7 @@
}
},
-
+
setFromPrecisionStrategParams() {
var itemList = []
this.detailSource.forEach(item => {
@@ -381,13 +384,13 @@
}
itemList.push(result)
}
-
+
}
})
})
return itemList;
},
-
+
setToPrecisionStrategParams() {
var itemList = []
this.detailSource.forEach(item => {
@@ -407,7 +410,7 @@
}
itemList.push(result)
}
-
+
}
})
})
@@ -421,35 +424,37 @@
item.subList.forEach(detail => {
if (detail.scaned) {
var submitItem = deepCopyData(detail)
- var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
+ var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail
+ .itemCode,
detail.packingNumber, detail.fromLocationCode, detail.batch);
- var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
+ var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail
+ .itemCode,
detail.packingNumber, detail.toLocationCode, detail.batch);
-
+
submitItem.itemCode = detail.itemCode;
submitItem.itemName = detail.package.itemName;
submitItem.itemDesc1 = detail.package.itemDesc1;
submitItem.itemDesc2 = detail.package.itemDesc2;
-
+
submitItem.inventoryStatus = detail.inventoryStatus;
-
+
submitItem.fromPackingNumber = fromInfo.packingNumber;
submitItem.toPackingNumber = toInfo.packingNumber;
-
+
submitItem.fromContainerNumber = detail.containerNumber;
submitItem.toContainerNumber = detail.containerNumber
-
+
submitItem.fromBatch = fromInfo.batch;
submitItem.toBatch = toInfo.batch;
-
+
submitItem.fromLocationCode = detail.fromLocationCode;
submitItem.toLocationCode = detail.toLocationCode;
-
+
submitItem.productionlineCode = this.productionLineCode;
submitItem.workStationCode = this.workStationCode;
-
- submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
-
+
+ submitItem.qty = detail.handleQty;
+
subList.push(submitItem)
}
})
diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue
index 98672fb1..56600d9a 100644
--- a/pages/productionReturn/record/returnToStore.vue
+++ b/pages/productionReturn/record/returnToStore.vue
@@ -15,6 +15,7 @@
@@ -61,6 +62,8 @@
import {
calc
} from '@/common/calc.js';
+
+ import { Decimal } from 'decimal.js';//引入
import {
getBusinessType,
@@ -215,6 +218,7 @@
newDetail.toWarehouseCode = toLocation.warehouseCode;
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
+ this.calcHandleQty();
})
} else {
@@ -232,6 +236,7 @@
newDetail.fromLocationCode = this.rawLocationCode;
newDetail.toWarehouseCode = toLocation.warehouseCode;
item.subList.push(newDetail);
+ this.calcHandleQty();
});
} else {
@@ -240,7 +245,6 @@
}
}
}
- this.calcHandleQty();
},
createItemInfo(label, pack) {
let item = {
@@ -248,8 +252,8 @@
itemName: pack.itemName,
stdPackQty: pack.stdPackQty,
stdPackUnit: pack.stdPackUnit,
- qty: Number(label.qty),
- handleQty: 0,
+ qty: new Decimal(label.qty).toNumber(),
+ handleQty: new Decimal(0).toNumber(),
uom: pack.uom,
subList: []
}
@@ -257,11 +261,10 @@
},
createDetailInfo(label, pack) {
- let detail = {};
- Object.assign(detail, label)
+ let detail = deepCopyData(label);
detail.scaned = true;
- detail.qty = Number(label.qty);
- detail.handleQty =0;
+ detail.qty = new Decimal(label.qty).toNumber();
+ detail.handleQty = new Decimal(label.qty).toNumber();
detail.inventoryStatus = "OK"
detail.stdPackQty = pack.stdPackQty;
detail.stdPackUnit = pack.stdPackUnit;
@@ -274,10 +277,10 @@
calcHandleQty() {
for (let item of this.detailSource) {
- item.qty = 0;
+ item.handleQty = new Decimal(0).toNumber();
for (let detail of item.subList) {
if (detail != undefined) {
- item.qty = calc.add(item.qty,detail.qty)
+ item.handleQty = calc.add(item.handleQty,detail.handleQty)
}
}
}
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 96d41864..68f60fce 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -241,7 +241,6 @@
});
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
- console.log("提交参数", JSON.stringify(params));
//直接创建申请
//直接创建记录
@@ -254,7 +253,7 @@
if (res.data) {
this.showCommitSuccessMessage("提交成功
生成采购退货记录
" + res.data)
} else {
- this.showErrorMessage("提交失败" + res.msg)
+ this.showErrorMessage("提交失败[" + res.msg+"]")
}
}).catch(error => {
uni.hideLoading()
@@ -290,7 +289,7 @@
submitItem.fromLocationCode = this.fromLocationCode;
submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空
- submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package = "";
subList.push(submitItem)
}
diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue
index 11f8fde1..3bc74428 100644
--- a/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -45,6 +45,7 @@
goHome,
updateTitle,
navigateBack,
+ deepCopyData,
getCurrDateOneMonthsTimes
} from '@/common/basic.js';
@@ -209,7 +210,6 @@
commit() {
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
- console.log("提交参数", JSON.stringify(params));
uni.showLoading({
title: "提交中....",
mask: true
@@ -240,11 +240,13 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
+ var submitItem = deepCopyData(detail)
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
- detail.fromLocationCode = detail.locationCode
- subList.push(detail)
+ submitItem.fromLocationCode = detail.locationCode
+ submitItem.qty =detail.handleQty;
+ subList.push(submitItem)
}
})
})
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 78ccda98..3f50079f 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -386,7 +386,7 @@
// detail.toInventoryStatus = detail.inventoryStatus
// detail.toLocationCode = detail.toLocationCode
- submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+ submitItem.qty = detail.handleQty ;
submitItem.package = "";
subList.push(submitItem)
}
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
index f2b87b99..5db4e85a 100644
--- a/pages/repleinsh/record/repleinshRecord.vue
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -72,8 +72,6 @@
import {
getBusinessType,
- createItemInfo,
- createDetailInfo,
calcHandleQty
} from '@/common/record.js';
diff --git a/pages/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue
index 827a5728..70b0ffb0 100644
--- a/pages/scrap/record/scrapRecord.vue
+++ b/pages/scrap/record/scrapRecord.vue
@@ -18,7 +18,7 @@
@@ -176,20 +176,6 @@
},
- createItemInfo(balance, pack) {
- let item = {
- itemCode: balance.itemCode,
- itemName: pack.itemName,
- stdPackQty: pack.stdPackQty,
- stdPackUnit: pack.stdPackUnit,
- qty: Number(balance.qty),
- handleQty: 0,
- uom: pack.uom,
- subList: []
- }
- return item;
- },
-
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
@@ -297,7 +283,7 @@
submitItem.toLocationCode = "";
submitItem.reason = this.reasonCode;
- submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package ="";
subList.push(submitItem)
}
diff --git a/pages/scrap/request/scrapRequestCreate.vue b/pages/scrap/request/scrapRequestCreate.vue
index 8d55339b..0192e97f 100644
--- a/pages/scrap/request/scrapRequestCreate.vue
+++ b/pages/scrap/request/scrapRequestCreate.vue
@@ -17,7 +17,9 @@
diff --git a/pages/transfer/record/deliverRecord.vue b/pages/transfer/record/deliverRecord.vue
index 910d99ce..8baebdd1 100644
--- a/pages/transfer/record/deliverRecord.vue
+++ b/pages/transfer/record/deliverRecord.vue
@@ -334,7 +334,7 @@
submitItem.fromLocationCode = detail.locationCode;
submitItem.toLocationCode = detail.toLocationCode;
- submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package = "";
subList.push(submitItem)
diff --git a/pages/transfer/record/receiptRecord.vue b/pages/transfer/record/receiptRecord.vue
index ddd98c2d..601d7952 100644
--- a/pages/transfer/record/receiptRecord.vue
+++ b/pages/transfer/record/receiptRecord.vue
@@ -316,7 +316,7 @@
submitItem.fromLocationCode = detail.locationCode;
submitItem.toLocationCode = detail.toLocationCode;
- submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package = "";
subList.push(submitItem)
diff --git a/pages/unPlanned/coms/comReceiptRecord.vue b/pages/unPlanned/coms/comReceiptRecord.vue
index 3b993ca8..0397b8c2 100644
--- a/pages/unPlanned/coms/comReceiptRecord.vue
+++ b/pages/unPlanned/coms/comReceiptRecord.vue
@@ -5,7 +5,7 @@
-
@@ -16,9 +16,8 @@
-
-
+
@@ -147,7 +146,7 @@
edit(item) {
this.editItem = item;
- this.$refs.qtyEdit.openRecordEditPopup(item.label.qty);
+ this.$refs.qtyEdit.openRecordEditPopup(item.handleQty);
},
detail(packageInfo) {
@@ -164,7 +163,7 @@
});
},
confirm(qty) {
- this.editItem.label.qty = qty;
+ this.editItem.handleQty = qty;
this.$emit('updateData')
}
}
diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue
index aee41088..d523a4de 100644
--- a/pages/unPlanned/coms/comReceiptRequestPopup.vue
+++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -48,10 +48,13 @@
数量 :
-
-
+
+
+
+ ()
+
@@ -65,7 +68,7 @@
-
+
@@ -82,6 +85,7 @@
checkDirectoryItemExist
} from '@/common/directory.js';
import uom from '@/mycomponents/qty/uom.vue'
+ import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanItem from '@/mycomponents/scan/winScanItem.vue'
@@ -90,6 +94,7 @@
export default {
components: {
uom,
+ stdPackQty,
balanceStatus,
comMessage,
winScanItem,
@@ -112,6 +117,8 @@
toLocationCode: '请扫描库位信息',
isCheckLocationCode: false,
editPosition: true,
+ maxlength:10,
+ stdPackInfo:undefined
}
},
props: {
@@ -121,12 +128,28 @@
},
},
methods: {
+ checkNum(e) {
+ let value = e.detail.value;
+ let dot = value.indexOf('.'); //包含小数点
+ let reg = /^[0-9]+$/; //正整数
+ if (dot > -1) {
+ this.maxlength = dot + 7; //长度是小数点后两位
+ if (value.length > dot + 7) {
+
+ }
+ }
+ if (reg.test(value)) { //如果是正整数不包含小数点
+ this.maxlength = 10;
+ }
+ this.change(value)
+ },
openRequestPopup(editPosition) {
this.editPosition = editPosition;
if (!editPosition) {
this.itemCode = "";
this.uom = ""
this.qty = 0
+ this.count = 0;
this.itemCodeGetFocus();
}
this.$refs.popup.open('bottom')
@@ -231,13 +254,14 @@
this.closeRequestPopup();
},
- getItemCode(code) {
+ getItemCode(code, scanResult) {
if (code == "") {
this.showErrorMessage('物料号不能为空')
return;
}
this.itemCode = "";
this.checkItemCode(code)
+ this.stdPackInfo = scanResult.package;
},
getLocationCode(location, code) {
this.toLocationCode = code;
diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue
index a662bbfa..374f4611 100644
--- a/pages/unPlanned/record/issueRecord.vue
+++ b/pages/unPlanned/record/issueRecord.vue
@@ -255,7 +255,7 @@
submitItem.toLocationCode = "";
submitItem.reason = this.reasonCode;
- submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package ="";
subList.push(submitItem)
diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue
index 1568020d..09e57294 100644
--- a/pages/unPlanned/record/receiptRecord.vue
+++ b/pages/unPlanned/record/receiptRecord.vue
@@ -68,6 +68,8 @@
import {
calc
} from '@/common/calc.js';
+
+ import { Decimal } from 'decimal.js';//引入
import {
goHome,
updateTitle,
@@ -173,8 +175,8 @@
itemName: pack.itemName,
stdPackQty: pack.stdPackQty,
stdPackUnit: pack.stdPackUnit,
- qty: label.qty,
- handleQty: 0,
+ qty: new Decimal(label.qty).toNumber(),
+ handleQty: new Decimal(0).toNumber(),
uom: label.uom,
subList: []
}
@@ -182,12 +184,12 @@
},
createDetailInfo(label, pack) {
- let detail = {};
+ let detail = deepCopyData(label);
detail.scaned = true;
// Object.assign(detail, label)
- detail.qty = Number(label.qty)
- detail.handleQty = 0,
- detail.inventoryStatus = "OK"
+ detail.qty = new Decimal(label.qty).toNumber();
+ detail.handleQty = new Decimal(label.qty).toNumber();
+ detail.inventoryStatus = "OK"
detail.stdPackQty = pack.stdPackQty;
detail.stdPackUnit = pack.stdPackUnit;
label.inventoryStatus = "OK";
@@ -199,10 +201,10 @@
calcHandleQty() {
for (let item of this.detailSource) {
- item.qty = 0;
+ item.handleQty = new Decimal(0).toNumber();
for (let detail of item.subList) {
if (detail != undefined) {
- item.qty = calc.add(item.qty, detail.label.qty)
+ item.handleQty = calc.add(item.handleQty, detail.handleQty)
}
}
}
@@ -339,7 +341,7 @@
submitItem.reason = this.reasonCode;
- submitItem.qty = detail.label.qty;
+ submitItem.qty = detail.handleQty;
submitItem.package = "";
subList.push(submitItem)
diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue
index 433a0f8f..5ed7d8c9 100644
--- a/pages/unPlanned/request/issueRequestCreate.vue
+++ b/pages/unPlanned/request/issueRequestCreate.vue
@@ -18,7 +18,7 @@
@@ -78,6 +78,7 @@
import {
goHome,
updateTitle,
+ deepCopyData,
getCurrDateTimes,
getCurrDateOneMonthsTimes,
navigateBack
@@ -255,16 +256,18 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
- detail.fromLocationCode = detail.locationCode;
- detail.reason = this.reasonCode;
- detail.containerNumber ="";
- subList.push(detail)
+ var submitItem = deepCopyData(detail)
+ submitItem.fromLocationCode = detail.locationCode;
+ submitItem.reason = this.reasonCode;
+ submitItem.containerNumber ="";
+ submitItem.qty = detail.handleQty;
+ subList.push(submitItem)
}
})
})
this.dataContent.subList = subList
- this.dataContent.status = 1;
+ this.dataContent.status = "1";
this.dataContent.requestTime = getCurrDateTimes();
this.dataContent.dueTime = getCurrDateOneMonthsTimes();
diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue
index a2f02fc9..1fd5e8d3 100644
--- a/pages/unPlanned/request/receiptRequestCreate.vue
+++ b/pages/unPlanned/request/receiptRequestCreate.vue
@@ -58,6 +58,7 @@
getISODateTime,
navigateBack,
getBatch,
+ deepCopyData,
getCurrDateTimes,
getCurrDateOneMonthsTimes
} from '@/common/basic.js';
@@ -186,16 +187,17 @@
setRequestParams() {
var subList = []
this.detailSource.subList.forEach(detail => {
- detail.toLocationCode = this.detailSource.toLocationCode;
- detail.reason = this.reasonCode;
- detail.containerNumber = "";
- detail.batch = getBatch();
- detail.inventoryStatus = "OK";
+ var submitItem = deepCopyData(detail)
+ submitItem.toLocationCode = this.detailSource.toLocationCode;
+ submitItem.reason = this.reasonCode;
+ submitItem.containerNumber = "";
+ submitItem.batch = getBatch();
+ submitItem.inventoryStatus = "OK";
console.log("", getBatch())
- subList.push(detail)
+ subList.push(submitItem)
})
this.dataContent.subList = subList
- this.dataContent.status = 1;
+ this.dataContent.status = "1";
this.dataContent.requestTime = getCurrDateTimes();
this.dataContent.dueTime = getCurrDateOneMonthsTimes();