Browse Source

修改三方库

pda_nev
李俊城 10 months ago
parent
commit
2d7bb5873e
  1. 9
      fe/PDA/api/index.js
  2. 6
      fe/PDA/mycomponents/comRequest/comThirdLocationRequestItem.vue
  3. 2
      fe/PDA/mycomponents/coms/task/comThird.vue
  4. 4
      fe/PDA/pages.js
  5. 4
      fe/PDA/pages.json
  6. 6
      fe/PDA/pages/record/productionReturn.vue
  7. 130
      fe/PDA/pages/record/productionReturnPack.vue
  8. 3
      fe/PDA/pages/request/thirdLocationRequest.vue
  9. 6
      fe/PDA/pages/request/thirdLocationRequestListDetail.vue
  10. 4
      fe/PDA/pages/task/thirdLocationJob.vue
  11. 12
      fe/PDA/pages/task/thirdLocationJobDetail.vue

9
fe/PDA/api/index.js

@ -1548,6 +1548,15 @@ export const getThirdLocationList = (params) => request(
data: params data: params
}); });
export const getThirdLocationList1 = (params) => request(
devUrl + "/api/pda/job/third-location/list", {
method: 'post',
data: {"condition":{"filters":[]},"Sorting":"","SkipCount":0,"MaxResultCount":20}
});
//根据Number 获取三方库收货任务 //根据Number 获取三方库收货任务
export const getThirdLocationJobByNumber = (number) => request( export const getThirdLocationJobByNumber = (number) => request(
devUrl + "/api/pda/job/third-location/by-number/" + number, { devUrl + "/api/pda/job/third-location/by-number/" + number, {

6
fe/PDA/mycomponents/comRequest/comThirdLocationRequestItem.vue

@ -29,12 +29,12 @@
</view> </view>
<view class="" style="float: right;" > <view class="" style="float: right;" >
<view class="uni-flex uni-row"> <view class="uni-flex uni-row" v-if="dataContent.requestStatus==1||dataContent.requestStatus==5||dataContent.requestStatus==9" >
<!-- 新增执行中 --> <!-- 新增执行中 -->
<button v-if="dataContent.requestStatus==1||dataContent.requestStatus==5" type="primary" style="width: 140rpx; font-size: 32rpx; margin-right: 20rpx;" <button type="primary" style="width: 140rpx; font-size: 32rpx; margin-right: 20rpx;"
@click.stop="cancle()">取消</button> @click.stop="cancle()">取消</button>
<!-- 部分完成可以完成 --> <!-- 部分完成可以完成 -->
<button v-if="dataContent.requestStatus==9" type="primary" style="width: 140rpx; font-size: 32rpx; margin-right: 20rpx;" <button type="primary" style="width: 140rpx; font-size: 32rpx; margin-right: 20rpx;"
@click.stop="finish()">完成</button> @click.stop="finish()">完成</button>
</view> </view>

2
fe/PDA/mycomponents/coms/task/comThird.vue

@ -28,7 +28,7 @@
<view class=""> <view class="">
</view> </view>
<view class="" style="float: right;" > <view class="" style="float: right;" v-if="dataContent.jobStatus==1||dataContent.jobStatus==2||dataContent.jobStatus==4">
<view class="uni-flex uni-row"> <view class="uni-flex uni-row">
<button type="primary" style="width: 140rpx; font-size: 32rpx; margin-right: 20rpx;" <button type="primary" style="width: 140rpx; font-size: 32rpx; margin-right: 20rpx;"
@click.stop="finish()">完成</button> @click.stop="finish()">完成</button>

4
fe/PDA/pages.js

@ -695,14 +695,14 @@ module.exports = () => ({
{ {
"path": "pages/record/productionReturn", "path": "pages/record/productionReturn",
"style": { "style": {
"navigationBarTitleText": "客户退货(单件码)", "navigationBarTitleText": "客户退货单件码",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },
{ {
"path": "pages/record/productionReturnPack", "path": "pages/record/productionReturnPack",
"style": { "style": {
"navigationBarTitleText": "客户退货(箱码)", "navigationBarTitleText": "客户退货箱码",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },

4
fe/PDA/pages.json

@ -680,14 +680,14 @@
{ {
"path": "pages/record/productionReturn", "path": "pages/record/productionReturn",
"style": { "style": {
"navigationBarTitleText": "客户退货(单件码)", "navigationBarTitleText": "客户退货单件码",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },
{ {
"path": "pages/record/productionReturnPack", "path": "pages/record/productionReturnPack",
"style": { "style": {
"navigationBarTitleText": "客户退货(箱码)", "navigationBarTitleText": "客户退货箱码",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },

6
fe/PDA/pages/record/productionReturn.vue

@ -168,7 +168,7 @@
if (res) { if (res) {
this.allDataList.splice(index, 1); this.allDataList.splice(index, 1);
this.allCount = this.allDataList.length; this.allCount = this.allDataList.length;
var title =this.allCount>0?"客户退货单件码"+"("+this.allCount+")":"客户退货" var title =this.allCount>0?"客户退货单件码"+"("+this.allCount+")":"客户退货单件码"
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: title title: title
}) })
@ -200,7 +200,7 @@
this.allDataList.unshift(item) this.allDataList.unshift(item)
this.allCount = this.allDataList.length; this.allCount = this.allDataList.length;
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "客户退货"+"("+this.allCount+")" title: "客户退货单件码"+"("+this.allCount+")"
}) })
this.$forceUpdate(); this.$forceUpdate();
@ -409,7 +409,7 @@
this.allCount = 0; this.allCount = 0;
this.loadingType = "" this.loadingType = ""
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "客户退货" title: "客户退货单件码"
}) })
this.$refs.comCollapseLocation.clearLocation(); this.$refs.comCollapseLocation.clearLocation();
}, },

130
fe/PDA/pages/record/productionReturnPack.vue

@ -2,7 +2,7 @@
<page-meta root-font-size="18px"></page-meta> <page-meta root-font-size="18px"></page-meta>
<view class=""> <view class="">
<win-blank-view @goScan='openScanPopup' v-if="allDataList.length==0"></win-blank-view> <win-blank-view @goScan='openScanPopup' v-if="allDataList.length==0"></win-blank-view>
<scroll-view scroll-y class="scroll-detail" style="margin-top: 10rpx;padding-bottom:100px" > <scroll-view scroll-y class="scroll-detail" style="margin-top: 10rpx;padding-bottom:100px">
<view class="detail-list " v-for="(item, index) in allDataList" :key="index"> <view class="detail-list " v-for="(item, index) in allDataList" :key="index">
<view class="detail-content"> <view class="detail-content">
<view class="" style=""> <view class="" style="">
@ -18,6 +18,14 @@
<uni-td align="center">箱码</uni-td> <uni-td align="center">箱码</uni-td>
<uni-td>{{item.packingCode}}</uni-td> <uni-td>{{item.packingCode}}</uni-td>
</uni-tr> </uni-tr>
<uni-tr>
<uni-td align="center">批次</uni-td>
<uni-td>{{item.lot}}</uni-td>
</uni-tr>
<uni-tr>
<uni-td align="center">库位</uni-td>
<uni-td>{{item.recommendLocationCode}}</uni-td>
</uni-tr>
<uni-tr> <uni-tr>
<uni-td align="center">单位</uni-td> <uni-td align="center">单位</uni-td>
<uni-td>{{item.uom}}</uni-td> <uni-td>{{item.uom}}</uni-td>
@ -119,7 +127,7 @@
return { return {
options: [], options: [],
currentItem: {}, currentItem: {},
toLocationInfo:{}, toLocationInfo: {},
toLocationCode: "", toLocationCode: "",
allCount: 0, allCount: 0,
allDataList: [], allDataList: [],
@ -133,8 +141,7 @@
props: { props: {
}, },
onLoad() { onLoad() {},
},
onPullDownRefresh() { onPullDownRefresh() {
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
@ -152,7 +159,7 @@
}, },
methods: { methods: {
qtyChanged(value, item, index) { qtyChanged(value, item, index) {
if (value <= 0) { if (value <= 0) {
this.showMessage('退货数量必须大于0') this.showMessage('退货数量必须大于0')
@ -165,7 +172,7 @@
if (res) { if (res) {
this.allDataList.splice(index, 1); this.allDataList.splice(index, 1);
this.allCount = this.allDataList.length; this.allCount = this.allDataList.length;
var title =this.allCount>0?"客户退货"+"("+this.allCount+")":"客户退货" var title = this.allCount > 0 ? "客户退货箱码" + "(" + this.allCount + ")" : "客户退货箱码"
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: title title: title
}) })
@ -175,7 +182,7 @@
}, },
getScanResult(result) { getScanResult(result) {
var resultData =result.data var resultData = result.data
var filterItem = this.allDataList.filter(res => { var filterItem = this.allDataList.filter(res => {
if (res.packingCode == resultData.code) { if (res.packingCode == resultData.code) {
return res; return res;
@ -186,23 +193,41 @@
return; return;
} }
var item = { locations(resultData.recommendLocationCode).then(res => {
packingCode:resultData.code, if (res) {
itemCode: resultData.itemCode, //
itemName: resultData.itemName, if (res.type == 1 || res.type == 6 || res.type == 13) {
itemDesc1: resultData.itemDesc1, that.showMessage("来源库位不可以是待检、隔离、在途库位类型");
stdPackQty: resultData.stdPackQty, } else {
uom: resultData.uom, var item = {
qty: resultData.stdPackQty packingCode: resultData.code,
itemCode: resultData.itemCode,
itemName: resultData.itemName,
itemDesc1: resultData.itemDesc1,
stdPackQty: resultData.stdPackQty,
lot:resultData.lot,
recommendLocationCode:resultData.recommendLocationCode,
uom: resultData.uom,
qty: resultData.qty
}
this.allDataList.unshift(item)
this.allCount = this.allDataList.length;
uni.setNavigationBarTitle({
title: "客户退货箱码" + "(" + this.allCount + ")"
})
this.$forceUpdate();
}
} else {
this.showMessage('来源库位【' + resultData.recommendLocationCode + '】不存在');
}
} }).catch(err => {
this.allDataList.unshift(item) this.showMessage(err.message);
this.allCount = this.allDataList.length;
uni.setNavigationBarTitle({
title: "客户退货"+"("+this.allCount+")"
}) })
this.$forceUpdate();
}, },
@ -215,16 +240,27 @@
locations(locationCode).then(res => { locations(locationCode).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res) { if (res) {
this.toLocationInfo =res; if (res.type == 2) {
this.toLocationCode = res.code this.toLocationInfo = res;
this.toLocationCode = res.code
} else {
this.toLocationInfo = {}
this.toLocationCode = ""
this.$refs.comCollapseLocation.clearLocation();
this.showMessage('目标库位必须是原料库位类型');
}
} else { } else {
this.toLocationInfo = {}
this.toLocationCode = ""
this.showMessage('目标库位【' + locationCode + '】不存在'); this.showMessage('目标库位【' + locationCode + '】不存在');
this.$refs.comCollapseLocation.clearLocation();
} }
}).catch(err => { }).catch(err => {
uni.hideLoading(); uni.hideLoading();
this.toLocationInfo={} this.toLocationInfo = {}
this.toLocationCode = "" this.toLocationCode = ""
this.$refs.comCollapseLocation.clearLocation();
this.showMessage(err.message); this.showMessage(err.message);
}) })
@ -244,9 +280,9 @@
this.showMessage('请扫描目标库位'); this.showMessage('请扫描目标库位');
return; return;
} }
var checkQtyItem =this.checkQty() var checkQtyItem = this.checkQty()
if(checkQtyItem!=undefined){ if (checkQtyItem != undefined) {
this.showMessage("【"+checkQtyItem.itemCode+'】数量为0,退货数量必须大于0'); this.showMessage("【" + checkQtyItem.itemCode + '】数量为0,退货数量必须大于0');
return; return;
} }
@ -256,27 +292,26 @@
}); });
let params = this.setSubmitParam(); let params = this.setSubmitParam();
console.log( JSON.stringify(params) ) console.log(JSON.stringify(params))
customerReturnCommit(params) customerReturnCommit(params)
.then(res => { .then(res => {
uni.hideLoading(); uni.hideLoading();
this.showCommitSuccess(); this.showCommitSuccess();
this.clearInfo(); this.clearInfo();
}) })
.catch(err => { .catch(err => {
uni.hideLoading(); uni.hideLoading();
this.showMessage(err.message); this.showMessage(err.message);
}); });
}, },
checkQty(){ checkQty() {
var isCheck =true; var isCheck = true;
var result =undefined var result = undefined
for (let item of this.allDataList) { for (let item of this.allDataList) {
if(item.qty==0){ if (item.qty == 0) {
result =item result = item
break break
} }
} }
@ -296,16 +331,19 @@
uom: res.uom, uom: res.uom,
qty: res.qty, qty: res.qty,
stdPackQty: res.stdPackQty, stdPackQty: res.stdPackQty,
toLocationCode:this.toLocationCode, toLocationCode: this.toLocationCode,
toLocationArea:this.toLocationInfo.areaCode, toLocationArea: this.toLocationInfo.areaCode,
toLocationGroup:this.toLocationInfo.locationGroupCode, toLocationGroup: this.toLocationInfo.locationGroupCode,
toLocationErpCode:this.toLocationInfo.erpLocationCode, toLocationErpCode: this.toLocationInfo.erpLocationCode,
recommendPackingCode :res.packingCode, recommendPackingCode: res.packingCode,
handledPackingCode :res.packingCode recommendLot: res.lot,
handledPackingCode: res.packingCode,
handledLot: res.lot,
handledQty:res.qty
} }
item.details.push(detail) item.details.push(detail)
}) })
return item; return item;
}, },
@ -405,12 +443,12 @@
clearInfo() { clearInfo() {
this.allDataList = []; this.allDataList = [];
this.toLocationInfo={} this.toLocationInfo = {}
this.toLocationCode = ""; this.toLocationCode = "";
this.allCount = 0; this.allCount = 0;
this.loadingType = "" this.loadingType = ""
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "客户退货" title: "客户退货箱码"
}) })
this.$refs.comCollapseLocation.clearLocation(); this.$refs.comCollapseLocation.clearLocation();
}, },

3
fe/PDA/pages/request/thirdLocationRequest.vue

@ -405,6 +405,9 @@
itemDesc1: res.itemDesc1, itemDesc1: res.itemDesc1,
uom: res.uom, uom: res.uom,
qty: res.qty, qty: res.qty,
packingCode:"",
lot:"",
enumInventoryStatus:2,
singleCodeRequest:res.singleCodeRequest, singleCodeRequest:res.singleCodeRequest,
stdPackQty: res.stdPackQty, stdPackQty: res.stdPackQty,
toLocationCode:this.toLocationCode, toLocationCode:this.toLocationCode,

6
fe/PDA/pages/request/thirdLocationRequestListDetail.vue

@ -69,10 +69,10 @@
</scroll-view> </scroll-view>
<div class="new_bot_box"> <div class="new_bot_box">
<view class="new_btn_bot bot_pos uni-flex"> <view class="new_btn_bot bot_pos uni-flex" v-if="datacontent.requestStatus==1||datacontent.requestStatus==5||datacontent.requestStatus==9">
<button v-if="datacontent.requestStatus==1||datacontent.requestStatus==5" class="new_save_btn " <button class="new_save_btn "
style="width: 100%; margin-right: 10rpx;" @click="cancel()">取消</button> style="width: 100%; margin-right: 10rpx;" @click="cancel()">取消</button>
<button v-if="datacontent.requestStatus==9" class="new_save_btn " <button class="new_save_btn "
style="width: 100%; margin-left: 10rpx;" @click="finish()">完成</button> style="width: 100%; margin-left: 10rpx;" @click="finish()">完成</button>
</view> </view>
</div> </div>

4
fe/PDA/pages/task/thirdLocationJob.vue

@ -16,7 +16,7 @@
<script> <script>
import { import {
getThirdLocationList, getThirdLocationList1,
getThirdLocationJobByNumber, getThirdLocationJobByNumber,
thirdLocationRequestClose thirdLocationRequestClose
} from '@/api/index.js'; } from '@/api/index.js';
@ -150,7 +150,7 @@
// isCreationTimeSorting: that.isTimeWindowSorting, // isCreationTimeSorting: that.isTimeWindowSorting,
// isToday: that.isToday // isToday: that.isToday
}; };
getThirdLocationList(params) getThirdLocationList1(params)
.then(res => { .then(res => {
uni.hideLoading(); uni.hideLoading();
if (type === "refresh") { if (type === "refresh") {

12
fe/PDA/pages/task/thirdLocationJobDetail.vue

@ -384,8 +384,16 @@
this.showMessage('请扫描目标库位'); this.showMessage('请扫描目标库位');
return; return;
} }
if(this.datacontent.details[0].recommendQty!=this.datacontent.details[0].handledQty){
that.finsh(); showConfirmMsg("推荐数量["+this.datacontent.details[0].recommendQty+"]与申请数量["+this.datacontent.details[0].handledQty+"]不相等,是否继续收货?",res=>{
if(res){
that.finsh();
}
})
}else {
that.finsh();
}
} }
}, },

Loading…
Cancel
Save