sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改补料任务

hella_vue3
niexiting 8 months ago
parent
07082655da
commit
244c2042c9
5 changed files with 125 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/mycomponents/balance/balance.vue
  2. 11
      src/mycomponents/balance/handleBalance.vue
  3. 6
      src/pages/repleinsh/coms/comRepleishDetailCard.vue
  4. 126
      src/pages/repleinsh/coms/comScanReplishPack.vue
  5. 47
      src/pages/repleinsh/job/repleinshDetail.vue

2
src/mycomponents/balance/balance.vue
View File

@ -14,7 +14,7 @@
<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent" <qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> :isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)" <compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack"> :handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack" :isShowStatus='isShowStatus'>
</compare-qty> </compare-qty>
<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()"> <view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text> <text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>

11
src/mycomponents/balance/handleBalance.vue
View File

@ -1,16 +1,16 @@
<template> <template>
<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;"> <view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
<view class="space_between center" > <view class="space_between center">
<view style="word-break: break-all;width: 60%;"> <view style="word-break: break-all;width: 60%;">
<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack> <pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
<batch v-if="isShowBatch" :batch="detail.batch"></batch> <batch v-if="isShowBatch" :batch="detail.batch"></batch>
<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location> <location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
</view> </view>
<view style="word-break: break-all;"> <view style="word-break: break-all;">
<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail" <recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail" :isShowStatus='isShowStatus'
:isShowStdPack="false"></recommend-qty> :isShowStdPack="false"></recommend-qty>
<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty" <compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty" :isShowStatus='isShowStatus'
:isShowStdPack="false"> :isShowStdPack="false">
</compare-qty> </compare-qty>
</view> </view>
@ -56,7 +56,10 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
isShowStatus: {
type: Boolean,
default: true
},
}, },
watch: { watch: {

6
src/pages/repleinsh/coms/comRepleishDetailCard.vue
View File

@ -31,8 +31,12 @@
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,batch,record,index)" <uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
:right-options="scanOptions"> :right-options="scanOptions">
<view class="card_view">
<text class="card_packing_code card_content ">外包装</text>
<text class="card_content ">{{record.parentPackingNumber}}</text>
</view>
<handle-balance :detail="record" :isShowLocation="false" <handle-balance :detail="record" :isShowLocation="false"
:isShowBatch="batch.packingNumber!=null"> :isShowBatch="batch.packingNumber!=null" :isShowStatus='true'>
</handle-balance> </handle-balance>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>

126
src/pages/repleinsh/coms/comScanReplishPack.vue
View File

@ -69,7 +69,7 @@
<uni-swipe-action-item @click="swipeClick($event,record,index)" <uni-swipe-action-item @click="swipeClick($event,record,index)"
:right-options="scanOptions"> :right-options="scanOptions">
<view style="padding: 0px 10px"> <view style="padding: 0px 10px">
<balance :dataContent="record" :isShowFromLocation="false" <balance :dataContent="record" :isShowFromLocation="false" :isShowStatus='true'
:isShowStdPack="false"></balance> :isShowStdPack="false"></balance>
</view> </view>
</uni-swipe-action-item> </uni-swipe-action-item>
@ -106,8 +106,8 @@
} from '@/api/request2.js'; } from '@/api/request2.js';
import { import {
calc calc
} from '@/common/calc.js'; } from '@/common/calc.js';
import { import {
getBalanceByManagementPrecision getBalanceByManagementPrecision
@ -242,30 +242,33 @@
) )
return; return;
} else { } else {
//查找库存信息
uni.showLoading({ this.afterGetBalance(result.label, result.label, packageInfo);
title: '加载中',
mask: true // //查找库存信息
}) // uni.showLoading({
getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, // title: '加载中',
balanceRes => { // mask: true
if (balanceRes.success) { // })
if (balanceRes.data.list.length == 0) { // getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录', // balanceRes => {
res => { // if (balanceRes.success) {
this.packGetFocus(); // if (balanceRes.data.list.length == 0) {
}) // this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
} else if (balanceRes.data.list.length == 1) { // res => {
let balance = balanceRes.data.list[0]; // this.packGetFocus();
this.afterGetBalance(result.label, balance, packageInfo); // })
} else { // } else if (balanceRes.data.list.length == 1) {
this.showBalanceSelect(balanceRes.data.list); // let balance = balanceRes.data.list[0];
} // this.afterGetBalance(result.label, balance, packageInfo);
} else { // } else {
this.showErrorMessage(balanceRes.message.message); // this.showBalanceSelect(balanceRes.data.list);
} // }
uni.hideLoading(); // } else {
}); // this.showErrorMessage(balanceRes.message.message);
// }
// uni.hideLoading();
// });
} }
} catch (e) { } catch (e) {
this.showErrorMessage(e.stack) this.showErrorMessage(e.stack)
@ -297,11 +300,11 @@
if (batch.Recommends.length > 0) { if (batch.Recommends.length > 0) {
let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
if (recommend != undefined) { if (recommend != undefined) {
that.addRecord(batch, label, balance, packageInfo) that.addRecord(batch, label, packageInfo)
} else { } else {
//允许修改箱码 //允许修改箱码
if (this.jobContent.allowModifyPackingNumber == 'TRUE') { if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
that.addRecord(batch, label, balance, packageInfo); that.addRecord(batch, label, packageInfo);
} else { } else {
that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
res => { res => {
@ -311,7 +314,7 @@
} }
} }
} else { } else {
that.addRecord(batch, label, balance, packageInfo) that.addRecord(batch, label, packageInfo)
} }
} else { } else {
that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@ -325,8 +328,8 @@
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
'】的发料明细,是否要继续发料?', res => { '】的发料明细,是否要继续发料?', res => {
if (res) { if (res) {
let batch = that.createBatchInfo(label, balance,packageInfo); let batch = that.createBatchInfo(label, balance, packageInfo);
if(fromLocation.Batchs.length>0){ if (fromLocation.Batchs.length > 0) {
batch.detail = fromLocation.Batchs[0].detail; batch.detail = fromLocation.Batchs[0].detail;
} }
fromLocation.Batchs.unshift(batch); fromLocation.Batchs.unshift(batch);
@ -355,7 +358,7 @@
} }
}, },
createBatchInfo(data, balance,packageInfo) { createBatchInfo(data, balance, packageInfo) {
let batch = { let batch = {
batch: data.batch, batch: data.batch,
qty: 0, qty: 0,
@ -363,54 +366,75 @@
handleQty: Number(data.qty), handleQty: Number(data.qty),
Records: [] Records: []
} }
let record = this.creatRecord(data, balance,packageInfo); let record = this.creatRecord(data, packageInfo);
batch.Records.push(record); batch.Records.push(record);
this.issueRecord.unshift(record) this.issueRecord.unshift(record)
return batch; return batch;
}, },
creatRecord(label, balance, packageInfo) { creatRecord(label, packageInfo) {
balance.packQty = packageInfo.packQty
balance.packUnit = packageInfo.packUnit
let record = { let record = {
scaned: true, scaned: true,
itemCode: label.itemCode, itemCode: label.itemCode,
packingNumber: label.packingNumber, packingNumber: label.packingNumber,
parentPackingNumber: packageInfo.parentNumber,
batch: label.batch, batch: label.batch,
qty: Number(balance.qty), qty: Number(label.qty),
// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty), // qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
uom: balance.uom, uom: label.uom,
inventoryStatus: balance.inventoryStatus, inventoryStatus: "OK",
balance: balance, balance: null,
toLocationCode: this.toLocationCode, toLocationCode: this.toLocationCode,
supplierCode: label.supplierCode supplierCode: label.supplierCode
} }
return record; return record;
}, },
// creatRecord(label, balance, packageInfo) {
// balance.packQty = packageInfo.packQty
// balance.packUnit = packageInfo.packUnit
// let record = {
// scaned: true,
// itemCode: label.itemCode,
// packingNumber: label.packingNumber,
// batch: label.batch,
// qty: Number(balance.qty),
// // qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
// uom: balance.uom,
// inventoryStatus: balance.inventoryStatus,
// balance: balance,
// toLocationCode: this.toLocationCode,
// supplierCode: label.supplierCode
// }
// return record;
// },
calcBatchHandleQty(batch) { calcBatchHandleQty(batch) {
let handleQty = 0; let handleQty = 0;
batch.Records.forEach(res => { batch.Records.forEach(res => {
handleQty = calc.add(handleQty,res.qty) handleQty = calc.add(handleQty, res.qty)
}) })
batch.handleQty = handleQty; batch.handleQty = handleQty;
this.dataContent.forEach(toLocationCode=>{ this.dataContent.forEach(toLocationCode => {
toLocationCode.Items.forEach(item=>{ toLocationCode.Items.forEach(item => {
var itemCodeHandleQty =0; var itemCodeHandleQty = 0;
item.Locations.forEach(batch=>{ item.Locations.forEach(batch => {
batch.Batchs.forEach(batchHandleQty=>{ batch.Batchs.forEach(batchHandleQty => {
itemCodeHandleQty=calc.add(itemCodeHandleQty,batchHandleQty.handleQty) itemCodeHandleQty = calc.add(itemCodeHandleQty,
batchHandleQty.handleQty)
}) })
}) })
item.handleQty=itemCodeHandleQty; item.handleQty = itemCodeHandleQty;
}) })
}) })
}, },
addRecord(batch, label, balance, packageInfo) { addRecord(batch, label, packageInfo) {
let record = this.creatRecord(label, balance, packageInfo); let record = this.creatRecord(label, packageInfo);
batch.Records.push(record); batch.Records.push(record);
this.issueRecord.unshift(record) this.issueRecord.unshift(record)
this.calcBatchHandleQty(batch); this.calcBatchHandleQty(batch);

47
src/pages/repleinsh/job/repleinshDetail.vue
View File

@ -298,8 +298,8 @@
let record = {}; let record = {};
record.handleQty = r.qty; record.handleQty = r.qty;
record.fromPackingNumber = r // record.fromPackingNumber = r
.packingNumber; // .packingNumber;
record.fromBatch = r.batch; record.fromBatch = r.batch;
record.fromContainerNumber = r record.fromContainerNumber = r
.ContainerNumber; .ContainerNumber;
@ -312,24 +312,39 @@
.toLocationCode; .toLocationCode;
record.supplierCode = r.supplierCode; record.supplierCode = r.supplierCode;
//使用在途库不改变管理模式 if(record.parentPackingNumber!='')
if (this.jobContent {
.useOnTheWayLocation == record.fromPackingNumber = record.parentPackingNumber;
'TRUE') {
record.toPackingNumber = r record.toPackingNumber = r
.packingNumber; .packingNumber;
record.toBatch = r.batch; }
} else { else
var info = {
getPackingNumberAndBatch( record.fromPackingNumber = record.packingNumber;
this.managementList, r record.toPackingNumber = r
.itemCode,
r.packingNumber, r
.batch);
record.toPackingNumber = info
.packingNumber; .packingNumber;
record.toBatch = info.batch;
} }
record.toBatch = r.batch;
// //使用在途库不改变管理模式
// if (this.jobContent
// .useOnTheWayLocation ==
// 'TRUE') {
// record.toPackingNumber = r
// .packingNumber;
// record.toBatch = r.batch;
// } else {
// var info =
// getPackingNumberAndBatch(
// this.managementList, r
// .itemCode,
// r.packingNumber, r
// .batch);
// record.toPackingNumber = info
// .packingNumber;
// record.toBatch = info.batch;
// }
subItem.recordList.push(record); subItem.recordList.push(record);
}) })
commitSubList.push(subItem); commitSubList.push(subItem);

Write Preview
Loading…
Cancel
Save