diff --git a/src/manifest.json b/src/manifest.json
index 49401d07..c676b8f7 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
"name" : "wms",
"appid" : "__UNI__C9CF4BF",
"description" : "",
- "versionName" : "1.0.0",
- "versionCode" : 1,
+ "versionName" : "1.0.5",
+ "versionCode" : 5,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 4d552454..1bcb962f 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -14,10 +14,12 @@
-
-
+
+
@@ -75,7 +77,8 @@
getBusinessType,
createItemInfo,
createDetailInfo,
- calcTreeHandleQty
+ calcTreeHandleQty,
+ calcHandleQty
} from '@/common/record.js';
import {
@@ -170,6 +173,8 @@
let balance = result.balance;
let label = result.label;
let pack = result.package;
+ let packUnit = pack.packUnit;
+ let packQty =pack.packQty
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
@@ -179,37 +184,36 @@
this.fromWarehouseCode = balance.warehouseCode;
}
if (item == undefined) {
- // 获取推荐库位
- // this.getRecommendLocation(balance, pack, toLocation => {
- var itemp = createItemInfo(balance, pack);
- let newDetail = createDetailInfo(balance, pack); //
- // newDetail.toLocationCode = toLocation.code;
- // newDetail.toWarehouseCode = toLocation.warehouseCode;
- itemp.subList.push(newDetail);
- var dataList = pack.subList
- this.detailSource.push(itemp)
- this.detailSource.forEach(res => {
- res.subList.forEach(pack => {
- pack.packList = dataList.filter(c => c.parentNumber == pack
- .packingNumber)
- pack.packList.forEach(pac => {
- pac.parentPackingNumber = pac.parentNumber;
- pac.packingNumber = pac.number;
- pac.inventoryStatus = "OK";
- pac.scaned = true;
- })
- })
- })
- // })
-
+
+ var itemp = createItemInfo(balance, pack);
+ let newDetail = createDetailInfo(balance, pack); //
+ newDetail.packUnit =packUnit;
+ newDetail.packQty=packQty;
+ itemp.subList.push(newDetail);
+ this.detailSource.push(itemp)
+ calcHandleQty(this.detailSource);
+
} else {
- var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
- balance.batch);
- if (itemDetail != undefined) {
- this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+ var detail = item.subList.find(r => {
+ if (r.packingNumber == balance.packingNumber &&
+ r.batch == balance.batch &&
+ r.locationCode == balance.locationCode &&
+ r.inventoryStatus == balance.inventoryStatus) {
+ return r;
+ }
+ })
+ if (detail == undefined) {
+ let newDetail = createDetailInfo(balance, pack);
+ newDetail.packUnit =packUnit;
+ newDetail.packQty=packQty;
+ item.subList.push(newDetail);
+ calcHandleQty(this.detailSource);
+ } else {
+ if (detail.scaned == true) {
+ this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+ }
}
}
- // calcTreeHandleQty(this.detailSource);
},
//获取推荐库位
@@ -318,12 +322,6 @@
},
-
-
- updateData() {
- this.calcTreeHandleQty();
- },
-
removeItem(index, item) {
this.detailSource.splice(index, 1)
},
@@ -403,38 +401,6 @@
});
},
-
- getItemAndLocationRelations() {
- var itemList = []
- this.detailSource.forEach(item => {
- item.subList.forEach(detail => {
- if (detail.scaned) {
- detail.toLocationCode = this.toLocationCode;
- var filterResult = itemList.filter(res => {
- if (res.itemCode == item.itemCode &&
- res.locationCode == detail.toLocationCode &&
- res.batch == detail.batch &&
- res.inventoryStatus == detail.inventoryStatus) {
- return res
- }
- })
- //去掉重复元素
- if (filterResult.length == 0) {
- var result = {
- itemCode: item.itemCode,
- locationCode: detail.toLocationCode,
- batch: detail.batch,
- inventoryStatus: detail.inventoryStatus,
- }
- itemList.push(result)
- }
-
- }
- })
- })
- return itemList;
- },
-
setRecordParams() {
var subList = []
var creator = this.$store.state.user.id
@@ -467,7 +433,11 @@
toBatch:info.batch,
fromLocationCode:detail.locationCode,
toLocationCode:detail.toLocationCode,
- handleQty:detail.handleQty
+ handleQty:detail.handleQty,
+ fromPackUnit:detail.packUnit,
+ toPackUnit:detail.packUnit,
+ fromPackQty:detail.packQty,
+ toPackQty:detail.packQty
}
]
subList.push(submitItem)
@@ -532,15 +502,17 @@
})
},
- updateData() {
- // this.calcTreeHandleQty();
- for (var i = 0; i < this.detailSource.length; i++) {
- let item = this.detailSource[i];
- if (item.qty == 0) {
- this.detailSource.splice(i, 1)
- }
+ updateData() {
+ calcHandleQty(this.detailSource);
+ for (var i = 0; i < this.detailSource.length; i++) {
+ let item = this.detailSource[i];
+ if (item.qty == 0) {
+ this.detailSource.splice(i, 1)
}
- },
+ }
+ this.$forceUpdate();
+
+ },
clearData() {
this.fromLocationInfo = {};
@@ -548,6 +520,7 @@
this.fromWarehouseCode = '';
this.toWarehouseCode = '';
this.detailSource = [];
+ this.to
}
}
}
diff --git a/src/pages/issue/record/directIssue1.vue b/src/pages/issue/record/directIssue1.vue
new file mode 100644
index 00000000..4d552454
--- /dev/null
+++ b/src/pages/issue/record/directIssue1.vue
@@ -0,0 +1,557 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index a6a257b0..4d2ccead 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -124,7 +124,7 @@
uni.clearStorage(); //清除缓存
if (process.env.NODE_ENV === 'development') {
this.username = "admin"
- this.password = "123456";
+ this.password = "win123456";
}
uni.setNavigationBarColor({
frontColor: '#ffffff',