From ee965a71fd0a44128ad24d5bba7117245a122eb2 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 20 Oct 2025 16:38:43 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-20=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E5=9B=BA=E5=AE=9A=E8=BD=BD=E5=85=B7=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScheduleController.java        | 29 +++++++++++++++
 .../schedule/mapper/ScheduleMapper.java       | 13 +++++++
 .../schedule/service/ScheduleService.java     | 10 ++++++
 .../service/impl/ScheduleServiceImpl.java     | 22 ++++++++++++
 .../mapper/schedule/ScheduleMapper.xml        | 36 +++++++++++++++++++
 5 files changed, 110 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
index ba80efc..9e7fc06 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -1964,4 +1964,33 @@ public class ScheduleController extends AbstractController {
         scheduleService.deleteSfdcMaterialHist(inData);
         return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
     }
+
+    /**
+     * @description: 获取固定载具列表
+     * @param params 请求参数，包含site、carrierNo、carrierTypeName、specification
+     * @return: com.gaotao.common.utils.R
+     */
+    @PostMapping("getFixedCarrierList")
+    public R getFixedCarrierList(@RequestBody Map<String, Object> params) {
+        try {
+            String site = (String) params.get("site");
+            String carrierNo = (String) params.get("carrierNo");
+            String carrierTypeName = (String) params.get("carrierTypeName");
+            String specification = (String) params.get("specification");
+            
+            // 参数校验
+            if (site == null || site.isEmpty()) {
+                return R.error("站点不能为空");
+            }
+            
+            List<Map<String, Object>> carrierList = scheduleService.getFixedCarrierList(site, carrierNo, carrierTypeName, specification);
+            return R.ok()
+                    .put("code", 0)
+                    .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
+                    .put("data", carrierList);
+        } catch (Exception e) {
+            logger.error("获取固定载具列表失败", e);
+            return R.error("获取固定载具列表失败: " + e.getMessage());
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
index b638af1..9161d29 100644
--- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
+++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
@@ -711,4 +711,17 @@ public interface ScheduleMapper {
      */
     List<Map<String, String>> deleteSfdcMaterialHist(SFDCMaterialHistOutData inData);
 
+    /**
+     * @description: 获取固定载具列表
+     * @param site 站点
+     * @param carrierNo 标签条码（模糊查询）
+     * @param carrierTypeName 载具类型名称（模糊查询）
+     * @param specification 规格描述（模糊查询）
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     */
+    List<Map<String, Object>> getFixedCarrierList(@Param("site") String site,
+                                                   @Param("carrierNo") String carrierNo,
+                                                   @Param("carrierTypeName") String carrierTypeName,
+                                                   @Param("specification") String specification);
+
 }
diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
index 92cc81c..ea76952 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
@@ -1218,4 +1218,14 @@ public interface ScheduleService {
      */
     void deleteSfdcMaterialHist(SFDCMaterialHistOutData inData);
 
+    /**
+     * @description: 获取固定载具列表
+     * @param site 站点
+     * @param carrierNo 标签条码（模糊查询）
+     * @param carrierTypeName 载具类型名称（模糊查询）
+     * @param specification 规格描述（模糊查询）
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     */
+    List<Map<String, Object>> getFixedCarrierList(String site, String carrierNo, String carrierTypeName, String specification);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 7f85305..353932b 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -7,6 +7,7 @@ import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.DateUtil;
 import com.gaotao.common.utils.DateUtils;
 import com.gaotao.common.utils.R;
+import com.gaotao.modules.inboundNotification.service.impl.InboundNotificationServiceImpl;
 import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
 import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
@@ -21,6 +22,8 @@ import com.gaotao.modules.schedule.service.ScheduleService;
 import com.gaotao.modules.schedule.service.SchedulingService;
 import com.gaotao.modules.shopOrder.entity.OperatorData;
 import com.gaotao.modules.sys.service.SysMsgService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +42,8 @@ import java.util.*;
  */
 @Service
 public class ScheduleServiceImpl implements ScheduleService {
+
+    private static final Logger logger = LoggerFactory.getLogger(InboundNotificationServiceImpl.class);
     @Autowired
     private ScheduleMapper scheduleMapper;
     @Autowired
@@ -5423,4 +5428,21 @@ public class ScheduleServiceImpl implements ScheduleService {
             }
         }
     }
+
+    @Override
+    public List<Map<String, Object>> getFixedCarrierList(String site, String carrierNo, String carrierTypeName, String specification) {
+        logger.info("获取固定载具列表，站点: {}, 标签条码: {}, 载具类型名称: {}, 规格描述: {}", 
+                   site, carrierNo, carrierTypeName, specification);
+        try {
+            List<Map<String, Object>> carrierList = scheduleMapper.getFixedCarrierList(site, carrierNo, carrierTypeName, specification);
+            if (carrierList == null) {
+                carrierList = new ArrayList<>();
+            }
+            logger.info("获取固定载具列表成功，站点: {}, 记录数: {}", site, carrierList.size());
+            return carrierList;
+        } catch (Exception e) {
+            logger.error("获取固定载具列表失败，站点: {}, 错误信息: {}", site, e.getMessage(), e);
+            throw new RuntimeException("获取固定载具列表失败: " + e.getMessage(), e);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index ea9da92..dfb32ad 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -1866,4 +1866,40 @@
     <select id="deleteSfdcMaterialHist" resultType="java.util.Map">
         exec dbo.RemoveSfdcMaterialHist #{site},#{orderNo},#{itemNo},#{seqNo},#{rollNo},#{histSeqNo},#{histType}
     </select>
+
+    <!-- 获取固定载具列表 -->
+    <select id="getFixedCarrierList" resultType="map">
+        SELECT
+            site,
+            bu_no AS buNo,
+            carrier_no AS carrierNo,
+            carrier_type_code AS carrierTypeCode,
+            carrier_type_name AS carrierTypeName,
+            specification,
+            asset_no AS assetNo,
+            dimensions,
+            max_weight AS maxWeight,
+            expected_life_cycles AS expectedLifeCycles,
+            expected_life_days AS expectedLifeDays,
+            status,
+            current_location AS currentLocation,
+            last_used_time AS lastUsedTime,
+            total_usage_count AS totalUsageCount,
+            purchase_date AS purchaseDate,
+            create_by AS createBy,
+            create_date AS createDate,
+            remark
+        FROM fixed_carrier
+        WHERE site = #{site}
+        <if test="carrierNo != null and carrierNo != ''">
+            AND carrier_no LIKE '%' + #{carrierNo} + '%'
+        </if>
+        <if test="carrierTypeName != null and carrierTypeName != ''">
+            AND carrier_type_name LIKE '%' + #{carrierTypeName} + '%'
+        </if>
+        <if test="specification != null and specification != ''">
+            AND specification LIKE '%' + #{specification} + '%'
+        </if>
+        ORDER BY carrier_no
+    </select>
 </mapper>
\ No newline at end of file