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

修改发料任务的显示

wms3.0_pda
niexiting 1 year ago
parent
973884ed43
commit
7be2c93794
8 changed files with 51 additions and 49 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. 12
      mycomponents/balance/recommendBalance.vue
  2. 2
      mycomponents/job/jobBottom.vue
  3. 3
      pages/issue/coms/comIssueDetailCard.vue
  4. 4
      pages/issue/coms/comIssueJobCard.vue
  5. 29
      pages/issue/coms/comScanIssuePack.vue
  6. 15
      pages/issue/job/issueDetail.vue
  7. 17
      pages/issue/js/issue.js
  8. 2
      static/config.json

12
mycomponents/balance/recommendBalance.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;"> <view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
<view class="uni-flex uni-row space-between uni-inline-item"> <view class="uni-flex uni-row space-between ">
<view class="uni-flex uni-row uni-inline-item"> <view class="uni-flex uni-row ">
<view style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;"> <view class="center" style=" width: 20px;color: #32C1E8;">
推荐 推荐
</view> </view>
<view> <view class="center">
<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> </view>
<view> <view>

2
mycomponents/job/jobBottom.vue
View File

@ -8,7 +8,7 @@
</view> </view>
<view class="uni-flex uni-row u-col-center"> <view class="uni-flex uni-row u-col-center">
<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" /> <image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
<text>{{formatDate(dataContent.createTime)}}</text> <text class="center">{{formatDate(dataContent.createTime)}}</text>
</view> </view>
</view> </view>
</view> </view>

3
pages/issue/coms/comIssueDetailCard.vue
View File

@ -35,12 +35,11 @@
<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">
<handle-balance style='margin-left: 40px;' :detail="record" <handle-balance style='margin-left: 40px;' :detail="record"
:isShowLocation="false" :isShowBatch="batch.packingNumber!=''"> :isShowLocation="false" :isShowBatch="batch.packingNumber!=null">
</handle-balance> </handle-balance>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</view> </view>
<u-line />
</view> </view>
</view> </view>
</view> </view>

4
pages/issue/coms/comIssueJobCard.vue
View File

@ -2,10 +2,10 @@
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<view class="task_item"> <view class="task_item">
<view class="task_text"> <view class="task_text">
物品代码 : {{dataContent.itemCode}} 申请单号 {{dataContent.requestNumber}}
</view> </view>
<view class="task_text"> <view class="task_text">
需求库位 : {{dataContent.toLocationCode}} 车间 {{dataContent.workShopCode}}
</view> </view>
</view> </view>
</job-com-main-card> </job-com-main-card>

29
pages/issue/coms/comScanIssuePack.vue
View File

@ -13,7 +13,7 @@
margin-right: 20rpx; margin-right: 20rpx;
padding:20rpx; padding:20rpx;
border-radius: 8rpx;"> border-radius: 8rpx;">
<view class="uni-center" style="width: 25%; "> <view class="uni-center">
位置 : 位置 :
</view> </view>
<view class="" style="width: 75%;padding: 0rpx"> <view class="" style="width: 75%;padding: 0rpx">
@ -140,8 +140,8 @@
scanOptions: {}, scanOptions: {},
editItem: {}, editItem: {},
positionInfo: "请选择位置", positionInfo: "请选择位置",
positionList:[], positionList: [],
defaultValueList:[] defaultValueList: []
} }
}, },
created() { created() {
@ -154,12 +154,12 @@
}, },
methods: { methods: {
openScanPopup(content, jobcontent) { openScanPopup(content, jobcontent) {
debugger
this.issueRecord = []; this.issueRecord = [];
this.dataContent = content; this.dataContent = content;
this.jobContent = jobcontent; this.jobContent = jobcontent;
this.initData(); this.initData();
this.positionInfo =this.jobContent.workShopCode+"-"+this.jobContent.subList[0].productionLineCode+"-"+this.jobContent.subList[0].workStationCode this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
"-" + this.jobContent.subList[0].workStationCode
this.$refs.popup.open('bottom'); this.$refs.popup.open('bottom');
}, },
@ -171,7 +171,6 @@
}, },
initData() { initData() {
debugger
let that = this; let that = this;
that.fromLocationList = []; that.fromLocationList = [];
if (that.dataContent != null) { if (that.dataContent != null) {
@ -237,19 +236,19 @@
getBalanceByManagementPrecision(result.label, that.fromLocationCode, balanceRes => { getBalanceByManagementPrecision(result.label, that.fromLocationCode, balanceRes => {
if (balanceRes.success) { if (balanceRes.success) {
if (balanceRes.Data.length == 0) { if (balanceRes.data.list.length == 0) {
this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录', this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
res => { res => {
this.packGetFocus(); this.packGetFocus();
}) })
} else if (balanceRes.Data.length == 1) { } else if (balanceRes.data.list.length == 1) {
let balance = balanceRes.Data[0]; let balance = balanceRes.data.list[0];
this.afterGetBalance(result.label, balance); this.afterGetBalance(result.label, balance);
} else { } else {
this.showBalanceSelect(balanceRes.Data); this.showBalanceSelect(balanceRes.data.list);
} }
} else { } else {
this.showErrorMessage(balanceRes.message); this.showErrorMessage(balanceRes.message.message);
} }
uni.hideLoading(); uni.hideLoading();
}); });
@ -274,16 +273,18 @@
if (batch.Records == undefined) { if (batch.Records == undefined) {
batch.Records = []; batch.Records = [];
} }
let record = batch.Records.find(r => r.packingNumber == packingCode); let record = batch.Records.find(r => r.packingNumber == packingCode);
if (record == undefined) { if (record == undefined) {
//有推荐箱码
if (batch.Recommends != undefined) { //如果有推荐箱码
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) that.addRecord(batch, label, balance)
} else { } else {
//允许修改箱码 //允许修改箱码
if (this.jobContent.AllowModifyPackingNumber) { if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
that.addRecord(batch, label, balance); that.addRecord(batch, label, balance);
} else { } else {
that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',

15
pages/issue/job/issueDetail.vue
View File

@ -176,12 +176,15 @@
submit() { submit() {
//3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错 //3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错
//:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交 //:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交
var isOutIn = getApp().globalData.feed_configList.filter( // var isOutIn = getApp().globalData.feed_configList.filter(
res => { // res => {
if (res.name == 'feed_isOutIn') { // if (res.name == 'feed_isOutIn') {
return res; // return res;
} // }
}); // });
this.dataContent.itemCodeList.forEach(res => { this.dataContent.itemCodeList.forEach(res => {
if (res.handleQty > res.recommendQty) { if (res.handleQty > res.recommendQty) {

17
pages/issue/js/issue.js
View File

@ -1,4 +1,4 @@
export function getDataSource(list,subList) { export function getDataSource(list, subList) {
for (var i = 0; i < subList.length; i++) { for (var i = 0; i < subList.length; i++) {
let detail = subList[i]; let detail = subList[i];
var location = list.find(r => var location = list.find(r =>
@ -37,7 +37,7 @@ export function createDetailInfo(location, detail) {
let batch = createBatchInfo(detail); let batch = createBatchInfo(detail);
location.Batchs.push(batch); location.Batchs.push(batch);
} else { } else {
batch.recommends.push(detail); batch.Recommends.push(detail);
} }
} }
} }
@ -47,8 +47,8 @@ export function createItemInfo(detail) {
let item = { let item = {
itemCode: detail.itemCode, itemCode: detail.itemCode,
itemName: detail.itemName, itemName: detail.itemName,
productionLineCode:detail.productionLineCode, productionLineCode: detail.productionLineCode,
workStationCode:detail.workStationCode, workStationCode: detail.workStationCode,
stdPackQty: detail.stdPackQty, stdPackQty: detail.stdPackQty,
stdPackUnit: detail.stdPackUnit, stdPackUnit: detail.stdPackUnit,
qty: detail.qty, qty: detail.qty,
@ -81,15 +81,14 @@ export function createBatchInfo(detail) {
qty: detail.qty, qty: detail.qty,
uom: detail.uom, uom: detail.uom,
handleQty: 0, handleQty: 0,
// Recommends: [detail], Recommends: [],
// Records: [] Records: []
} }
//推荐到了箱码和批次 //推荐到了箱码和批次
if (detail.packingNumber != '') { if (detail.packingNumber != '' && detail.packingNumber != null) {
batch.Recommends = [detail]; batch.Recommends.push(detail);
} }
return batch; return batch;
} }

2
static/config.json
View File

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

Write Preview
Loading…
Cancel
Save