2026-04-13

过站采集-》机台工作台-》材料清单列表增加行操作【领料记录】

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -2149,6 +2149,42 @@ public class ScheduleController extends AbstractController {
         }
     }
 
+    /**
+     * @description: 获取领料记录
+     * @param params 请求参数，包含site、orderNo、partNo
+     * @return: com.gaotao.common.utils.R
+     */
+    @PostMapping("getMaterialRecordList")
+    public R getMaterialRecordList(@RequestBody Map<String, Object> params) {
+        try {
+            String site = (String) params.get("site");
+            String orderNo = (String) params.get("orderNo");
+            String partNo = (String) params.get("partNo");
+            
+            if (site == null || site.isEmpty()) {
+                return R.error("站点不能为空").put("code", 400);
+            }
+            if (orderNo == null || orderNo.isEmpty()) {
+                return R.error("工单号不能为空").put("code", 400);
+            }
+            if (partNo == null || partNo.isEmpty()) {
+                return R.error("物料编码不能为空").put("code", 400);
+            }
+            
+            List<Map<String, Object>> resultList = scheduleService.getMaterialRecordList(site, orderNo, partNo);
+            return R.ok()
+                    .put("code", 0)
+                    .put("msg", "success")
+                    .put("rows", resultList)
+                    .put("total", resultList.size());
+        } catch (Exception e) {
+            logger.error("获取领料记录失败", e);
+            return R.error("获取领料记录失败: " + e.getMessage())
+                    .put("code", 400)
+                    .put("message", "获取领料记录失败: " + e.getMessage());
+        }
+    }
+
     /**
      * @description: 打开材料卷（重新激活已完成的材料）
      * @param params 请求参数，包含site、seqNo、rollNo、histSeqNo、type、userId

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -783,6 +783,15 @@ public interface ScheduleMapper {
      */
     Float getNewRollQtyByScan(@Param("site") String site, @Param("rollNo") String rollNo);
 
+    /**
+     * 获取领料记录
+     * @param site 站点
+     * @param orderNo 工单号
+     * @param partNo 物料编码
+     * @return 领料记录列表
+     */
+    List<Map<String, Object>> getMaterialRecordList(@Param("site") String site, @Param("orderNo") String orderNo, @Param("partNo") String partNo);
+
     /**
      * 调用存储过程 sfdcRollsOpsReportExecute
      * 用于打开材料卷

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -1296,6 +1296,15 @@ public interface ScheduleService {
      */
     void updateFixedCarrierBatch(List<Map<String, Object>> list);
 
+    /**
+     * 获取领料记录
+     * @param site 站点
+     * @param orderNo 工单号
+     * @param partNo 物料编码
+     * @return 领料记录列表
+     */
+    List<Map<String, Object>> getMaterialRecordList(String site, String orderNo, String partNo);
+
     /**
      * @description: 打开材料卷（重新激活已完成的材料）
      * @param site 站点

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -5697,6 +5697,11 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
     }
 
+    @Override
+    public List<Map<String, Object>> getMaterialRecordList(String site, String orderNo, String partNo) {
+        return scheduleMapper.getMaterialRecordList(site, orderNo, partNo);
+    }
+
     /**
      * @description: 打开材料卷（重新激活已完成的材料）
      * 调用存储过程 sfdcRollsOpsReportExecute

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -2059,6 +2059,24 @@
           AND RollNo = #{rollNo}
     </select>
 
+    <!-- 获取领料记录 -->
+    <select id="getMaterialRecordList" resultType="java.util.Map">
+        select  
+            site,
+            bu_no as buNo,
+            transaction_id as transactionId,
+            document_type as documentType,
+            document_no as documentNo,
+            roll_no as rollNo,
+            roll_qty as rollQty,
+            batch_no as batchNo,
+            transaction_by as transactionBy,
+            transaction_date as transactionDate
+        from  StockTransactionLog A WITH(NOLOCK) 
+        where  A.site = #{site}  and A.order_no = #{orderNo}  AND part_no = #{partNo} and document_type in ('生产领料','生产退仓')
+        Order  by id 
+    </select>
+
     <!-- 调用存储过程 sfdcRollsOpsReportExecute 用于打开材料卷 -->
     <select id="callSfdcRollsOpsReportExecute" resultType="java.util.Map" statementType="CALLABLE">
         exec sfdcRollsOpsReportExecute