From a7ea6324ca81532aa7c6bac15a22d46277f97016 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Thu, 8 Jan 2026 10:29:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9C=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RuoYi-App-master/pages/in/bindMany.vue        |   4 +-
 RuoYi-App-master/pages/in/ktpin.vue           |  26 +++--
 .../pages/out/ckMakeSureByTray.vue            |  28 ++++-
 RuoYi-App-master/pages/out/ktpout.vue         |   1 +
 RuoYi-App-master/pages/pandian/confirm.vue    | 108 +++++++-----------
 .../service/impl/MydoJobServiceImpl.java      |   3 +-
 .../bas/cargoSpace/BasCargoSpaceMapper.xml    |   3 +-
 .../resources/mapper/stock/BasStockMapper.xml |   2 +-
 8 files changed, 89 insertions(+), 86 deletions(-)

diff --git a/RuoYi-App-master/pages/in/bindMany.vue b/RuoYi-App-master/pages/in/bindMany.vue
index 9db589e..062800b 100644
--- a/RuoYi-App-master/pages/in/bindMany.vue
+++ b/RuoYi-App-master/pages/in/bindMany.vue
@@ -90,8 +90,8 @@ export default {
       isConfirming: false,
       selectedEntrance: '',
       warehouseOptions:[
-        { value: '01', text: '仓库1' },
-        { value: '02', text: '仓库2' }
+        { value: '01', text: '三联' },
+        { value: '02', text: '二联' }
       ],
       selectedWarehouseId:""
     }
diff --git a/RuoYi-App-master/pages/in/ktpin.vue b/RuoYi-App-master/pages/in/ktpin.vue
index 5d23a11..2a7d2db 100644
--- a/RuoYi-App-master/pages/in/ktpin.vue
+++ b/RuoYi-App-master/pages/in/ktpin.vue
@@ -1,5 +1,15 @@
 <template>
 	<view class="container">
+		<view class="input-group">
+			<text class="input-label">仓库</text>
+			<uni-data-select
+				v-model="formData.warehouseId"
+				:localdata="warehouseList"
+				:clear="false"
+				placeholder="请选择仓库"
+		
+			/>
+		</view>
 		<view class="input-group">
 			<text class="input-label">托盘条码：</text>
 			<uni-easyinput
@@ -16,16 +26,7 @@
 				</template>
 			</uni-easyinput>
 		</view>
-	<!-- 	<view class="input-group">
-			<text class="input-label">仓库</text>
-			<uni-data-select
-				v-model="formData.warehouseId"
-				:localdata="warehouseList"
-				:clear="false"
-				placeholder="请选择仓库"
-
-			/>
-		</view> -->
+		
 		<view class="button-group">
 			<button class="submit-button" @click="handleSubmit">空托盘入库</button>
 		</view>
@@ -57,7 +58,7 @@ import { getBasWarehouList,getCargoSpaceList } from '@/api/bas/bas.js'
 			}, 100)
 			
 			// 获取仓库列表
-			// this.getWarehouseList()
+			this.getWarehouseList()
 		},
 		methods: {
 			// 获取仓库列表
@@ -65,7 +66,8 @@ import { getBasWarehouList,getCargoSpaceList } from '@/api/bas/bas.js'
 				try {
 					const response = await getBasWarehouList({
 						pageNum:1,
-						pageSize:100
+						pageSize:100,
+						warehouseType:1
 					
 					})
 					if (response.code === 200) {
diff --git a/RuoYi-App-master/pages/out/ckMakeSureByTray.vue b/RuoYi-App-master/pages/out/ckMakeSureByTray.vue
index 94108e2..0052672 100644
--- a/RuoYi-App-master/pages/out/ckMakeSureByTray.vue
+++ b/RuoYi-App-master/pages/out/ckMakeSureByTray.vue
@@ -1,5 +1,15 @@
 <template>
 	<view class="container">
+		<view class="input-group">
+		  <text class="input-label">仓库选择</text>
+		  <uni-data-select
+		      v-model="warehouseId"
+		      :localdata="warehouseOptions"
+		      placeholder="请选择仓库"
+		
+		      class="select-input"
+		  />
+		</view>
 		<view class="input-group">
 			<uni-easyinput
 				v-model="trayCode"
@@ -68,8 +78,13 @@
 		data() {
 			return {
 				trayCode: '',
+				warehouseId:null,
 				materialList: [],
-				loading: false
+				loading: false,
+				warehouseOptions:[
+				  { value: '01', text: '三联' },
+				  { value: '02', text: '二联' }
+				],
 			}
 		},
 		methods: {
@@ -123,6 +138,13 @@
 					})
 					return
 				}
+				if (!this.warehouseId) {
+					uni.showToast({
+						title: '请选择仓库',
+						icon: 'none'
+					})
+					return
+				}
 				
 				if (this.materialList.length === 0) {
 					uni.showToast({
@@ -134,7 +156,8 @@
 				
 				try {
 					const response=await ckMakeSure({
-						trayCode: this.trayCode
+						trayCode: this.trayCode,
+						warehouseId: this.warehouseId
 					  
 					})
                     if (response.code==200) {
@@ -145,6 +168,7 @@
 						// 清空数据
 						this.trayCode = ''
                         this.materialList = []
+						this.warehouseId = null
 					}else{
                         uni.showToast({
 						title: response.msg,
diff --git a/RuoYi-App-master/pages/out/ktpout.vue b/RuoYi-App-master/pages/out/ktpout.vue
index cd6d465..bd60f78 100644
--- a/RuoYi-App-master/pages/out/ktpout.vue
+++ b/RuoYi-App-master/pages/out/ktpout.vue
@@ -56,6 +56,7 @@ export default {
 				const res = await getBasWarehouList({
 					   pageNum:1,
 						pageSize:100,
+						warehouseType:1
 						// typeData:['1','2']
 				})
 				if (res.code === 200) {
diff --git a/RuoYi-App-master/pages/pandian/confirm.vue b/RuoYi-App-master/pages/pandian/confirm.vue
index 1267fdd..e369b26 100644
--- a/RuoYi-App-master/pages/pandian/confirm.vue
+++ b/RuoYi-App-master/pages/pandian/confirm.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="container">
-		<!-- 出口选择框 -->
-<!-- 		<view class="input-group">
-			<text class="input-label">选择出口</text>
+		<view class="input-group">
+			<text class="input-label">仓库</text>
 			<uni-data-select
-				v-model="selectedExit"
-				:localdata="exitOptions"
-				placeholder="请选择出口"
-				class="select-input">
-			</uni-data-select>
-		</view> -->
+				v-model="warehouseId"
+				:localdata="warehouseList"
+				:clear="false"
+				placeholder="请选择仓库"
+		
+			/>
+		</view>
 		
 		<view class="input-group">
 			<view class="input-label">托盘条码：</view>
@@ -76,67 +76,36 @@
 							<uni-easyinput v-model="newMaterial.inQuantity" type="number" placeholder="请输入数量" />
 						</view>
 					</view>
-					<view class="form-row">
-						<view class="form-col">
-							<text class="form-label">台次</text>
-							<uni-easyinput v-model="newMaterial.spare5" placeholder="请输入台次" />
-						</view>
-						<view class="form-col">
-							<text class="form-label">件次</text>
-							<uni-easyinput v-model="newMaterial.spare7" placeholder="请输入件次" />
-						</view>
-					</view>
 					<view class="form-row">
 						<view class="form-col">
 							<text class="form-label">合同号</text>
 							<uni-easyinput v-model="newMaterial.spare6" placeholder="请输入合同号" />
 						</view>
 						<view class="form-col">
-							<text class="form-label">管理号</text>
-							<uni-easyinput v-model="newMaterial.spare9" placeholder="请输入管理号" />
+							<text class="form-label">产品号</text>
+							<uni-easyinput v-model="newMaterial.spare7" placeholder="请输入产品号" />
+						</view>
+						
+						
+					</view>
+					<view class="form-row">
+						<view class="form-col">
+							<text class="form-label">代号</text>
+							<uni-easyinput v-model="newMaterial.spare9" placeholder="请输入代号" />
+						</view>
+						<view class="form-col">
+							<text class="form-label">台次</text>
+							<uni-easyinput v-model="newMaterial.spare5" placeholder="请输入台次" />
 						</view>
 					</view>
 					<view class="form-row">
 						<view class="form-col">
-							<text class="form-label">质量等级</text>
-							<uni-data-select :localdata="productStatus" v-model="newMaterial.spare8" placeholder="请选择质量等级"></uni-data-select>
-						</view>
-						<view class="form-col">
-							<text class="form-label">批次</text>
-							<uni-easyinput v-model="newMaterial.lotNo" placeholder="请输入批次" />
-						</view>
-					</view>
-					<!-- 可选扩展项（暂不显示） -->
-					<view class="form-row">
-						<view class="form-col">
-							<text class="form-label">状态</text>
-							<uni-data-select :localdata="turnover_type" v-model="newMaterial.spare2" placeholder="请选择状态"></uni-data-select>
-						</view>
-						<view class="form-col">
-							<text class="form-label">套账</text>
-							<uni-data-select :localdata="account_type" v-model="newMaterial.spare3" placeholder="请选择套账"></uni-data-select>
-						</view>
-					</view>
-					<view class="form-row">
-						<view class="form-col">
-							<text class="form-label">来源</text>
-							<uni-data-select :localdata="origin_type" v-model="newMaterial.spare1" placeholder="请选择来源"></uni-data-select>
-						</view>
-						<view class="form-col">
-							<text class="form-label">用途</text>
-							<uni-data-select :localdata="purpose_type" v-model="newMaterial.spare4" placeholder="请选择用途"></uni-data-select>
-						</view>
-					</view>
-					<view class="form-row">
-						<view class="form-col">
-							<text class="form-label">供应商</text>
-							<uni-easyinput v-model="newMaterial.supplierId" placeholder="请输入供应商"/>
-						</view>
-						<view class="form-col">
-							<text class="form-label">单价</text>
-							<uni-easyinput  v-model="newMaterial.printDate" placeholder="请输入单价"/>
+							<text class="form-label">规格</text>
+							<uni-easyinput v-model="newMaterial.spec" placeholder="请输入规格" />
 						</view>
+						
 					</view>
+					
 				</view>
 				<view class="popup-buttons">
 					<button class="cancel-btn" @click="hideAddMaterialPopup">取消</button>
@@ -188,7 +157,12 @@
 					{ value:'2',text:'军用'}
 				],
 				trayCode: '',
+				warehouseId:null,
 				materialList: [],
+				warehouseList: [
+					{ value: '01', text: '三联' },
+					{ value: '02', text: '二联' }
+				],
 				newMaterial: {
 					productId: '',
 					inQuantity: '',
@@ -316,18 +290,19 @@
 			},
 			// 确认盘点
 			async handleConfirm() {
-				// 验证出口选择
-				// if (!this.selectedExit) {
-				// 	uni.showToast({
-				// 		title: '请选择出口',
-				// 		icon: 'none'
-				// 	})
-				// 	return
-				// }
+				// 验证仓库选择
+				if (!this.warehouseId) {
+					uni.showToast({
+						title: '请选择仓库',
+						icon: 'none'
+					})
+					return
+				}
 				
           try {
             const data = {
               trayCode: this.trayCode,
+			  warehouseId: this.warehouseId,
               // exitId: this.selectedExit,
               materials: this.materialList.map(item => ({
                 stockId: item.stockId,
@@ -358,6 +333,7 @@
 					this.trayCode = ''
 					this.materialList = []
 					this.selectedExit = ''
+					this.warehouseId=null
 					}
 					
 					
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 981d69c..a41bdea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -302,6 +302,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 basCargoSpace.setStatus("2");
                 basCargoSpace.setTrayCode(mydoJob.getTrayCode());
                 basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId());
+                basCargoSpace.setTheType(mydoJob.getLineId());
                 basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
 
                 //插入库存信息
@@ -429,7 +430,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
         stock.setDistribution(mydoJobDetail.getSpare9());
         stock.setModel(mydoJobDetail.getUnit());
         stock.setOrderId(mydoJobDetail.getSpare6());
-        stock.setNetWeight(mydoJob.getLineId());
+        //stock.setNetWeight(mydoJob.getLineId());
         return stock;
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index 0e76d6f..96d5bfd 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -219,9 +219,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
     </select>
     <select id="selectPlatByWeight" resultType="java.lang.Double">
-        select sum(CAST(ISNULL(bs.net_weight, 0) AS FLOAT))
+        select sum(CAST(ISNULL(bcs.the_type, 0) AS FLOAT))
         from bas_cargo_space bcs
-                 LEFT join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
         where bcs.warehouse_id = #{warehouseId}
         and bcs.roadway_id = #{roadwayId}
         and bcs.the_platoon = #{thePlatoon}
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
index 77cfa4a..05ff1eb 100644
--- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bs.spare4,  --来源
                bs.spare1, --用途
                bs.distribution, --用途
-               bs.net_weight --重量
+               bcs.the_type as net_weight --重量
         from bas_stock bs
                  left join bas_product bp on bs.product_id = bp.product_id
                  left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id