diff --git a/src/mycomponents/balance/location.vue b/src/mycomponents/balance/location.vue
index d5956aa4..9a730b5c 100644
--- a/src/mycomponents/balance/location.vue
+++ b/src/mycomponents/balance/location.vue
@@ -1,7 +1,7 @@
{{title}}
- {{locationCode}}
+ {{locationCode}}
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 20848b32..d3063f05 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -18,7 +18,7 @@
margin-right: 20rpx;
border-radius: 8rpx;
height: 30px;">
-
+
来源库位
@@ -31,7 +31,7 @@
@confirm="handleConfirm" style='height: 30rpx;border:1px solid #fff ;'>
-
+
{{fromLocationCode}}
diff --git a/src/pages/count/coms/comCountDetailcards.vue b/src/pages/count/coms/comCountDetailcards.vue
index 7d2fdafb..9b45c358 100644
--- a/src/pages/count/coms/comCountDetailcards.vue
+++ b/src/pages/count/coms/comCountDetailcards.vue
@@ -10,6 +10,7 @@
@@ -71,6 +72,10 @@
type: Boolean,
default: false
},
+ isShowRecommendQty: {
+ type: Boolean,
+ default: true
+ }
},
methods: {
edit(){
diff --git a/src/pages/count/coms/comCountJobCard.vue b/src/pages/count/coms/comCountJobCard.vue
index 64e5abe5..30ea3de0 100644
--- a/src/pages/count/coms/comCountJobCard.vue
+++ b/src/pages/count/coms/comCountJobCard.vue
@@ -3,7 +3,7 @@
-
+
阶段 : {{getCountStageName(dataContent.stage)}}
diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue
index 5b8e0783..d2870e6b 100644
--- a/src/pages/count/job/countBlindDetail.vue
+++ b/src/pages/count/job/countBlindDetail.vue
@@ -40,6 +40,7 @@
@@ -66,7 +67,9 @@
-
+
@@ -242,15 +245,15 @@
} else {
that.jobContent = res.data;
that.jobStatus = res.data.status;
- that.fromLocationCode = that.jobContent.locationCode;
- // res.data.subList.forEach(item => {
- // item.recommendQty = item.qty
- // item.handleQty = 0
- // item.countTime = new Date()
- // item.fromLocationCode =that.fromLocationCode;
- // })
- // that.allDetails = res.data.subList;
- // that.allCount = res.data.subList.length;
+ that.fromLocationCode = that.jobContent.countSplitCode;
+ res.data.subList.forEach(item => {
+ item.recommendQty = item.qty
+ item.handleQty = 0
+ item.countTime = new Date()
+ item.fromLocationCode =that.fromLocationCode;
+ })
+ that.allDetails = res.data.subList;
+ that.allCount = res.data.subList.length;
that.initList()
}
@@ -335,9 +338,9 @@
var packingNumber = result.label.packingNumber
var pack = result.package
var batch = result.label.batch
- var inventoryStatus = "OK"
- var qty = result.label.qty ? result.label.qty : 0;
-
+ var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
+ var qty = result.balance ? result.balance.qty : 0;
+
//按物料、箱码、批次、状态匹配
let items = this.allDetails.filter(r =>
r.itemCode === itemCode &&
@@ -346,13 +349,21 @@
r.inventoryStatus === inventoryStatus)
//不在任务列表中,是否添加库存
if (items.length == 0) {
- var detail = this.createAddDetailInfo(pack,qty)
- detail.countTime = new Date();
- this.allDetails.push(detail)
- this.updateList();
- this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
- null);
-
+ this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber +
+ "】不在任务列表中,是否要添加到列表中?",
+ res => {
+ //创建盘点信息,标记为已经扫描
+ if (res) {
+ var detail = this.createAddDetailInfo(pack,qty)
+ detail.countTime = new Date();
+ this.allDetails.push(detail)
+ this.updateList();
+ this.$refs.countQtyEdit.openEditPopupShowSeconds(detail,
+ null);
+ } else {
+ this.scanPopupGetFocus();
+ }
+ })
} else {
var selectItem = items[0]
//已经扫描
@@ -368,15 +379,15 @@
this.scanPopupGetFocus();
}
})
-
+
} else {
//未扫描,赋值
selectItem.scaned = true;
- selectItem.recommendQty =Number(qty);
+ selectItem.balanceQty= Number(qty)
selectItem.handleQty = Number(qty)
selectItem.packQty = pack.packQty
selectItem.packUnit = pack.packUnit
-
+
this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem,
null);
selectItem.countTime = new Date();
@@ -424,7 +435,7 @@
//创建盘盈的明细
createAddDetailInfo(pack,qty) {
var detail = {
- id: this.jobContent.masterId, //新增的明细
+ masterId: this.jobContent.id, //新增的明细
scaned: true,
countDetailNumber: "",
ownerCode: "",
@@ -448,6 +459,7 @@
countQty: 0,
balanceQty: 0,
fromLocationCode: this.fromLocationCode,
+ locationCode:this.fromLocationCode,
creator: this.$store.state.user.id,
countTime: new Date()
}
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 3f6a1ed4..85f35df4 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -152,6 +152,11 @@
action: "in",
value: this.status
})
+ filters.push({
+ column: "countSplitType",
+ action: "==",
+ value: "locationCode"
+ })
// filters.push({
// column: "accept_user_id",
@@ -195,20 +200,20 @@
},
openJobDetail(item) {
- uni.navigateTo({
- url: './countDetail?id=' + item.id + '&status=' + item.status
- });
- // //明盘
- // if(item.isOpenCount=="TRUE"){
- // uni.navigateTo({
- // url: './countLightDetail?id=' + item.id + '&status=' + item.status
- // });
- // }else {
- // //盲盘
- // uni.navigateTo({
- // url: './countBlindDetail?id=' + item.id + '&status=' + item.status
- // });
- // }
+ // uni.navigateTo({
+ // url: './countDetail?id=' + item.id + '&status=' + item.status
+ // });
+ //明盘
+ if(item.isOpenCount=="TRUE"){
+ uni.navigateTo({
+ url: './countLightDetail?id=' + item.id + '&status=' + item.status
+ });
+ }else {
+ //盲盘
+ uni.navigateTo({
+ url: './countBlindDetail?id=' + item.id + '&status=' + item.status
+ });
+ }
},
showItemList(itemList) {
@@ -293,6 +298,12 @@
action: "==",
value: code
})
+
+ filters.push({
+ column: "countSplitType",
+ action: "==",
+ value: "locationCode"
+ })
var params = {
filters: filters,
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index 51f1b74d..a0edefd5 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -68,7 +68,9 @@
-
+
@@ -244,7 +246,7 @@
} else {
that.jobContent = res.data;
that.jobStatus = res.data.status;
- that.fromLocationCode = that.jobContent.locationCode;
+ that.fromLocationCode = that.jobContent.countSplitCode;
res.data.subList.forEach(item => {
item.recommendQty = item.qty
item.handleQty = 0
@@ -434,7 +436,7 @@
//创建盘盈的明细
createAddDetailInfo(pack,qty) {
var detail = {
- id: this.jobContent.masterId, //新增的明细
+ masterId: this.jobContent.id, //新增的明细
scaned: true,
countDetailNumber: "",
ownerCode: "",
diff --git a/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
index e8e332d5..a849013e 100644
--- a/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
+++ b/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue
@@ -245,7 +245,7 @@
cursor: pointer;
/* #endif */
line-height: 36px;
- font-size: 60rpx;
+ font-size: 45rpx;
text-align: center;
// border-bottom: solid 1px #DDDDDD;
padding: 0px 10px;
@@ -296,6 +296,6 @@
}
.uni-input-input {
- font-size: 60rpx;
+ font-size: 40rpx;
}