zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改发料和非生产领料库位校验

pda_nev
李俊城 10 months ago
parent
70b88dec79
commit
508c8d9917
13 changed files with 160 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      fe/PDA/api/index.js
  2. 7
      fe/PDA/common/basic.js
  3. 11
      fe/PDA/pages/return/purchaseReturnRequest.vue
  4. 51
      fe/PDA/pages/task/assembleIssueJob.vue
  5. 53
      fe/PDA/pages/task/coatingIssuleJob.vue
  6. 8
      fe/PDA/pages/task/deliverJis.vue
  7. 51
      fe/PDA/pages/task/injectionIssueJob.vue
  8. 51
      fe/PDA/pages/task/kittingIssueJob.vue
  9. 48
      fe/PDA/pages/task/sparePartIssueJob.vue
  10. 6
      fe/PDA/pages/task/unProducePickDetail.vue
  11. 6
      fe/PDA/pages/task/unProducePickWipDetail.vue
  12. 6
      fe/PDA/pages/task/unProduceReturnDetail.vue
  13. 6
      fe/PDA/pages/task/unProduceReturnWipDetail.vue

20
fe/PDA/api/index.js
View File

@ -1737,8 +1737,8 @@ export const getItemCategoryList = () => request(
})
//注塑发料 任务列表
export const getInjectionIssueList = (pageIndex,pageSize,isFinished) => request(
devUrl + "/api/pda/job/injection-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, {
export const getInjectionIssueList = (pageIndex,pageSize,jobStatus) => request(
devUrl + "/api/pda/job/injection-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&jobStatus="+jobStatus, {
method: 'post',
data: {}
});
@ -1785,8 +1785,8 @@ export const finshInjectionIssueJob = (masterId,detailId, params) => request(
})
//喷涂发料任务列表
export const getCoatingIssueList = (pageIndex,pageSize,isFinished) => request(
devUrl + "/api/pda/job/coating-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, {
export const getCoatingIssueList = (pageIndex,pageSize,jobStatus) => request(
devUrl + "/api/pda/job/coating-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&jobStatus="+jobStatus, {
method: 'post',
data: {}
});
@ -1877,8 +1877,8 @@ export const getCoatingRequestDetail = (id) => request(
//装配发料任务列表
export const getAssembleIssueList = (pageIndex,pageSize,isFinished) => request(
devUrl + "/api/pda/job/assemble-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, {
export const getAssembleIssueList = (pageIndex,pageSize,jobStatus) => request(
devUrl + "/api/pda/job/assemble-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&jobStatus="+jobStatus, {
method: 'post',
data: {}
});
@ -1968,8 +1968,8 @@ export const isAssembleHasNewJob = (requestNumber,data) => promise(
})
//kiting发料任务列表
export const getKittingIssueList = (pageIndex,pageSize,isFinished) => request(
devUrl + "/api/pda/job/kitting-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, {
export const getKittingIssueList = (pageIndex,pageSize,jobStatus) => request(
devUrl + "/api/pda/job/kitting-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&jobStatus="+jobStatus, {
method: 'post',
data: {}
});
@ -2061,8 +2061,8 @@ export const getCountByItemCode = (itemCode) => request(
})
//备件发料任务列表
export const getSparePartIssueList = (pageIndex,pageSize,isFinished) => request(
devUrl + "/api/pda/job/spare-part-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, {
export const getSparePartIssueList = (pageIndex,pageSize,jobStatus) => request(
devUrl + "/api/pda/job/spare-part-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&jobStatus="+jobStatus, {
method: 'post',
data: {}
});

7
fe/PDA/common/basic.js
View File

@ -451,4 +451,11 @@ export function deepCopyData(target) {
}
return cloneTarget;
}
//发料任务列表状态
export function getIssueJobState(val) {
if (val == 0) return 'ALL'
else if (val == 1) return 'Open'
else if (val == 2) return 'Wait'
}

11
fe/PDA/pages/return/purchaseReturnRequest.vue
View File

@ -33,7 +33,8 @@
purchaseReturnRequestSubmit
} from '@/api/index.js';
import {
navigateBack
navigateBack,
goHome
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -73,6 +74,14 @@
onReady() {
this.openScanPopup();
},
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}else if(e.index === 1){
window.location.reload();
}
},
methods: {
//扫描箱标签
getScanResult(result) {

51
fe/PDA/pages/task/assembleIssueJob.vue
View File

@ -1,17 +1,8 @@
<template>
<page-meta root-font-size="18px"></page-meta>
<view class="">
<!-- <view class="uni-flex uni-row require_wrap">
<button @click="isTodayChange" :class="[isToday==true?'require_cell require_active':'require_cell']">
<text></text>
只看当天发料
</button>
<button @click="timeSortingChange"
:class="[isIssueTimeChange==true?'require_cell require_active':'require_cell']">
<text></text>
按发料时间排序
</button>
</view> -->
<uni-segmented-control :current="current" :values="taps" @clickItem="onClickItem" styleType="button"
activeColor="#007AFF"></uni-segmented-control>
<win-empty-view v-if="issueList.length==0"></win-empty-view>
@ -37,7 +28,8 @@
} from '@/api/index.js';
import {
goHome
goHome,
getIssueJobState
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -76,7 +68,9 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore"
loadingType: "nomore",
taps:["全部","待处理","等待"],
current:0
};
},
props: {
@ -90,7 +84,9 @@
}
},
onShow() {
this.getList('refresh');
this.current = 0;
var jobState =getIssueJobState(this.current)
this.getList('refresh',jobState);
},
onNavigationBarButtonTap(e) {
if (e.index === 0) {
@ -100,23 +96,18 @@
}
},
methods: {
onClickItem(item) {
this.current = item.currentIndex;
var jobState =getIssueJobState(this.current)
console.log("点击", this.current)
this.getList("refresh",jobState);
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
//按时间窗口排序
timeSortingChange() {
this.isIssueTimeChange = !this.isIssueTimeChange;
this.getList()
},
//只看当天到货
isTodayChange() {
this.isToday = !this.isToday
this.getList()
},
//查询发料任务
getList(type) {
getList(type,jobState) {
let that = this;
uni.showLoading({
title: "加载中....",
@ -127,7 +118,7 @@
this.pageIndex = 1;
this.issueList = [];
}
getAssembleIssueList(that.pageIndex,that.pageSize,false)
getAssembleIssueList(that.pageIndex,that.pageSize,jobState)
.then(res => {
uni.hideLoading();
if (type === "refresh") {
@ -228,14 +219,16 @@
this.$refs.comMessage.showMessage(message);
},
onPull() {
this.getList('refresh');
var jobState =getIssueJobState(this.current)
this.getList("refresh",jobState);
},
onReachBottom() {
//避免多次触发
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
this.getList('more');
var jobState =getIssueJobState(this.current)
this.getList('more',jobState);
},
showItemList(itemList) {
this.$refs.scanList.openPopup(itemList);

53
fe/PDA/pages/task/coatingIssuleJob.vue
View File

@ -1,17 +1,8 @@
<template>
<page-meta root-font-size="18px"></page-meta>
<view class="">
<!-- <view class="uni-flex uni-row require_wrap">
<button @click="isTodayChange" :class="[isToday==true?'require_cell require_active':'require_cell']">
<text></text>
只看当天发料
</button>
<button @click="timeSortingChange"
:class="[isIssueTimeChange==true?'require_cell require_active':'require_cell']">
<text></text>
按发料时间排序
</button>
</view> -->
<uni-segmented-control :current="current" :values="taps" @clickItem="onClickItem" styleType="button"
activeColor="#007AFF"></uni-segmented-control>
<win-empty-view v-if="issueList.length==0"></win-empty-view>
@ -37,7 +28,8 @@
} from '@/api/index.js';
import {
goHome
goHome,
getIssueJobState
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -78,7 +70,9 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore"
loadingType: "nomore",
taps:["全部","待处理","等待"],
current:0
};
},
props: {
@ -92,7 +86,9 @@
}
},
onShow() {
this.getList('refresh');
this.current = 0;
var jobState =getIssueJobState(this.current)
this.getList('refresh',jobState);
},
//返回首页
@ -104,23 +100,18 @@
}
},
methods: {
onClickItem(item) {
this.current = item.currentIndex;
var jobState =getIssueJobState(this.current)
console.log("点击", this.current)
this.getList("refresh",jobState);
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
//按时间窗口排序
timeSortingChange() {
this.isIssueTimeChange = !this.isIssueTimeChange;
this.getList()
},
//只看当天到货
isTodayChange() {
this.isToday = !this.isToday
this.getList()
},
//查询发料任务
getList(type) {
getList(type,jobState) {
let that = this;
uni.showLoading({
title: "加载中....",
@ -131,7 +122,7 @@
this.pageIndex = 1;
this.issueList = [];
}
getCoatingIssueList(that.pageIndex,that.pageSize,false)
getCoatingIssueList(that.pageIndex,that.pageSize,jobState)
.then(res => {
uni.hideLoading();
if (type === "refresh") {
@ -230,14 +221,16 @@
this.$refs.comMessage.showMessage(message);
},
onPull() {
this.getList('refresh');
var jobState =getIssueJobState(this.current)
this.getList("refresh",jobState);
},
onReach() {
onReachBottom() {
//避免多次触发
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
this.getList('more');
var jobState =getIssueJobState(this.current)
this.getList('more',jobState);
},
showItemList(itemList) {
this.$refs.scanList.openPopup(itemList);

8
fe/PDA/pages/task/deliverJis.vue
View File

@ -79,6 +79,14 @@
onShow() {
this.getList('refresh');
},
//返回首页
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}else if(e.index === 1){
window.location.reload();
}
},
methods: {
openScanPopup() {
this.$refs.scanPopup.openScanPopup();

51
fe/PDA/pages/task/injectionIssueJob.vue
View File

@ -1,17 +1,8 @@
<template>
<page-meta root-font-size="18px"></page-meta>
<view class="">
<!-- <view class="uni-flex uni-row require_wrap">
<button @click="isTodayChange" :class="[isToday==true?'require_cell require_active':'require_cell']">
<text></text>
只看当天发料
</button>
<button @click="timeSortingChange"
:class="[isIssueTimeChange==true?'require_cell require_active':'require_cell']">
<text></text>
按发料时间排序
</button>
</view> -->
<uni-segmented-control :current="current" :values="taps" @clickItem="onClickItem" styleType="button"
activeColor="#007AFF"></uni-segmented-control>
<win-empty-view v-if="issueList.length==0"></win-empty-view>
@ -37,7 +28,8 @@
} from '@/api/index.js';
import {
goHome
goHome,
getIssueJobState
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -76,7 +68,9 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore"
loadingType: "nomore",
taps:["全部","待处理","等待"],
current:0
};
},
props: {
@ -90,7 +84,9 @@
}
},
onShow() {
this.getList('refresh');
this.current = 0;
var jobState =getIssueJobState(this.current)
this.getList('refresh',jobState);
},
onNavigationBarButtonTap(e) {
if (e.index === 0) {
@ -100,23 +96,18 @@
}
},
methods: {
onClickItem(item) {
this.current = item.currentIndex;
var jobState =getIssueJobState(this.current)
console.log("点击", this.current)
this.getList("refresh",jobState);
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
//按时间窗口排序
timeSortingChange() {
this.isIssueTimeChange = !this.isIssueTimeChange;
this.getList()
},
//只看当天到货
isTodayChange() {
this.isToday = !this.isToday
this.getList()
},
//查询发料任务
getList(type) {
getList(type,jobState) {
let that = this;
uni.showLoading({
title: "加载中....",
@ -127,7 +118,7 @@
this.pageIndex = 1;
this.issueList = [];
}
getInjectionIssueList(that.pageIndex,that.pageSize,false)
getInjectionIssueList(that.pageIndex,that.pageSize,jobState)
.then(res => {
uni.hideLoading();
if (type === "refresh") {
@ -227,14 +218,16 @@
this.$refs.comMessage.showMessage(message);
},
onPull() {
this.getList('refresh');
var jobState =getIssueJobState(this.current)
this.getList("refresh",jobState);
},
onReachBottom() {
//避免多次触发
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
this.getList('more');
var jobState =getIssueJobState(this.current)
this.getList('more',jobState);
},
showItemList(itemList) {
this.$refs.scanList.openPopup(itemList);

51
fe/PDA/pages/task/kittingIssueJob.vue
View File

@ -1,17 +1,8 @@
<template>
<page-meta root-font-size="18px"></page-meta>
<view class="">
<!-- <view class="uni-flex uni-row require_wrap">
<button @click="isTodayChange" :class="[isToday==true?'require_cell require_active':'require_cell']">
<text></text>
只看当天发料
</button>
<button @click="timeSortingChange"
:class="[isIssueTimeChange==true?'require_cell require_active':'require_cell']">
<text></text>
按发料时间排序
</button>
</view> -->
<uni-segmented-control :current="current" :values="taps" @clickItem="onClickItem" styleType="button"
activeColor="#007AFF"></uni-segmented-control>
<win-empty-view v-if="issueList.length==0"></win-empty-view>
@ -37,7 +28,8 @@
} from '@/api/index.js';
import {
goHome
goHome,
getIssueJobState
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -76,7 +68,9 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore"
loadingType: "nomore",
taps:["全部","待处理","等待"],
current:0
};
},
props: {
@ -90,7 +84,9 @@
}
},
onShow() {
this.getList('refresh');
this.current = 0;
var jobState =getIssueJobState(this.current)
this.getList('refresh',jobState);
},
onNavigationBarButtonTap(e) {
if (e.index === 0) {
@ -100,23 +96,18 @@
}
},
methods: {
onClickItem(item) {
this.current = item.currentIndex;
var jobState =getIssueJobState(this.current)
console.log("点击", this.current)
this.getList("refresh",jobState);
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
//按时间窗口排序
timeSortingChange() {
this.isIssueTimeChange = !this.isIssueTimeChange;
this.getList()
},
//只看当天到货
isTodayChange() {
this.isToday = !this.isToday
this.getList()
},
//查询发料任务
getList(type) {
getList(type,jobState) {
let that = this;
uni.showLoading({
title: "加载中....",
@ -127,7 +118,7 @@
this.pageIndex = 1;
this.issueList = [];
}
getKittingIssueList(that.pageIndex,that.pageSize,false)
getKittingIssueList(that.pageIndex,that.pageSize,jobState)
.then(res => {
uni.hideLoading();
if (type === "refresh") {
@ -227,14 +218,16 @@
this.$refs.comMessage.showMessage(message);
},
onPull() {
this.getList('refresh');
var jobState =getIssueJobState(this.current)
this.getList("refresh",jobState);
},
onReachBottom() {
//避免多次触发
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
this.getList('more');
var jobState =getIssueJobState(this.current)
this.getList('more',jobState);
},
showItemList(itemList) {
this.$refs.scanList.openPopup(itemList);

48
fe/PDA/pages/task/sparePartIssueJob.vue
View File

@ -1,17 +1,8 @@
<template>
<page-meta root-font-size="18px"></page-meta>
<view class="">
<!-- <view class="uni-flex uni-row require_wrap">
<button @click="isTodayChange" :class="[isToday==true?'require_cell require_active':'require_cell']">
<text></text>
只看当天发料
</button>
<button @click="timeSortingChange"
:class="[isIssueTimeChange==true?'require_cell require_active':'require_cell']">
<text></text>
按发料时间排序
</button>
</view> -->
<uni-segmented-control :current="current" :values="taps" @clickItem="onClickItem" styleType="button"
activeColor="#007AFF"></uni-segmented-control>
<win-empty-view v-if="issueList.length==0"></win-empty-view>
@ -37,7 +28,8 @@
} from '@/api/index.js';
import {
goHome
goHome,
getIssueJobState
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -76,7 +68,9 @@
isIssueTimeChange: false,
isToday: false,
titleArray: ['任务编号'],
loadingType: "nomore"
loadingType: "nomore",
taps:["全部","待处理","等待"],
current:0
};
},
props: {
@ -90,7 +84,9 @@
}
},
onShow() {
this.getList('refresh');
this.current = 0;
var jobState =getIssueJobState(this.current)
this.getList('refresh',jobState);
},
onNavigationBarButtonTap(e) {
if (e.index === 0) {
@ -100,23 +96,18 @@
}
},
methods: {
onClickItem(item) {
this.current = item.currentIndex;
var jobState =getIssueJobState(this.current)
console.log("点击", this.current)
this.getList("refresh",jobState);
},
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
//按时间窗口排序
timeSortingChange() {
this.isIssueTimeChange = !this.isIssueTimeChange;
this.getList()
},
//只看当天到货
isTodayChange() {
this.isToday = !this.isToday
this.getList()
},
//查询发料任务
getList(type) {
getList(type,jobState) {
let that = this;
uni.showLoading({
title: "加载中....",
@ -127,7 +118,7 @@
this.pageIndex = 1;
this.issueList = [];
}
getSparePartIssueList(that.pageIndex,that.pageSize,false)
getSparePartIssueList(that.pageIndex,that.pageSize,jobState)
.then(res => {
uni.hideLoading();
if (type === "refresh") {
@ -234,7 +225,8 @@
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
this.getList('more');
var jobState =getIssueJobState(this.current)
this.getList('more',jobState);
},
showItemList(itemList) {
this.$refs.scanList.openPopup(itemList);

6
fe/PDA/pages/task/unProducePickDetail.vue
View File

@ -70,7 +70,7 @@
</uni-th>
</uni-tr>
<uni-tr>
<uni-th width="60">库位</uni-th>
<uni-th width="70">来源库位</uni-th>
<uni-th width="100" align="center">
<view class="text_black">{{ item.recommendFromLocationCode }}</view>
</uni-th>
@ -442,8 +442,8 @@
item.handledBatch = balanceItem.batch;
item.handledLot = balanceItem.lot;
item.defaultHandleQty = balanceItem.qty;
item.handledQty = balanceItem.qty;
item.defaultHandleQty = balanceItem.qty>item.recommendQty?item.recommendQty:balanceItem.qty;
item.handledQty = balanceItem.qty>item.recommendQty?item.recommendQty:balanceItem.qty;
item.handledFromLocationCode = balanceItem.locationCode;
item.handledFromLocationArea = balanceItem.locationArea;
item.handledFromLocationGroup = balanceItem.locationGroup;

6
fe/PDA/pages/task/unProducePickWipDetail.vue
View File

@ -31,7 +31,7 @@
<uni-th width="140" align="center">实际</uni-th>
</uni-tr>
<uni-tr>
<uni-th width="50">库位</uni-th>
<uni-th width="70">来源库位</uni-th>
<uni-th width="100" align="center">
<view class="text_black">{{ item.recommendFromLocationCode }}</view>
</uni-th>
@ -204,6 +204,10 @@
},
getToLocation(locationInfo) {
if(this.currentItem.recommendFromLocationCode!=locationInfo.code){
this.showMessage("扫描库位["+locationInfo.code+"]与推荐来源库位["+this.currentItem.recommendFromLocationCode+"]不一致")
return;
}
this.currentItem.handledFromLocationCode = locationInfo.code;
this.currentItem.handledFromLocationArea = locationInfo.areaCode
this.currentItem.handledFromLocationGroup = locationInfo.locationGroupCode

6
fe/PDA/pages/task/unProduceReturnDetail.vue
View File

@ -70,7 +70,7 @@
</uni-th>
</uni-tr>
<uni-tr>
<uni-th width="60">目标库位</uni-th>
<uni-th width="70">目标库位</uni-th>
<uni-th width="100" align="center">
<view class="text_black">{{ item.recommendToLocationCode }}</view>
</uni-th>
@ -419,8 +419,8 @@
item.handledBatch = result.data.batch;
item.handledLot = result.data.lot;
item.defaultHandleQty = result.data.qty;
item.handledQty = result.data.qty;
item.defaultHandleQty = result.data.qty>item.recommendQty?item.recommendQty:result.data.qty;
item.handledQty = result.data.qty>item.recommendQty?item.recommendQty:result.data.qty;
item.handledFromLocationCode = "";
item.handledFromLocationArea = "";
item.handledFromLocationGroup = "";

6
fe/PDA/pages/task/unProduceReturnWipDetail.vue
View File

@ -31,7 +31,7 @@
<uni-th width="140" align="center">实际</uni-th>
</uni-tr>
<uni-tr>
<uni-th width="50">库位</uni-th>
<uni-th width="50">目标库位</uni-th>
<uni-th width="100" align="center">
<view class="text_black">{{ item.recommendToLocationCode }}</view>
</uni-th>
@ -204,6 +204,10 @@
},
getToLocation(locationInfo) {
if(this.currentItem.recommendToLocationCode!=locationInfo.code){
this.showMessage("扫描库位["+locationInfo.code+"]与推荐目标库位["+this.currentItem.recommendToLocationCode+"]不一致")
return;
}
this.currentItem.handledToLocationCode = locationInfo.code;
this.currentItem.handledToLocationArea = locationInfo.areaCode
this.currentItem.handledToLocationGroup = locationInfo.locationGroupCode

Write Preview
Loading…
Cancel
Save