Browse Source

Merge branch 'hella_online_20240919' into master_hella

hella_online_20240924
陈薪名 2 months ago
parent
commit
e7f3d2d049
  1. 4
      src/manifest.json
  2. 4
      src/pages/count/job/countJob.vue
  3. 5
      src/pages/count/job/countLightDetail.vue
  4. 5
      src/pages/customerReturn/record/recordListDetail.vue
  5. 45
      src/pages/fg/coms/comNoReceiptPopup.vue
  6. 43
      src/pages/fg/coms/comReceiptPopup.vue
  7. 33
      src/pages/fg/receiptByPlan.vue
  8. 35
      src/pages/fg/receiptNoPlan.vue
  9. 5
      src/pages/itemHold/record/recordListDetail.vue
  10. 5
      src/pages/productionReturn/record/returnToHoldRecordListDetail.vue
  11. 125
      src/pages/putaway/job/quantityPutawayJob.vue

4
src/manifest.json

@ -3,8 +3,8 @@
"package" : "uni.UNI43932FE", "package" : "uni.UNI43932FE",
"appid" : "__UNI__C9CF4BF", "appid" : "__UNI__C9CF4BF",
"description" : "", "description" : "",
"versionName" : "1.0.75", "versionName" : "1.0.76",
"versionCode" : 75, "versionCode" : 76,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {

4
src/pages/count/job/countJob.vue

@ -178,8 +178,8 @@
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
sort:"number", sort:"count_split_code",
by:"DESC" by:"ASC"
} }
getCountJobList(params).then(res => { getCountJobList(params).then(res => {

5
src/pages/count/job/countLightDetail.vue

@ -478,7 +478,10 @@
commit() { commit() {
this.calcAllCount() this.calcAllCount()
this.calcScanCount() this.calcScanCount()
if(!this.scanCount){
this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交');
return
}
if (this.scanCount == this.allCount) { if (this.scanCount == this.allCount) {
this.submitJob(); this.submitJob();
} else if (this.scanCount < this.allCount) { } else if (this.scanCount < this.allCount) {

5
src/pages/customerReturn/record/recordListDetail.vue

@ -178,6 +178,8 @@
// //
if (this.scanCount == this.subList.length) { if (this.scanCount == this.subList.length) {
this.receiveDisable = false; this.receiveDisable = false;
}else {
this.receiveDisable = true;
} }
}, },
@ -193,6 +195,7 @@
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();
this.updateBtn()
}, },
openDetail(item) { openDetail(item) {
@ -372,6 +375,8 @@
this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => { this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => {
if (res) { if (res) {
this.getDetail() this.getDetail()
} else {
this.isAllReceived=true
} }
}); });
} }

45
src/pages/fg/coms/comNoReceiptPopup.vue

@ -99,6 +99,29 @@
</view> </view>
</view> </view>
</view> </view>
<view class='split_line'></view>
<view class="uni-flex uni-row" style="align-items: center; margin-top: 20rpx; margin-bottom: 20rpx; margin-left: 10rpx;justify-content: space-between;">
<view class="title" >
创建上架申请
</view>
<view class="" style="margin-right: 20rpx;">
<u-switch v-model="putAwayRequestSwitch" active-color="#4DD865" inactive-color="#eee" size="35"
@change="switchPutAwayRequest"></u-switch>
</view>
</view>
<view class='split_line'></view>
<view class="uni-flex uni-row" style="align-items: center; margin-top: 20rpx; margin-bottom: 20rpx; margin-left: 10rpx; justify-content: space-between;">
<view class="title" >
创建检验申请
</view>
<view class="" style="margin-right: 20rpx;">
<u-switch v-model="putAwayInspectSwitch" active-color="#4DD865" inactive-color="#eee" size="35"
@change="switchPutAwayInspect"></u-switch>
</view>
</view>
</view> </view>
<view class="uni-flex uni-row hide_border"> <view class="uni-flex uni-row hide_border">
<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button> <button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
@ -159,7 +182,6 @@
showProductLineSelect: false, showProductLineSelect: false,
productLineList: [], productLineList: [],
productionLineName: "请选择生产线", productionLineName: "请选择生产线",
productLineCode: "",
batch: "", batch: "",
packUnitName: "请选择包装规格", packUnitName: "请选择包装规格",
packUnit: "", packUnit: "",
@ -177,7 +199,8 @@
rawLocationCode: "", rawLocationCode: "",
workshop: "", workshop: "",
bomVersion: "", bomVersion: "",
uom: "" putAwayRequestSwitch:true,
putAwayInspectSwitch:true
} }
}, },
props: { props: {
@ -226,6 +249,8 @@
this.rawLocationCode = "" this.rawLocationCode = ""
this.workshop = "" this.workshop = ""
this.bomVersion ="" this.bomVersion =""
this.putAwayRequestSwitch=true,
this.putAwayInspectSwitch=true
}, },
@ -289,7 +314,10 @@
fgLocationCode: this.fgLocationCode, fgLocationCode: this.fgLocationCode,
rawLocationCode: this.rawLocationCode, rawLocationCode: this.rawLocationCode,
workshop: this.workshop, workshop: this.workshop,
bomVersion :this.bomVersion bomVersion :this.bomVersion,
putAwayRequestSwitch:this.putAwayRequestSwitch,
putAwayInspectSwitch:this.putAwayInspectSwitch
}; };
this.closeRequestPopup(); this.closeRequestPopup();
this.$emit("confirm", item); this.$emit("confirm", item);
@ -477,6 +505,17 @@
return item.label return item.label
} }
}, },
switchPutAwayRequest(value){
console.log(value)
console.log("打印"+this.putAwayRequestSwitch)
this.putAwayRequestSwitch =value;
},
switchPutAwayInspect(value){
console.log(value)
this.putAwayInspectSwitch =value;
}
} }
} }
</script> </script>

43
src/pages/fg/coms/comReceiptPopup.vue

@ -95,6 +95,27 @@
</image> </image>
</view> </view>
</view> </view>
<view class='split_line'></view>
<view class="uni-flex uni-row" style="align-items: center; margin-top: 20rpx; margin-bottom: 20rpx; margin-left: 10rpx;justify-content: space-between;">
<view class="title" >
创建上架申请
</view>
<view class="" style="margin-right: 20rpx;">
<u-switch v-model="putAwayRequestSwitch" active-color="#4DD865" inactive-color="#eee" size="35"
@change="switchPutAwayRequest"></u-switch>
</view>
</view>
<view class='split_line'></view>
<view class="uni-flex uni-row" style="align-items: center; margin-top: 20rpx; margin-bottom: 20rpx; margin-left: 10rpx; justify-content: space-between;">
<view class="title" >
创建检验申请
</view>
<view class="" style="margin-right: 20rpx;">
<u-switch v-model="putAwayInspectSwitch" active-color="#4DD865" inactive-color="#eee" size="35"
@change="switchPutAwayInspect"></u-switch>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -170,7 +191,9 @@
showDateSelect: false, showDateSelect: false,
planDateList: [], planDateList: [],
fgLocationCode: "", fgLocationCode: "",
rawLocationCode: "" rawLocationCode: "",
putAwayRequestSwitch:true,
putAwayInspectSwitch:true
} }
}, },
props: { props: {
@ -218,6 +241,8 @@
this.planDateList = [] this.planDateList = []
this.fgLocationCode = "" this.fgLocationCode = ""
this.rawLocationCode = "" this.rawLocationCode = ""
this.putAwayRequestSwitch=true
this.putAwayInspectSwitch=true
}, },
@ -274,7 +299,9 @@
planNumber: this.planNumber, planNumber: this.planNumber,
workStationCode: this.workStationCode, workStationCode: this.workStationCode,
fgLocationCode: this.fgLocationCode, fgLocationCode: this.fgLocationCode,
rawLocationCode: this.rawLocationCode rawLocationCode: this.rawLocationCode,
putAwayRequestSwitch:this.putAwayRequestSwitch,
putAwayInspectSwitch:this.putAwayInspectSwitch
}; };
this.closeRequestPopup(); this.closeRequestPopup();
this.$emit("confirm", item); this.$emit("confirm", item);
@ -370,6 +397,8 @@
// this.packUnitList = [] // this.packUnitList = []
this.itemCodeList = []; this.itemCodeList = [];
this.showSelectItemCode(); this.showSelectItemCode();
this.putAwayRequestSwitch=true
this.putAwayInspectSwitch=true
}, },
showItemList() { showItemList() {
@ -508,6 +537,16 @@
return item.label return item.label
} }
}, },
switchPutAwayRequest(value){
console.log(value)
console.log("打印"+this.putAwayRequestSwitch)
this.putAwayRequestSwitch =value;
},
switchPutAwayInspect(value){
console.log(value)
this.putAwayInspectSwitch =value;
}
} }
} }
</script> </script>

33
src/pages/fg/receiptByPlan.vue

@ -211,6 +211,8 @@
packUnit: result.packUnit, packUnit: result.packUnit,
workStationCode: result.workStationCode, workStationCode: result.workStationCode,
fgLocationCode: result.fgLocationCode, fgLocationCode: result.fgLocationCode,
putAwayRequestSwitch:result.putAwayRequestSwitch,
putAwayInspectSwitch:result.putAwayInspectSwitch,
subList: [] subList: []
} }
}, },
@ -301,24 +303,17 @@
throw new Error("提交失败") throw new Error("提交失败")
} }
// //
let createProductputawaySwitch = getSwitchInfoByCode( if(this.dataContent.putAwayRequestSwitch){
"CreateProductputawayRequestAfterProductreceiptRecordCreated") if(list.length>0&&list[0].requestNumber){
// if (createProductputawaySwitch) { await createPutawayRequestByPlan(list[0].requestNumber)
// createPutawayRequestByPlan(list[0].requestNumber).then(res => {
// createInspectRequestByPlan(list[0].requestNumber)
// })
// }
//
if (createProductputawaySwitch) {
if (list.length > 0 && list[0].requestNumber) {
createPutawayRequestByPlan(list[0].requestNumber).then(res => {
createInspectRequestByPlan(list[0].requestNumber)
})
} }
} else { // }
if (list.length > 0 && list[0].requestNumber) {
createInspectRequestByPlan(list[0].requestNumber) //
if(this.dataContent.putAwayInspectSwitch){
if(list.length>0&&list[0].requestNumber){
await createInspectRequestByPlan(list[0].requestNumber)
} }
} }
@ -352,9 +347,7 @@
this.index = 1 this.index = 1
} }
} }
// else {
// throw new Error("")
// }
uni.hideLoading() uni.hideLoading()
if (isAllSubmit) { if (isAllSubmit) {
this.clearData() this.clearData()

35
src/pages/fg/receiptNoPlan.vue

@ -149,7 +149,7 @@
index: 1, index: 1,
loadingType: "", loadingType: "",
pageSize: 20, pageSize: 20,
scanedQty: 0 scanedQty: 0,
}; };
}, },
@ -210,7 +210,9 @@
bomVersion: result.bomVersion, bomVersion: result.bomVersion,
workshop: result.workshop, workshop: result.workshop,
team: "", team: "",
shift: "" shift: "",
putAwayRequestSwitch:result.putAwayRequestSwitch,
putAwayInspectSwitch:result.putAwayInspectSwitch
} }
}, },
@ -273,7 +275,7 @@
let list = [] let list = []
var planData = await planReceiptSubmit(params) var planData = await planReceiptSubmit(params)
if (planData.data) { if (planData.data&&planData.data.length>0) {
planData.data.forEach(item => { planData.data.forEach(item => {
list.push({ list.push({
itemCode: item.itemCode, // itemCode: item.itemCode, //
@ -296,18 +298,25 @@
} else { } else {
throw new Error("提交失败") throw new Error("提交失败")
} }
//
if(this.dataContent.putAwayRequestSwitch){
if(list.length>0&&list[0].requestNumber){
await createPutawayRequestByPlan(list[0].requestNumber)
}
}
let createProductputawaySwitch = getSwitchInfoByCode( //
"CreateProductputawayRequestAfterProductreceiptRecordCreated") if(this.dataContent.putAwayInspectSwitch){
// if(list.length>0&&list[0].requestNumber){
if (createProductputawaySwitch) { await createInspectRequestByPlan(list[0].requestNumber)
createPutawayRequestByPlan(list[0].requestNumber).then(res => { }
createInspectRequestByPlan(list[0].requestNumber) }
}) var hintMsg ="提交成功\n生成装配收货记录\n";
} else { // if(list.length>0&&list[0].requestNumber){
createInspectRequestByPlan(list[0].requestNumber) hintMsg += list[0].requestNumber
} }
this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
this.showCommitSuccessMessage(hintMsg, list)
this.scanedQty = this.scanedQty + this.showList.length; this.scanedQty = this.scanedQty + this.showList.length;
this.showList = []; this.showList = [];
this.dataContent.handleQty = 0; this.dataContent.handleQty = 0;

5
src/pages/itemHold/record/recordListDetail.vue

@ -183,6 +183,8 @@
// //
if (this.scanCount == this.subList.length) { if (this.scanCount == this.subList.length) {
this.receiveDisable = false; this.receiveDisable = false;
}else {
this.receiveDisable = true;
} }
}, },
@ -198,6 +200,7 @@
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();
this.updateBtn()
}, },
openDetail(item) { openDetail(item) {
@ -378,6 +381,8 @@
this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => { this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => {
if (res) { if (res) {
this.getDetail() this.getDetail()
} else {
this.isAllReceived=true
} }
}); });
} }

5
src/pages/productionReturn/record/returnToHoldRecordListDetail.vue

@ -181,6 +181,8 @@
// //
if (this.scanCount == this.subList.length) { if (this.scanCount == this.subList.length) {
this.receiveDisable = false; this.receiveDisable = false;
}else {
this.receiveDisable = true;
} }
}, },
@ -196,6 +198,7 @@
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty();
this.updateBtn()
}, },
openDetail(item) { openDetail(item) {
@ -377,6 +380,8 @@
this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => { this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => {
if (res) { if (res) {
this.getDetail() this.getDetail()
} else {
this.isAllReceived=true
} }
}); });
} }

125
src/pages/putaway/job/quantityPutawayJob.vue

@ -1,19 +1,23 @@
<template> <template>
<view class=""> <view class="">
<view class="" v-if="jobList.length>0" style="background: white;padding: 20rpx;position: fixed;width: 100%;box-shadow: 0px 0px 10px 10px rgba(1, 1, 1, 0.05);z-index: 22; "> <view class="" v-if="jobList.length>0"
<uni-pagination :total="totalCount" title="每页30" :pageSize='pageSize' @change="changePage" :current="pageNo"/> style="background: white;padding: 20rpx;position: fixed;width: 100%;box-shadow: 0px 0px 10px 10px rgba(1, 1, 1, 0.05);z-index: 22; ">
<uni-pagination :total="totalCount" title="每页30" :pageSize='pageSize' @change="changePage"
:current="pageNo" />
<view class="uni-flex uni-row"> <view class="uni-flex uni-row">
<view class="uni-flex uni-row"> <view class="uni-flex uni-row">
<view class="" > <view class="">
<u-checkbox size="40" v-model="checkAll" @change="checkAllItems" > <u-checkbox size="40" v-model="checkAll" @change="checkAllItems">
</u-checkbox> </u-checkbox>
</view> </view>
<view> <view>
<text style="margin-left: 2rpx; font-size: 32rpx;font-weight: bold;">当前页({{jobList.length}})</text> <text
style="margin-left: 2rpx; font-size: 32rpx;font-weight: bold;">当前页({{jobList.length}})</text>
</view> </view>
</view> </view>
<view class="" style=" margin-left: 10rpx; font-size: 32rpx; align-items: center; text-align: center;"> <view class=""
style=" margin-left: 10rpx; font-size: 32rpx; align-items: center; text-align: center;">
{{pageNo}}每页/{{ pageSize}}, :{{ totalCount }} {{pageNo}}每页/{{ pageSize}}, :{{ totalCount }}
</view> </view>
</view> </view>
@ -26,19 +30,26 @@
</job-filter> </job-filter>
<view v-if="jobList.length>0" style="padding-bottom: 100rpx;padding-top: 150rpx;"> <view v-if="jobList.length>0" style="padding-bottom: 100rpx;padding-top: 150rpx;">
<view class="" style="padding-left: 60rpx; padding-top: 10rpx; padding-bottom: 10rpx; background-color:#D3D1CC">
<locationCompare ref='comScanLocation' title="目标库位"
:recommendLocationCode="toSubmitLocationCode" @getLocation='scanLocationCode' :isShowEdit="true"
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<view v-for="(item, index) in jobList" :key="index" > <view v-for="(item, index) in jobList" :key="index">
<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions" <uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
@click="swipeClick($event,item)"> @click="swipeClick($event,item)">
<view class="flex" style="flex-direction: row; align-items: center;" > <view class="flex" style="flex-direction: row; align-items: center;">
<view class="uni-flex" style="flex-direction: column; align-items: center;" > <view class="uni-flex" style="flex-direction: column; align-items: center;">
<text style="margin-bottom: 10rpx;">({{index+1}})</text> <text style="margin-bottom: 10rpx;">({{index+1}})</text>
<u-checkbox v-model="item.checked" :name="item.id" size="50" shape ="circle"> <u-checkbox v-model="item.checked" :name="item.id" size="50" shape="circle">
</u-checkbox> </u-checkbox>
</view> </view>
<view class="" style="width: 100%;"> <view class="" style="width: 100%;">
<com-putaway-job-card :dataContent="item" @click='checkedItem(item)'></com-putaway-job-card> <com-putaway-job-card :dataContent="item"
@click='checkedItem(item)'></com-putaway-job-card>
</view> </view>
</view> </view>
</uni-swipe-action-item> </uni-swipe-action-item>
@ -70,6 +81,9 @@
cancleAllTakePutawayJob cancleAllTakePutawayJob
} from '@/api/request2.js'; } from '@/api/request2.js';
import {
getDirectoryItemArray,
} from '@/common/directory.js';
import { import {
goHome, goHome,
@ -89,6 +103,7 @@
import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue' import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue" import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
import comCheckAll from "@/mycomponents/button/comCheckAll.vue" import comCheckAll from "@/mycomponents/button/comCheckAll.vue"
import locationCompare from '@/mycomponents/location/locationCompare.vue'
import { import {
@ -106,7 +121,8 @@
winScanButton, winScanButton,
winScanPackJob, winScanPackJob,
jobList, jobList,
comCheckAll comCheckAll,
locationCompare
}, },
data() { data() {
return { return {
@ -129,7 +145,9 @@
itemCode: "", itemCode: "",
toAreaCode: "", toAreaCode: "",
toLocationCode: "", toLocationCode: "",
checkAll:false checkAll: false,
toSubmitLocationCode: "",
toLocationAreaTypeList: []
}; };
}, },
@ -198,16 +216,17 @@
} }
this.currentPageNo = this.pageNo this.currentPageNo = this.pageNo
getPutawayJobList(params).then(res => { getPutawayJobList(params).then(res => {
uni.hideLoading(); uni.hideLoading();
if (type === "refresh") { if (type === "refresh") {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
} }
var list = res.data.list; var list = res.data.list;
list.forEach(item=>{ list.forEach(item => {
item.checked=false; item.checked = false;
}) })
this.checkAll=false this.checkAll = false
this.totalCount = res.data.total this.totalCount = res.data.total
updateTitle(this.title + "(" + this.totalCount + ")"); updateTitle(this.title + "(" + this.totalCount + ")");
// this.loadingType = "loadmore"; // this.loadingType = "loadmore";
@ -216,6 +235,11 @@
// return; // return;
// } // }
this.jobList = list this.jobList = list
if (this.jobList.length > 0) {
this.toLocationAreaTypeList = getDirectoryItemArray(this.jobList[0].toAreaTypes)
}
this.toSubmitLocationCode=""
// this.pageNo++; // this.pageNo++;
}).catch(error => { }).catch(error => {
@ -376,16 +400,34 @@
}, },
// //
takeAllJob() { takeAllJob() {
if(!this.toSubmitLocationCode){
this.$refs.comMessage.showQuestionMessage("是否要修改目标库位?", res => {
if (res) {
this.$refs.comScanLocation.showLocation()
}else {
this.submitJob()
}
});
}else {
this.submitJob()
}
},
submitJob(){
this.jobNumberList = []
this.jobList.forEach(item => {
if (item.checked) {
this.jobNumberList.push(item.number)
}
})
if(this.jobNumberList.length==0){
this.showMessage("最少选择一条数据")
return
}
uni.showLoading({ uni.showLoading({
title: "加载中­....", title: "加载中­....",
mask: true mask: true
}); });
this.jobNumberList =[]
this.jobList.forEach(item=>{
if(item.checked){
this.jobNumberList.push(item.number)
}
})
takeAllPutawayJob({ takeAllPutawayJob({
jobNumberList: this.jobNumberList jobNumberList: this.jobNumberList
@ -401,10 +443,14 @@
this.showMessage(error) this.showMessage(error)
}) })
}, },
executeAllJob() { executeAllJob() {
putawayJobAllExecute({ var params ={
jobNumberList: this.jobNumberList toLocationCode:this.toSubmitLocationCode,
}).then(res => { jobNumberList:this.jobNumberList
}
putawayJobAllExecute(params).then(res => {
if (res.data) { if (res.data) {
uni.hideLoading() uni.hideLoading()
this.$refs.comMessage.showSuccessMessage("执行任务成功", res => { this.$refs.comMessage.showSuccessMessage("执行任务成功", res => {
@ -442,25 +488,28 @@
this.status = 1 this.status = 1
this.getList() this.getList()
}, },
checkAllItems(checkAll){ checkAllItems(checkAll) {
if(checkAll.value){ if (checkAll.value) {
this.jobList.forEach(res=>{ this.jobList.forEach(res => {
res.checked=true; res.checked = true;
}) })
}else { } else {
this.jobList.forEach(res=>{ this.jobList.forEach(res => {
res.checked=false; res.checked = false;
}) })
} }
}, },
cancleAll(){ cancleAll() {
this.jobList.forEach(res=>{ this.jobList.forEach(res => {
res.checked=false; res.checked = false;
}) })
}, },
checkedItem(item){ checkedItem(item) {
item.checked =!item.checked item.checked = !item.checked
} },
scanLocationCode(location, code) {
this.toSubmitLocationCode = code
},
} }
} }

Loading…
Cancel
Save