Browse Source

修改合格转隔离任务

wms3.0_pda
Niext 11 months ago
parent
commit
3a484c20fb
  1. 18
      mycomponents/qty/balanceQtyEdit.vue
  2. 3
      pages/inventoryMove/coms/comInventoryDetailCard.vue
  3. 8
      pages/inventoryMove/coms/comMove.vue
  4. 6
      pages/inventoryMove/coms/comMoveJob.vue
  5. 9
      pages/inventoryMove/coms/comMoveRecord.vue
  6. 72
      pages/inventoryMove/job/inventoryMoveDetail.vue
  7. 2
      pages/inventoryMove/job/okToHoldMoveJob.vue
  8. 2
      static/config.json

18
mycomponents/qty/balanceQtyEdit.vue

@ -35,7 +35,8 @@
<view class="uni-flex uni-row space-between padding title u-col-center">
<text>数量 : </text>
<view class="uni-flex uni-row uni-center" style="align-items: center;">
<input class="qty_input" v-model="allQty" :focus="true" type="number" @confirm="confirm()" />
<input class="qty_input" v-model="allQty" :focus="true" type="number"
@confirm="confirm()" />
<uom :uom="dataContent.uom"></uom>
</view>
</view>
@ -48,7 +49,8 @@
</view>
</view>
<u-line />
<view v-if="isShowStatus" class="uni-flex uni-row space-between title u-col-center" style="padding-left: 30rpx;">
<view v-if="isShowStatus" class="uni-flex uni-row space-between title u-col-center"
style="padding-left: 30rpx;">
<text>库存状态 : </text>
<view class="uni-flex uni-row uni-center" style="align-items: center;">
<balanceStatus ref="balanceStatus" :status="inventoryStatus"
@ -126,9 +128,9 @@
this.inventoryStatus = this.dataContent.inventoryStatus
this.toInventoryStatus = this.dataContent.toInventoryStatus
this.allQty = Number(handleQty)
setTimeout(res=>{
setTimeout(res => {
this.$refs.popup.open('bottom')
},500)
}, 500)
},
closeEditPopup() {
this.$refs.popup.close()
@ -141,7 +143,7 @@
this.closeEditPopup();
},
calcQty(val) {
if(val>0){
if (val > 0) {
this.allQty = val * Number(this.dataContent.stdPackQty);
}
},
@ -162,8 +164,10 @@
}
},
callback() {
this.dataContent.toInventoryStatus = this.inventoryStatus
this.$emit("confirm", Number(this.allQty));
let qty = Number(this.allQty);
this.dataContent.toInventoryStatus = this.inventoryStatus;
this.dataContent.handleQty = qty;
this.$emit("confirm", qty);
this.closeEditPopup();
},
updateStatus(value) {

3
pages/inventoryMove/coms/comInventoryDetailCard.vue

@ -124,7 +124,8 @@
});
},
confirm(qty) {
this.editItem.qty = qty;
// this.editItem.handleQty=qty;
//this.editItem.qty = qty;
this.$emit('updateData')
},
showLocation(item) {

8
pages/inventoryMove/coms/comMove.vue

@ -287,7 +287,6 @@
this.toWarehouseCode = ""
},
commit() {
if (this.toLocationCode == "") {
this.showMessage("请先选择目标库位")
return;
@ -373,7 +372,6 @@
detail.itemDesc2 = detail.package.itemDesc2;
detail.fromInventoryStatus = detail.inventoryStatus;
// detail.toInventoryStatus = this.toInventoryStatus;
detail.fromPackingNumber = info.packingNumber;
detail.toPackingNumber = info.packingNumber;
@ -385,7 +383,11 @@
detail.toBatch = info.batch;
detail.fromLocationCode = detail.locationCode;
detail.toLocationCode = detail.toLocationCode;
if (this.businessType != '') {
detail.toLocationCode = this.toLocationCode;
detail.toInventoryStatus = this.toInventoryStatus;
}
subList.push(detail)
}

6
pages/inventoryMove/coms/comMoveJob.vue

@ -199,12 +199,10 @@
that.showMessage(error)
})
},
openJobDetail(item) {
uni.navigateTo({
url: './inventoryMoveDetail?id=' + item.id + '&status=' + item.status
url: './inventoryMoveDetail?id=' + item.id + '&status=' + item.status+'&businessTypeCode='+this.businessTypeCode
});
},

9
pages/inventoryMove/coms/comMoveRecord.vue

@ -24,7 +24,8 @@
</view>
</uni-collapse-item>
</uni-collapse>
<balanceQtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="isShowStatus" :allowEditStatus="allowEditStatus">
<balanceQtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="isShowStatus"
:allowEditStatus="allowEditStatus">
</balanceQtyEdit>
<job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup>
<comMessage ref="comMessage"></comMessage>
@ -82,10 +83,10 @@
type: Boolean,
default: false
},
},
watch: {
},
data() {
@ -170,7 +171,9 @@
});
},
confirm(qty) {
debugger;
this.editItem.qty = qty;
this.editItem.handleQty = qty;
this.$emit('updateData')
}
}

72
pages/inventoryMove/job/inventoryMoveDetail.vue

@ -9,6 +9,7 @@
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -63,7 +64,7 @@
navigateBack,
getCurrDateTime,
getPackingNumberAndBatchByList,
getInventoryStatusName
getInventoryStatusName,
} from '@/common/basic.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
@ -77,7 +78,7 @@
export default {
name: 'returnDetail',
name: 'inventoryMoveDetail',
components: {
winScanButton,
winScanPack,
@ -99,11 +100,18 @@
toLocationInfo: {},
businessTypeInfo: {},
locationTypeList: [],
managementList: []
managementList: [],
businessTypeCode: '',
toLocationCode: '',
toinventoryStatus: ''
};
},
props: {
},
onLoad(option) {
this.id = option.id;
this.businessTypeCode = option.businessTypeCode;
if (this.id != undefined) {
// //
if (option.status == "1") {
@ -114,6 +122,7 @@
} else {
this.getDetail();
}
this.initData();
}
},
//
@ -151,6 +160,38 @@
},
methods: {
initData() {
var name = ""
if (this.businessTypeCode == "Move") {
name = "库存转移";
} else if (this.businessTypeCode == "HoldToOk") {
name = "隔离转合格";
this.toLocationCode = '';
this.toinventoryStatus = 'Ok';
} else if (this.businessTypeCode == "HoldToScrap") {
name = "隔离转报废";
this.toLocationCode = 'Scrap';
this.toinventoryStatus = 'Scrap';
} else if (this.businessTypeCode == "OkToHold") {
name = "合格转隔离";
this.toLocationCode = 'Hold';
this.toinventoryStatus = 'Hold';
} else if (this.businessTypeCode == "OktoScrap") {
name = "合格转报废";
this.toLocationCode = 'Scrap';
this.toinventoryStatus = 'Scrap';
} else if (this.businessTypeCode == "ScrapToHold") {
name = "报废转隔离";
this.toLocationCode = 'Hold';
this.toinventoryStatus = 'Hold';
}
uni.setNavigationBarTitle({
title: name + '详情'
})
},
//
receive(callback) {
uni.showLoading({
@ -209,7 +250,6 @@
this.$refs.jobDetailPopup.openPopup(item)
},
updateData() {
this.calcHandleQty();
},
@ -273,7 +313,7 @@
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
@ -293,7 +333,7 @@
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty);
itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = Number(result.balance.qty);
itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
@ -344,14 +384,14 @@
title: "提交中....",
mask: true
});
//
this.managementList = [];
var precisionStrategParams = this.setPrecisionStrategParams()
getPrecisionStrategyList(precisionStrategParams, res => {
if (res.success) {
this.managementList = res.list;
var params = this.setParams()
console.log("提交" + JSON.stringify(params))
inventoryMoveSubmit(params).then(res => {
@ -373,27 +413,27 @@
})
},
setPrecisionStrategParams(){
setPrecisionStrategParams() {
var itemList = []
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
var filterResult = itemList.filter(res => {
if (res.itemCode == item.itemCode
&&res.locationCode == detail.toLocationCode) {
if (res.itemCode == item.itemCode &&
res.locationCode == detail.toLocationCode) {
return res
}
})
//
if(filterResult.length==0){
if (filterResult.length == 0) {
var result = {
itemCode: item.itemCode,
locationCode: detail.toLocationCode
}
itemList.push(result)
}
}
})
})
@ -412,8 +452,8 @@
detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch;
detail.toContainerNumber = '';
detail.toLocationCode = detail.toLocationCode;
// detail.toLocationCode = this.toLocationCode;
detail.toinventoryStatus=this.toinventoryStatus;
subList.push(detail)
}
})

2
pages/inventoryMove/job/okToHoldMoveJob.vue

@ -1,6 +1,6 @@
<template>
<view class="page-wraper">
<comMoveJob ref="comMoveJob" businessTypeCode='OkToHold'> </comMoveJob>
<comMoveJob ref="comMoveJob" businessTypeCode='OkToHold' > </comMoveJob>
</view>
</template>

2
static/config.json

@ -18,7 +18,7 @@
"request_url": {
"name": "request_url",
"value": "http://192.168.0.176:12080/admin-api",
"value": "http://dev.ccwin-in.com:25100/api/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api",
"chefang": "http://192.168.0.176:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api",

Loading…
Cancel
Save