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

src/pages/fg/coms/comNoReceiptPopup.vue

@@ -99,6 +99,29 @@
 							</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 class="uni-flex uni-row hide_border">
 					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
@@ -159,7 +182,6 @@
 				showProductLineSelect: false,
 				productLineList: [],
 				productionLineName: "请选择生产线",
-				productLineCode: "",
 				batch: "",
 				packUnitName: "请选择包装规格",
 				packUnit: "",
@@ -177,7 +199,8 @@
 				rawLocationCode: "",
 				workshop: "",
 				bomVersion: "",
-				uom: ""
+				putAwayRequestSwitch:true,
+				putAwayInspectSwitch:true
 			}
 		},
 		props: {
@@ -226,6 +249,8 @@
 				this.rawLocationCode = ""
 				this.workshop = ""
 				this.bomVersion =""
+				this.putAwayRequestSwitch=true,
+				this.putAwayInspectSwitch=true
 
 			},
 
@@ -289,7 +314,10 @@
 					fgLocationCode: this.fgLocationCode,
 					rawLocationCode: this.rawLocationCode,
 					workshop: this.workshop,
-					bomVersion :this.bomVersion
+					bomVersion :this.bomVersion,
+					putAwayRequestSwitch:this.putAwayRequestSwitch,
+					putAwayInspectSwitch:this.putAwayInspectSwitch
+					
 				};
 				this.closeRequestPopup();
 				this.$emit("confirm", item);
@@ -477,6 +505,17 @@
 					return item.label
 				}
 			},
+			switchPutAwayRequest(value){
+				console.log(value)
+				console.log("打印"+this.putAwayRequestSwitch)
+				this.putAwayRequestSwitch =value;
+			},
+			
+			switchPutAwayInspect(value){
+				console.log(value)
+				this.putAwayInspectSwitch =value;
+			}
+			
 		}
 	}
 </script>

src/pages/fg/coms/comReceiptPopup.vue

@@ -95,6 +95,27 @@
 									</image>
 								</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>
@@ -170,7 +191,9 @@
 				showDateSelect: false,
 				planDateList: [],
 				fgLocationCode: "",
-				rawLocationCode: ""
+				rawLocationCode: "",
+				putAwayRequestSwitch:true,
+				putAwayInspectSwitch:true
 			}
 		},
 		props: {
@@ -218,6 +241,8 @@
 				this.planDateList = []
 				this.fgLocationCode = ""
 				this.rawLocationCode = ""
+				this.putAwayRequestSwitch=true
+				this.putAwayInspectSwitch=true
 
 			},
 
@@ -274,7 +299,9 @@
 					planNumber: this.planNumber,
 					workStationCode: this.workStationCode,
 					fgLocationCode: this.fgLocationCode,
-					rawLocationCode: this.rawLocationCode
+					rawLocationCode: this.rawLocationCode,
+					putAwayRequestSwitch:this.putAwayRequestSwitch,
+					putAwayInspectSwitch:this.putAwayInspectSwitch
 				};
 				this.closeRequestPopup();
 				this.$emit("confirm", item);
@@ -370,6 +397,8 @@
 				// this.packUnitList = []
 				this.itemCodeList = [];
 				this.showSelectItemCode();
+				this.putAwayRequestSwitch=true
+				this.putAwayInspectSwitch=true
 			},
 
 			showItemList() {
@@ -508,6 +537,16 @@
 					return item.label
 				}
 			},
+			switchPutAwayRequest(value){
+				console.log(value)
+				console.log("打印"+this.putAwayRequestSwitch)
+				this.putAwayRequestSwitch =value;
+			},
+			
+			switchPutAwayInspect(value){
+				console.log(value)
+				this.putAwayInspectSwitch =value;
+			}
 		}
 	}
 </script>

src/pages/fg/receiptByPlan.vue

@@ -211,6 +211,8 @@
 					packUnit: result.packUnit,
 					workStationCode: result.workStationCode,
 					fgLocationCode: result.fgLocationCode,
+					putAwayRequestSwitch:result.putAwayRequestSwitch,
+					putAwayInspectSwitch:result.putAwayInspectSwitch
 					subList: []
 				}
 			},
@@ -301,27 +303,6 @@
 						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 = {
 						filters: [{
 							column: "number",
@@ -371,6 +352,20 @@
 					nextTick(() => {
 						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) {
 					uni.hideLoading()

src/pages/fg/receiptNoPlan.vue

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