PDA拼箱，多箱拼箱

api/warehouse/wmGoodsAction.js

@@ -24,3 +24,14 @@ export function doUnpackingGoods(data) {
   })
 }
 
+/**
+* 拼箱2 多箱拼箱
+* @param data
+*/
+export function doConsolidationGoods2(data) {
+  return request({
+    url: '/mes/wm/WmGoodsAction/doConsolidationGoods2',
+    method: 'post',
+    data: data,
+  })
+}

pages/consolidation/consolidation.vue

@@ -4,11 +4,11 @@
 			<!-- <span class="title-text">拼箱</span> -->
 			<view class="warehoseInfo-box">
 				<view class="row">
-					<span class="col">已扫货物数：{{ quantityTotal }}</span>
+					<span class="col">已扫零件数：{{ quantityTotal }}</span>
 					<span class="col">已扫箱数：{{ newMaterialList.length }}</span>
 				</view>
 				<view>
-					<view v-if="searchType === 2" class="color2 aciton-box">请扫货物码</view>
+					<view v-if="searchType === 2" class="color2 aciton-box">请扫外箱标签</view>
 					<!-- 扫描操作 -->
 					<view class="pda-search-box">
 						<PdaScanInput @getInfo="handleGetInfo" :type="searchType" :hasFocus="false"></PdaScanInput>
@@ -21,24 +21,39 @@
 			<view class="scroll-view-title">拼箱清单</view>
 			<scroll-view :scroll-y="true" class="scroll-view-height">
 				<view v-for="(item, index) in newMaterialList" :key="index">
-					<materialItem style="background-color: whitesmoke" :index="index" :materialInfo="item" @click.native="handleDeleteItem(item, index)"></materialItem>
+					<materialItem style="background-color: whitesmoke" :index="index" :materialInfo="item"
+						@click.native="handleDeleteItem(item, index)"></materialItem>
 				</view>
 			</scroll-view>
 			<!-- <packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard> -->
 		</view>
 		<!-- 底部按钮 -->
 		<view class="button-box">
-			<u-button style="width: 40%" type="error" @click="clear" :disabled="loading" :loading="loading">清空</u-button>
-			<u-button style="width: 40%" type="primary" @click="handlerSubmit" :disabled="loading" :loading="loading">拼箱</u-button>
+			<u-button style="width: 40%" type="error" @click="clear" :disabled="loading"
+				:loading="loading">清空</u-button>
+			<u-button style="width: 40%" type="primary" @click="handlerSubmit" :disabled="loading"
+				:loading="loading">拼箱</u-button>
 		</view>
 		<!-- 数量选择 -->
-		<u-modal :show="modalShow" showCancelButton title="请输入次箱拼入数量" @confirm="modalConfirm" @cancel="modalCancel">
+		<u-modal :show="modalShow" showCancelButton title="主箱需求数" @confirm="modalConfirm" @cancel="modalCancel">
 			<view class="slot-content">
-				<view>
+				<!-- 				<view>
 					<u--text bold size="36" :text="'拼箱后主箱零件数:' + mainPackageQuantity"></u--text>
+				</view> -->
+				<!-- 				<view>
+					<u--input placeholder="请输入拼入数量" type="number" border="surround" v-model="secondNum" @input="numInput"></u--input>
+				</view> -->
+				<view>
+					<u--text bold size="36" :text="'已扫箱数:' + newMaterialList.length"></u--text>
+					<u--text bold size="36" :text="'已扫零件数:' + quantityTotal"></u--text>
+					<u--text bold size="36" :text="'待拼箱主箱零件数:' + mainPackageQuantity"></u--text>
 				</view>
 				<view>
-					<u--input placeholder="请输入拼入数量" type="number" border="surround" v-model="secondNum" @input="numInput"></u--input>
+					<u--text bold type="primary" size="36" text="请填写拼箱后主箱总零件数:"></u--text>
+					<u--input placeholder="请输入拼箱后主箱总零件数" type="number" border="surround" v-model="mainPackageActionNum"
+						@input="numInput2"></u--input>
+					<u--text size="24" type="error" text="如需要拼箱后零件号结果为48个,则填写数字48."></u--text>
+					<u--text size="24" type="error" text="结果需要大于主箱零件数,小于已扫零件数"></u--text>
 				</view>
 			</view>
 		</u-modal>
@@ -88,7 +103,9 @@ export default {
 				// 1-仓库扫码 2-货物扫码 3-出货单扫码
 				searchType: 2,
 				modalShow: false,
-			secondNum: 0
+				secondNum: 0,
+				// 主箱需求数
+				mainPackageActionNum: 0
 			};
 		},
 		watch: {},
@@ -105,10 +122,11 @@ export default {
 				}
 				return num;
 			},
+			//主箱零件数
 			mainPackageQuantity() {
 				try {
-				if (this.newMaterialList.length === 2) {
-					return this.newMaterialList[0].quantity * 1 + this.secondNum * 1;
+					if (this.newMaterialList.length > 0) {
+						return this.newMaterialList[0].quantity * 1;
 					} else {
 						return 0;
 					}
@@ -171,15 +189,15 @@ export default {
 							}
 						}
 					}
-				if (this.newMaterialList.length > 2) {
-					uni.showModal({
-						title: '提示',
-						content: '只可录入两箱！',
-						showCancel: false,
-						confirmText: '确定'
-					});
-					return;
-				}
+					// if (this.newMaterialList.length > 2) {
+					// 	uni.showModal({
+					// 		title: '提示',
+					// 		content: '只可录入两箱！',
+					// 		showCancel: false,
+					// 		confirmText: '确定'
+					// 	});
+					// 	return;
+					// }
 					const checkData = {
 						originalCode: data.originalCode
 					};
@@ -220,13 +238,18 @@ export default {
 				setTimeout(() => {
 					this.loading = false;
 				}, 30000)
+				// let data = {
+				// 	packageList: this.newMaterialList,
+				// 	createBy: 'admin',
+				// 	secondNum: this.secondNum || 0
+				// };
 				let data = {
 					packageList: this.newMaterialList,
-				createBy: 'admin',
-				secondNum: this.secondNum || 0
+					createBy: 'pda',
+					mainPackageActionNum: this.mainPackageActionNum
 				};
 				uni.$u.throttle(() => {
-				GoodsActionApi.doConsolidationGoods(data).then((res) => {
+					GoodsActionApi.doConsolidationGoods2(data).then((res) => {
 						if (res.code === 200) {
 							uni.showModal({
 								title: '提示',
@@ -240,7 +263,7 @@ export default {
 						} else {
 							uni.showToast({
 								icon: 'error',
-							title: '拼箱失败！'
+								title: res.message
 							});
 							this.modalShow = false;
 							this.loading = false;
@@ -263,18 +286,41 @@ export default {
 					return;
 				}
 			},
+			numInput2(value) {
+				const num = value * 1;
+				const packageList = this.newMaterialList;
+				if (packageList.length < 1) {
+					this.mainPackageActionNum = 0;
+					return;
+				}
+				let minQuantity = packageList[0]?.quantity * 1;
+				let maxQuantity = this.quantityTotal * 1;
+				if (num < minQuantity) {
+					this.$nextTick(() => {
+						this.mainPackageActionNum = minQuantity;
+					})
+					return;
+				}
+				if (num > maxQuantity) {
+					this.$nextTick(() => {
+						this.mainPackageActionNum = maxQuantity;
+					})
+					return;
+				}
+			},
 			// 点击拼箱
 			handlerSubmit() {
 				if (this.newMaterialList.length < 2) {
 					uni.showModal({
 						title: '提示',
-					content: '需要主次两箱才能拼箱！',
+						content: '需要至少两箱才能拼箱！',
 						showCancel: false,
 						confirmText: '确认'
 					});
 					return;
 				}
-			this.secondNum = this.newMaterialList[1].quantity * 1;
+				// this.secondNum = this.newMaterialList[1].quantity * 1;
+				this.mainPackageActionNum = this.quantityTotal * 1;
 				this.modalShow = true;
 			}
 		}
@@ -353,9 +399,11 @@ export default {
 		background-color: rgba(179, 179, 179, 0.7);
 		border-radius: 5px;
 	}
+
 	.scroll-view-height {
 		height: 300px;
 	}
+
 	.scroll-view-last {
 		width: 100%;
 		height: 60px;

pages/materialManagement/AGVRemoteControl/AGVRemoteControl.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box-container">
 		<!-- 功能筛选区 -->
-		<uni-card :is-shadow="false">
+		<uni-card :is-shadow="false" is-full>
 			<uni-forms label-width="100">
 				<!-- 选择小车 -->
 				<uni-forms-item label="AGV小车">