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

三方库校验

pda_nev
李俊城 11 months ago
parent
6c58bdfaa7
commit
70b88dec79
19 changed files with 38 additions and 33 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. 2
      fe/PDA/api/index.js
  2. 8
      fe/PDA/common/scan.js
  3. 4
      fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue
  4. 2
      fe/PDA/mycomponents/common/comDyItemInfo.vue
  5. 2
      fe/PDA/mycomponents/coms/comUnPacking.vue
  6. 4
      fe/PDA/mycomponents/coms/request/comInjectIssue.vue
  7. 4
      fe/PDA/mycomponents/coms/task/comInjectIssue.vue
  8. 2
      fe/PDA/mycomponents/popup/selectClickList.vue
  9. 2
      fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
  10. 2
      fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
  11. 2
      fe/PDA/pages/task/countFgDetail.vue
  12. 2
      fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
  13. 4
      fe/PDA/pages/task/injectionPlanJobDetail.vue
  14. 2
      fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
  15. 8
      fe/PDA/pages/task/sparePartIssueJobDetail.vue
  16. 2
      fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
  17. 13
      fe/PDA/pages/task/thirdLocationJobDetail.vue
  18. 2
      fe/PDA/pages/task/unProducePickWipDetail.vue
  19. 2
      fe/PDA/pages/task/unProduceReturnWipDetail.vue

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

@ -2053,7 +2053,7 @@ export const kittingIssueRequest = (params) => request(
data: params,
method: "post"
})
//通过物料号查询收容数
//通过ERP料号查询收容数
export const getCountByItemCode = (itemCode) => request(
devUrl + "/api/pda/item-container/by-item?itemCode="+itemCode, { //
data: {},

8
fe/PDA/common/scan.js
View File

@ -1,7 +1,7 @@
//解析扫描信息
//P2251076NAA;L220325;Q2000;N0205183222000006;SS0000066;V02051832;OPO1072;C15;
//解析规则
//P:itemCode 物料号
//P:itemCode ERP料号
//L:lot批次
//Q:qty 数量
//N:asn 供应商商发货单 ASN
@ -55,7 +55,7 @@ export function analyseScanInfo(scanMsg) {
if (type != "") {
scanResult.data.scanType = 'qrcode';
switch (type) {
case "P": //物料号
case "P": //ERP料号
case "p":
scanResult.data.itemCode = value;
break;
@ -126,7 +126,7 @@ export function analyseScanInfo(scanMsg) {
//P2250229RAA;L220408;Q100;N62840610;SB0000107;UEA;DU571LS;FA;E2022-4-8
//P零件号，L批次，Q数量，N生产计划号，S箱码,U计量单位,D生产线，F班次，E日期，M零件名称(待添加)
//解析规则
//P:itemCode 物料号
//P:itemCode ERP料号
//L:lot批次
//Q:qty 数量
//N:pnumber productionPlanNumber生产计划号
@ -173,7 +173,7 @@ export function analyseProductLabelInfo(scanMsg) {
let value = item.substring(1, item.length);
if (type != "") {
switch (type) {
case "P": //物料号
case "P": //ERP料号
case "p":
scanResult.data.itemCode = value;
break;

4
fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue
View File

@ -9,10 +9,10 @@
<text>申请单：{{dataContent.deliverRequestNumber}}</text>
</view> -->
<view class="label_order" v-if="dataContent.details.length>0">
<text>物料号 ：{{dataContent.details[0].itemCode}}</text>
<text>ERP料号 ：{{dataContent.details[0].itemCode}}</text>
</view>
<view class="label_order" v-if="dataContent.details.length>0">
<text>物料描述 ：{{dataContent.details[0].itemDesc1}}</text>
<text>料号描述 ：{{dataContent.details[0].itemDesc1}}</text>
</view>
<view class="label_order" v-if="dataContent.details.length>0">
<text>位置码 ：{{dataContent.details[0].positionCode}}</text>

2
fe/PDA/mycomponents/common/comDyItemInfo.vue
View File

@ -2,7 +2,7 @@
<template>
<view class="device-detail">
<view class="list-style">
<view class="text-color">物料号:{{dataContent.itemCode}}</view>
<view class="text-color">ERP料号:{{dataContent.itemCode}}</view>
<view>物料名称:{{dataContent.itemName }}</view>
<view class="uni-flex">
<view style="-webkit-flex: 1;flex: 1;">箱码: {{dataContent.packingCode}}</view>

2
fe/PDA/mycomponents/coms/comUnPacking.vue
View File

@ -9,7 +9,7 @@
</view>
</view>
<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">箱码 : {{dataContent.recommendPackingCode}}</view>
<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">物料号 : {{dataContent.itemCode}}</view>
<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">ERP料号 : {{dataContent.itemCode}}</view>
<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">名称 : {{dataContent.itemName}}</view>
<view style="padding: 6rpx;margin-left: 15rpx;font-size: 32rpx;">描述 : {{dataContent.itemDesc1}}</view>
<view style="display: flex; justify-content: center;align-items: center; padding: 6rpx;margin-top: 10rpx;">

4
fe/PDA/mycomponents/coms/request/comInjectIssue.vue
View File

@ -11,10 +11,10 @@
<text>申请单：{{dataContent.deliverRequestNumber}}</text>
</view> -->
<view class="label_order" v-if="dataContent.details.length>0">
<text>物料号 ：{{dataContent.details[0].itemCode}}</text>
<text>ERP料号 ：{{dataContent.details[0].itemCode}}</text>
</view>
<view class="label_order" v-if="dataContent.details.length>0">
<text>物料描述 ：{{dataContent.details[0].itemDesc1}}</text>
<text>料号描述 ：{{dataContent.details[0].itemDesc1}}</text>
</view>
<view class="label_order" v-if="dataContent.details.length>0">
<text>收容数 ：{{dataContent.details[0].requestQty}} ({{dataContent.details[0].uom}})</text>

4
fe/PDA/mycomponents/coms/task/comInjectIssue.vue
View File

@ -11,10 +11,10 @@
<text>申请单：{{dataContent.deliverRequestNumber}}</text>
</view> -->
<view class="label_order" v-if="dataContent.details.length>0">
<text>物料号 ：{{dataContent.details[0].itemCode}}</text>
<text>ERP料号 ：{{dataContent.details[0].itemCode}}</text>
</view>
<view class="label_order" v-if="dataContent.details.length>0">
<text>物料描述 ：{{dataContent.details[0].itemDesc1}}</text>
<text>料号描述 ：{{dataContent.details[0].itemDesc1}}</text>
</view>
<view class="label_order" v-if="dataContent.details.length>0">
<text>收容数 ：{{dataContent.details[0].requestQty}} ({{dataContent.details[0].uom}})</text>

2
fe/PDA/mycomponents/popup/selectClickList.vue
View File

@ -26,7 +26,7 @@
{{item.itemName}}
</view>
<view class="">
<text style="font-size: 32rpx; font-weight: bold;">物料描述 : </text>
<text style="font-size: 32rpx; font-weight: bold;">料号描述 : </text>
{{item.itemDesc1}}
</view>
<view class="" v-if="item.packingCode">

2
fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
View File

@ -381,7 +381,7 @@
});
if (item == undefined) {
this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
this.singCode = result.itemCode

2
fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
View File

@ -394,7 +394,7 @@
});
if (item == undefined) {
this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
this.singCode = result.itemCode

2
fe/PDA/pages/task/countFgDetail.vue
View File

@ -732,7 +732,7 @@
}
if(temp!=""){
this.showMessage("物料号:["+temp.itemCode+"]盘点数量为0,请输入盘点数量")
this.showMessage("ERP料号:["+temp.itemCode+"]盘点数量为0,请输入盘点数量")
return;
}

2
fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
View File

@ -377,7 +377,7 @@
});
if (item == undefined) {
this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
this.singCode = result.itemCode

4
fe/PDA/pages/task/injectionPlanJobDetail.vue
View File

@ -324,11 +324,11 @@
});
if (item === undefined) {
this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
} else {
if (item.scaned) {
this.showMessage('物料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
this.showMessage('ERP料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
return;
} else {
item.scaned = true;

2
fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
View File

@ -380,7 +380,7 @@
});
if (item == undefined) {
this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
this.singCode = result.itemCode

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

@ -350,7 +350,7 @@
//是否承接
//已经承接
if (this.datacontent.isClaims) {
this.datacontent.jobStatus =2
this.datacontent.jobStatus = 2
//承接并且承接人是自己显示，不是自己隐藏
if (this.datacontent.claimsUserId == localStorage.getItem('userId')) {
this.showBtn = true
@ -430,7 +430,7 @@
item.handledFromLot = balancesItem.lot
item.handledFromWarehouseCode = balancesItem.warehouseCode
item.handledFromQty = balancesItem.qty
item.handledFromLocationCode =balancesItem.locationCode
item.handledFromLocationCode = balancesItem.locationCode
item.handleToPackingCodeLocationCode = balancesItem.locationCode
} else {
showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot + "]与推荐目标批次[" + item
@ -456,7 +456,7 @@
item.handledFromLot = balancesItem.lot
item.handledFromWarehouseCode = balancesItem.warehouseCode
item.handledFromQty = balancesItem.qty
item.handledFromLocationCode =balancesItem.locationCode
item.handledFromLocationCode = balancesItem.locationCode
item.handleToPackingCodeLocationCode = balancesItem.locationCode
}
})
@ -591,9 +591,7 @@
finshSparePartIssueJob(that.id, params.id, params)
.then(res => {
uni.hideLoading();
if (res) {
that.showCommitSuccessMessage();
}
})
.catch(err => {
that.showMessage(err.message);

2
fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
View File

@ -377,7 +377,7 @@
});
if (item == undefined) {
this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
this.singCode = result.itemCode

13
fe/PDA/pages/task/thirdLocationJobDetail.vue
View File

@ -9,7 +9,7 @@
<view class="" style="background-color: #fff; padding: 20rpx; font-size: 32rpx;">
承接人 :{{datacontent.claimsUserName}}
</view>
<button v-if="showFinishButton" type="primary" @click="finish" style="margin: 20rpx;"> 任务终止</button>
<button v-if="showFinishButton" type="primary" @click="finish" style="margin: 20rpx;"> 完成</button>
<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
class="scroll-detail">
@ -216,6 +216,11 @@
methods: {
//扫描默认目标库位
getDefaultToLocation(locationCode) {
if(this.details[0].toLocationCode!=locationCode){
this.showMessage("扫描库位["+locationCode+"]与目标库位["+this.details[0].toLocationCode+"]不一致");
this.$refs.comCollapseLocation.clearLocation()
return;
}
uni.showLoading({
title: "扫描中",
mask: true
@ -225,12 +230,14 @@
if (res) {
this.toLocationInfo = res
} else {
this.$refs.comCollapseLocation.clearLocation()
this.showMessage('目标库位【' + locationCode + '】不存在');
}
}).catch(err => {
uni.hideLoading();
this.toLocationInfo = null
this.$refs.comCollapseLocation.clearLocation()
this.showMessage(err.message);
})
@ -356,11 +363,11 @@
});
if (item === undefined) {
this.showMessage('在任务详情中,未找到物料号【' + result.itemCode + '】');
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
} else {
if (item.scaned) {
this.showMessage('物料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
this.showMessage('ERP料号【' + result.itemCode + '】已经扫描,请扫描下一箱零件');
return;
} else {
item.scaned = true;

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

@ -265,7 +265,7 @@
});
if (item == undefined) {
this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的物料号与任务中的物料号不一致,请重新扫描');
this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的ERP料号与任务中的ERP料号不一致,请重新扫描');
return;
}
if(item.scaned){

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

@ -265,7 +265,7 @@
});
if (item == undefined) {
this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的物料号与任务中的物料号不一致,请重新扫描');
this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的ERP料号与任务中的ERP料号不一致,请重新扫描');
return;
}
if (item.scaned) {

Write Preview
Loading…
Cancel
Save