回温时间 暴露时间 检查

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

@@ -73,4 +73,12 @@ public interface ScheduleMapper {
     * @version 1.0
     */
     List<SoFinalRollData> getSoFinalRollsByCon(SearchScheduleData inData);
+
+    /**
+    * @description: 获取成品卷的信息
+    * @author LR
+    * @date 2024/6/13 18:10
+    * @version 1.0
+    */
+    SoFinalRollData getSoFinalRollsByRollNo(BaseRollData inData);
 }

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

@@ -113,7 +113,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //查询是否开启了时间空值的校验
         if("Y".equalsIgnoreCase(checkOutStockFlag)){
             //调用存储过程  检查出库的卷是否符合当前的要求
-            Map<String, Object> resultMap = this.checkDieCuttingMaterialRollForOutStockHours(site, rollNo);
+            Map<String, Object> resultMap = this.checkDieCuttingMaterialRollForOutStockHours(site, rmPartNo, rollNo);
             //判断是否继续
             String code = String.valueOf(resultMap.get("result_code"));
             if ("400".equalsIgnoreCase(code)) {
@@ -154,9 +154,10 @@ public class ScheduleServiceImpl implements ScheduleService {
     * @date 2024/6/6 17:54
     * @version 1.0
     */
-    public Map<String, Object> checkDieCuttingMaterialRollForOutStockHours(String site, String rollNo) {
+    public Map<String, Object> checkDieCuttingMaterialRollForOutStockHours(String site, String rmPartNo, String rollNo) {
         List<Object> params = new ArrayList<>();
         params.add(site);
+        params.add(rmPartNo);
         params.add(rollNo);
         //存储过程 调用存储过程  创建分卷
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkDieCuttingMaterialRollForOutStockHours", params);
@@ -349,8 +350,23 @@ public class ScheduleServiceImpl implements ScheduleService {
         String username = inData.getUsername();
         String rollNo = inData.getRollNo();
         String currentTime = DateUtils.getStringNow();
+        //获取当前卷的信息
+        SoFinalRollData finalRoll = scheduleMapper.getSoFinalRollsByRollNo(inData);
+        //判断是否存在
+        if(null == finalRoll){
+            throw new RuntimeException("查无此卷!");
+        }
+        String rmRollNo = finalRoll.getRmRollNo();
+        BaseRollData searchRmRoll = new BaseRollData();
+        //设置查询的参数
+        searchRmRoll.setSite(site);
+        searchRmRoll.setRollNo(rmRollNo);
+        //查询当前材料卷的信息
+        Map<String, Object> resultPart = scheduleMapper.getRmRollData(searchRmRoll);
+        String rmPartNo = String.valueOf(resultPart.get("partNo"));
+
         //首先调用存储过程  检查当前是否可以扫描
-        Map<String, Object> checkMap = this.checkFqcScanFinalRoll(site, orderNo, rollNo);
+        Map<String, Object> checkMap = this.checkFqcScanFinalRoll(site, rmPartNo, rmRollNo, orderNo, rollNo);
         //判断是否继续
         String code = String.valueOf(checkMap.get("result_code"));
         if ("400".equalsIgnoreCase(code)) {
@@ -387,9 +403,11 @@ public class ScheduleServiceImpl implements ScheduleService {
     * @date 2024/6/8 17:09
     * @version 1.0
     */
-    public Map<String, Object> checkFqcScanFinalRoll(String site, String orderNo, String rollNo) {
+    public Map<String, Object> checkFqcScanFinalRoll(String site,  String rmPartNo,  String rmRollNo, String orderNo, String rollNo) {
         List<Object> params = new ArrayList<>();
         params.add(site);
+        params.add(rmPartNo);
+        params.add(rmRollNo);
         params.add(orderNo);
         params.add(rollNo);
         //存储过程 调用存储过程  创建分卷

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

@@ -127,7 +127,7 @@
         FROM InventoryStock_Roll WHERE Site = #{site} AND RollNo = #{rollNo} AND QtyOnHand > 0
     </select>
 
-    <!--获取最终卷的数据-->
+    <!--获取成品卷的列表-->
     <select id="getSoFinalRollsByCon" parameterType="SearchScheduleData" resultType="SoFinalRollData">
         SELECT id, site, order_no, part_no, seq_no, final_roll_no, fqc_by,
         roll_qty, status_code, status, created_by, created_date, label_date, fqc_date,
@@ -142,4 +142,13 @@
         </if>
     </select>
 
+    <!--获取成品卷的信息-->
+    <select id="getSoFinalRollsByRollNo" parameterType="BaseRollData" resultType="SoFinalRollData">
+        SELECT id, site, order_no, part_no, seq_no, final_roll_no, fqc_by,
+        roll_qty, status_code, status, created_by, created_date, label_date, fqc_date,
+        rm_roll_no, manufacture_date
+        FROM so_final_roll
+        WHERE site = #{site} AND order_no = #{orderNo}  AND final_roll_no = #{rollNo}
+    </select>
+
 </mapper>