Merge branch 'hella_online_20240919' into master_hella

src/manifest.json

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

src/pages/count/job/countJob.vue

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

src/pages/count/job/countLightDetail.vue

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

src/pages/customerReturn/record/recordListDetail.vue

@@ -178,6 +178,8 @@
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.receiveDisable = false;
+				}else {
+					this.receiveDisable = true;
 				}
 			},
 
@@ -193,6 +195,7 @@
 
 			updateData() {
 				this.calcHandleQty();
+				this.updateBtn()
 			},
 
 			openDetail(item) {
@@ -372,6 +375,8 @@
 					this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => {
 						if (res) {
 							this.getDetail()
+						} else {
+							this.isAllReceived=true
 						}
 					});
 				}

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,24 +303,17 @@
 						throw new Error("提交失败")
 					}
 					
-					//装配收货记录 生成后 创建 制品上架申请
+					//创建上架申请
-					let createProductputawaySwitch = getSwitchInfoByCode(
+					if(this.dataContent.putAwayRequestSwitch){
-						"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 => {
+						  await	createPutawayRequestByPlan(list[0].requestNumber)
-								createInspectRequestByPlan(list[0].requestNumber)
+						}
-							})
 					}
-					} else { //创建检验申请
+					
+					//创建检验申请
+					if(this.dataContent.putAwayInspectSwitch){
 						if(list.length>0&&list[0].requestNumber){
-							createInspectRequestByPlan(list[0].requestNumber)
+						 await	createInspectRequestByPlan(list[0].requestNumber)
 						}
 					}
 
@@ -352,9 +347,7 @@
 							this.index = 1
 						}
 					}
-					//  else {
+					
-					// 	throw new Error("未查找到单据信息")
-					// }
 					uni.hideLoading()
 					if (isAllSubmit) {
 						this.clearData()

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("提交失败")
 					}
+					//创建上架申请
+					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)
-						})
-					} 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;

src/pages/itemHold/record/recordListDetail.vue

@@ -183,6 +183,8 @@
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.receiveDisable = false;
+				}else {
+					this.receiveDisable = true;
 				}
 			},
 
@@ -198,6 +200,7 @@
 
 			updateData() {
 				this.calcHandleQty();
+				this.updateBtn()
 			},
 
 			openDetail(item) {
@@ -378,6 +381,8 @@
 					this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => {
 						if (res) {
 							this.getDetail()
+						} else {
+							this.isAllReceived=true
 						}
 					});
 				}

src/pages/productionReturn/record/returnToHoldRecordListDetail.vue

@@ -181,6 +181,8 @@
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.receiveDisable = false;
+				}else {
+					this.receiveDisable = true;
 				}
 			},
 
@@ -196,6 +198,7 @@
 
 			updateData() {
 				this.calcHandleQty();
+				this.updateBtn()
 			},
 
 			openDetail(item) {
@@ -377,6 +380,8 @@
 					this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => {
 						if (res) {
 							this.getDetail()
+						} else {
+							this.isAllReceived=true
 						}
 					});
 				}

src/pages/putaway/job/quantityPutawayJob.vue

@@ -1,7 +1,9 @@
 <template>
 	<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">
@@ -10,10 +12,12 @@
 						</u-checkbox>
 					</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 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 }}
 				</view>
 			</view>
@@ -26,6 +30,12 @@
 		</job-filter>
 
 		<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">
 				<view v-for="(item, index) in jobList" :key="index">
 					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
@@ -38,7 +48,8 @@
 								</u-checkbox>
 							</view>
 							<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>
 					</uni-swipe-action-item>
@@ -70,6 +81,9 @@
 		cancleAllTakePutawayJob
 	} from '@/api/request2.js';
 
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
 
 	import {
 		goHome,
@@ -89,6 +103,7 @@
 	import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
 	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
 	import comCheckAll from "@/mycomponents/button/comCheckAll.vue"
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 
 
 	import {
@@ -106,7 +121,8 @@
 			winScanButton,
 			winScanPackJob,
 			jobList,
-			comCheckAll
+			comCheckAll,
+			locationCompare
 		},
 		data() {
 			return {
@@ -129,7 +145,9 @@
 				itemCode: "",
 				toAreaCode: "",
 				toLocationCode: "",
-				checkAll:false
+				checkAll: false,
+				toSubmitLocationCode: "",
+				toLocationAreaTypeList: []
 			};
 		},
 
@@ -198,6 +216,7 @@
 				}
 				this.currentPageNo = this.pageNo
 				getPutawayJobList(params).then(res => {
+
 					uni.hideLoading();
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
@@ -216,6 +235,11 @@
 					// 	return;
 					// }
 					this.jobList = list
+					if (this.jobList.length > 0) {
+						this.toLocationAreaTypeList = getDirectoryItemArray(this.jobList[0].toAreaTypes)
+					}
+					this.toSubmitLocationCode=""
+
 					// this.pageNo++;
 
 				}).catch(error => {
@@ -376,16 +400,34 @@
 			},
 			//  承接全部任务
 			takeAllJob() {
-				uni.showLoading({
+				if(!this.toSubmitLocationCode){
-					title: "加载中­....",
+					this.$refs.comMessage.showQuestionMessage("是否要修改目标库位?", res => {
-					mask: true
+						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({
+					title: "加载中­....",
+					mask: true
+				});
 				
 				takeAllPutawayJob({
 					jobNumberList: this.jobNumberList
@@ -401,10 +443,14 @@
 					this.showMessage(error)
 				})
 			},
+			
+			
 			executeAllJob() {
-				putawayJobAllExecute({
+				var params ={
+					toLocationCode:this.toSubmitLocationCode,
 					jobNumberList:this.jobNumberList
-				}).then(res => {
+				}
+				putawayJobAllExecute(params).then(res => {
 					if (res.data) {
 						uni.hideLoading()
 						this.$refs.comMessage.showSuccessMessage("执行任务成功", res => {
@@ -460,7 +506,10 @@
 			},
 			checkedItem(item) {
 				item.checked = !item.checked
-			}
+			},
+			scanLocationCode(location, code) {
+				this.toSubmitLocationCode = code
+			},
 
 		}
 	}