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

修改发料任务匹配规则

dev_pda
李俊城 2 years ago
parent
502f67926e
commit
282cfef2ef
4 changed files with 157 additions and 71 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. 4
      fe/PDA/common/modelConfig.js
  2. 1
      fe/PDA/main.js
  3. 6
      fe/PDA/pages/login/index.vue
  4. 165
      fe/PDA/pages/task/issue_detail.vue

4
fe/PDA/common/modelConfig.js
View File

@ -1,5 +1,7 @@
let maxPageSize = 10;
let version ="1.0"
export default{
maxPageSize
maxPageSize,
version
}

1
fe/PDA/main.js
View File

@ -47,6 +47,7 @@ Vue.use(VueAxios, axios)
Vue.prototype.$request = request
Vue.prototype.$url = url.url_config
Vue.prototype.modelConfig = modelConfig.maxPageSize
Vue.prototype.versionCode = modelConfig.version
Vue.prototype.utils = utils;
Vue.config.productionTip = false

6
fe/PDA/pages/login/index.vue
View File

@ -2,6 +2,7 @@
<view class="content">
<!-- <image mode="widthFix" class="loginimg" src="../../static/login.png"></image> -->
<image mode="widthFix" class="loginimg" src="../../static/icons_ui/login_bg.png"></image>
<view class="login_title">
<text>您好，欢迎使用</text><br>
WMS仓库管理系统
@ -57,6 +58,7 @@
</form>
</view>
</view>
version : {{version}}
</view>
</template>
@ -82,7 +84,8 @@
password: "",
tapstyle: 2,
loading: false,
showPassword: true
showPassword: true,
version:"0"
}
},
computed: mapState(['forcedLogin', 'hasLogin']),
@ -96,6 +99,7 @@
frontColor: '#ffffff',
backgroundColor: "#476DF5 !important"
})
this.version = this.versionCode;
},
onLoad() {},
methods: {

165
fe/PDA/pages/task/issue_detail.vue
View File

@ -36,13 +36,14 @@
<text class="text_black">{{item.recommendQty}}({{item.uom}})</text>
</uni-th>
<uni-th width="120" align="center">
<view v-if="item.scaned" style="display: flex;flex-direction: row;justify-content:center;align-items: center;">
<view v-if="item.scaned"
style="display: flex;flex-direction: row;justify-content:center;align-items: center;">
<com-number-box :ref="'comNumberBox_'+index" v-model="item.handledQty" :max="99999" :min="0"
style='width: 100px;' @change="qtyChanged($event,item,index)">
<com-number-box :ref="'comNumberBox_'+index" v-model="item.handledQty"
:max="99999" :min="0" style='width: 100px;'
@change="qtyChanged($event,item,index)">
</com-number-box>
<text
class="text_black" >({{item.uom}})</text>
<text class="text_black">({{item.uom}})</text>
</view>
</uni-th>
</uni-tr>
@ -74,7 +75,8 @@
<view class="text_black">{{ item.recommendFromLocationCode }}</view>
</uni-th>
<uni-th width="100" align="center">
<view class="text_black" v-if="item.scaned">{{ item.handledFromLocationCode }}
<view class="text_black" v-if="item.scaned">
{{ item.handledFromLocationCode }}
</view>
</uni-th>
</uni-tr>
@ -97,7 +99,8 @@
<win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult'></win-scan-by-pack>
<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()' @afterCloseScanMessage='closeScanMessage'></com-message>
<com-message ref="comMessage" @afterCloseCommitMessage='closeCommitMessage()'
@afterCloseScanMessage='closeScanMessage'></com-message>
</view>
</template>
@ -307,36 +310,32 @@
dyIssue(result, scaned) {
let that = this;
that.currentItem = that.details.find(r => {
var itemCode = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendPackingCode === result.data.code &&
r.recommendLot === result.data.lot &&
r.scaned === scaned
});
//没找到符合的箱码
if (that.currentItem === undefined) {
var itemCode = that.details.find(res=>{
return res.itemCode ===result.data.itemCode&&
res.scaned === scaned
})
//零件号相等
if(itemCode!=undefined){
var lot = that.details.find(res=>{
return res.itemCode===result.data.itemCode&&
res.recommendLot ===result.data.lot&&
res.scaned === scaned
})
if(lot!=undefined){
//通过
that.currentItem =lot;
that.afterScanPackLabel(result);
if (itemCode == undefined) {
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
}else {
//批次不相等
// 提示未执行先进先出或者不是最先批次。
//零件号相同、箱码相同
var itemCode1 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendPackingCode === result.data.code
r.scaned === scaned
})
//零件号相同、箱码不相同
if(itemCode1 == undefined){
var itemCode2 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendLot === result.data.lot
&&r.scaned === scaned
})
//零件号相同、箱码不相同、批次相同
if(itemCode2==undefined){
//零件号相同、箱码不相同、批次不相同
console.log("零件号相同、箱码不相同、批次不相同")
setTimeout(res => {
showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => {
showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
if (confirm) {
that.currentItem = itemCode;
that.afterScanPackLabel(result);
@ -346,25 +345,105 @@
});
}, 100)
}else {
console.log("零件号相同、箱码不相同、批次相同")
//零件号相同、箱码不相同、批次相同
that.currentItem = itemCode2;
that.afterScanPackLabel(result);
}
}else {
//零件号不相等
var lot = that.details.find(res=>{
return res.recommendLot ===result.data.lot&&
res.scaned === scaned
//零件号相同、箱码相同、批次相同
var itemCode3 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendPackingCode === result.data.code&&
r.recommendLot === result.data.lot
&&r.scaned === scaned
})
//批次相等
if(lot!=undefined){
// 在该任务中未找到零件。
that.showScanMessage('在该任务中未找到零件');
if(itemCode3==undefined){
//零件号相同、箱码相同、批次不同
console.log("零件号相同、箱码相同、批次不同")
setTimeout(res => {
showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
if (confirm) {
that.currentItem = itemCode1;
that.afterScanPackLabel(result);
} else {
//零件号不相等,批次不相等
that.showScanMessage('所扫描的物料不在任务中');
}
that.scanPopupGetFocus();
}
});
}, 100)
}else {
console.log("零件号相同、箱码相同、批次相同")
//零件号相同、箱码相同、批次相同
that.currentItem = itemCode3;
that.afterScanPackLabel(result);
}
}
}
// that.currentItem = that.details.find(r => {
// return r.itemCode === result.data.itemCode &&
// r.recommendPackingCode === result.data.code &&
// r.recommendLot === result.data.lot &&
// r.scaned === scaned
// });
// //没找到符合的箱码、零件号、箱码、批次都相等
// if (that.currentItem === undefined) {
// var itemCode = that.details.find(res => {
// return res.itemCode === result.data.itemCode &&
// res.scaned === scaned
// })
// //零件号相等
// if (itemCode != undefined) {
// var lot = that.details.find(res => {
// return res.itemCode === result.data.itemCode &&
// res.recommendLot === result.data.lot &&
// res.scaned === scaned
// })
// if (lot != undefined) {
// //通过
// that.currentItem = lot;
// that.afterScanPackLabel(result);
// } else {
// //批次不相等
// // 提示未执行先进先出或者不是最先批次。
// setTimeout(res => {
// showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => {
// if (confirm) {
// that.currentItem = itemCode;
// that.afterScanPackLabel(result);
// } else {
// that.scanPopupGetFocus();
// }
// });
// }, 100)
// }
// } else {
// //零件号不相等
// var lot = that.details.find(res => {
// return res.recommendLot === result.data.lot &&
// res.scaned === scaned
// })
// //批次相等
// if (lot != undefined) {
// // 在该任务中未找到零件。
// that.showScanMessage('在该任务中未找到零件');
// } else {
// //零件号不相等,批次不相等
// that.showScanMessage('所扫描的物料不在任务中');
// }
// }
// } else {
// that.afterScanPackLabel(result);
// }
},
afterScanPackLabel(result) {

Write Preview
Loading…
Cancel
Save