fix: 窑口

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -777,10 +777,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         processTracking.setProcess_location(baseRequest.getDevice_code());
         processTracking.setRecord_time(DateUtil.now());
         processTrackingService.create(processTracking);
-        // update: 点位解锁
+        // delete: 点位解锁
-        SchBasePoint paramobj = new SchBasePoint();
-        paramobj.setIng_task_code("");
-        pointService.update(paramobj, new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, basePoint.getPoint_code()));
         return ApplyTaskResponse.responseOk(baseRequest.getRequestNo(), "扫码成功申请");
     }
 
@@ -983,7 +980,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 PointUtils.setUpdateByAcs(schBasePoint);
                 pointService.updateById(schBasePoint);
                 // hint: 特殊处理
-//                specialOperation(schBasePoint);
+                specialOperation(schBasePoint);
                 log.info("点位" + schBasePoint.getPoint_code() + "更新之后：{}", schBasePoint);
             }
         } finally {
@@ -1008,7 +1005,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             PointUtils.setUpdateByAcs(endPointObj);
             pointService.update(endPointObj, new LambdaQueryWrapper<SchBasePoint>()
                     .eq(SchBasePoint::getPoint_code, "RYK01"));
-            log.info("入窑口02引发入窑口01点位更新解锁！");
+            log.info("入窑口02引发入窑口01点位更新解锁！时间：{}", DateUtil.now());
         }
     }
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/mapper/HCSSXMapper.xml

@@ -7,8 +7,12 @@
             p.*
         FROM
             `sch_base_point` p
+        LEFT JOIN sch_base_point p2 ON p2.point_code = p.parent_point_code
         WHERE p.point_type = '1'
+        AND p.point_status = '1'
         AND p.is_used = true
+        AND p2.point_status = '1'
+        AND p2.is_used = true
         AND (p.ing_task_code = '' OR p.ing_task_code IS NULL)
         AND 0 = (SELECT COUNT(*) FROM sch_base_task WHERE point_code2 = p.point_code AND task_status <![CDATA[<]]> '5')
         AND p.region_code IN