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

修改计划完工和无计划完工

hella_online_20240919
lijuncheng 2 months ago
parent
78e0b7caed
commit
8358749724
4 changed files with 121 additions and 39 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. 45
      src/pages/fg/coms/comNoReceiptPopup.vue
  2. 43
      src/pages/fg/coms/comReceiptPopup.vue
  3. 37
      src/pages/fg/receiptByPlan.vue
  4. 33
      src/pages/fg/receiptNoPlan.vue

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

@ -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
View File

@ -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>

37
src/pages/fg/receiptByPlan.vue
View File

@ -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,27 +303,6 @@
throw new Error("提交失败") throw new Error("提交失败")
} }
//装配收货记录 生成后 创建 制品上架申请
let createProductputawaySwitch = getSwitchInfoByCode(
"CreateProductputawayRequestAfterProductreceiptRecordCreated")
// if (createProductputawaySwitch) {
// 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)
}
}
var queryParams = { var queryParams = {
filters: [{ filters: [{
column: "number", column: "number",
@ -372,6 +353,20 @@
this.showCommitSuccessMessage(hintMsg, list) this.showCommitSuccessMessage(hintMsg, list)
}) })
//创建上架申请
if(this.dataContent.putAwayRequestSwitch){
if(list.length>0&&list[0].requestNumber){
createPutawayRequestByPlan(list[0].requestNumber)
}
}
//创建检验申请
if(this.dataContent.putAwayInspectSwitch){
if(list.length>0&&list[0].requestNumber){
createInspectRequestByPlan(list[0].requestNumber)
}
}
} catch (error) { } catch (error) {
uni.hideLoading() uni.hideLoading()
var hint = error.message ? error.message : error var hint = error.message ? error.message : error

33
src/pages/fg/receiptNoPlan.vue
View File

@ -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){
createPutawayRequestByPlan(list[0].requestNumber)
}
}
let createProductputawaySwitch = getSwitchInfoByCode( //创建检验申请
"CreateProductputawayRequestAfterProductreceiptRecordCreated") if(this.dataContent.putAwayInspectSwitch){
//创建上架申请和检验申请 if(list.length>0&&list[0].requestNumber){
if (createProductputawaySwitch) {
createPutawayRequestByPlan(list[0].requestNumber).then(res => {
createInspectRequestByPlan(list[0].requestNumber) createInspectRequestByPlan(list[0].requestNumber)
}) }
} else { //创建检验申请 }
createInspectRequestByPlan(list[0].requestNumber) var hintMsg ="提交成功\n生成装配收货记录\n";
if(list.length>0&&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;

Write Preview
Loading…
Cancel
Save