rev:查询冷却区点位

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java

@@ -179,7 +179,7 @@ public class BakingServiceImpl implements BakingService {
                  */
 
                 // 1.根据冷却区此母卷的点位找到对应的暂存区、找到空位
-                JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code1 + "' and is_used = '1'").uniqueResult(0);
+                JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code1 + "' and is_used = '1' AND point_type = '1'").uniqueResult(0);
                 if (ObjectUtil.isEmpty(jsonCoolIvt)) {
                     throw new BadRequestException("请扫描正确的冷却区或对接点位！");
                 }

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql

@@ -152,6 +152,7 @@
                 AND full_point_status = '01'
                 AND empty_point_status = '01'
                 AND is_used = '1'
+                AND point_type = '1'
 
                 AND NOT EXISTS (
                    SELECT

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql

@@ -56,6 +56,8 @@
                 ivt.full_point_status = '01'
             AND
                 ivt.is_used = '1'
+            AND
+                point_type = '1'
 
                 AND NOT EXISTS (
                    SELECT
@@ -90,6 +92,8 @@
             	ST_IVT_CoolPointIvt ivt
             WHERE
                 ivt.full_point_status = '01'
+            AND
+                point_type = '1'
             AND
                 ivt.is_used = '1'
             AND NOT EXISTS (

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java

@@ -67,7 +67,7 @@ public class CoolInServiceImpl implements CoolInService {
         String is_bake = whereJson.getString("is_bake"); // 是否烘烤完成
 
         // 查询终点在冷却区是否存在
-        JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '01' and empty_point_status = '01' and is_used = '1'").uniqueResult(0);
+        JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '01' and empty_point_status = '01' and is_used = '1' AND point_type = '1'").uniqueResult(0);
         if (ObjectUtil.isEmpty(jsonCoolIvt)) {
             throw new BadRequestException("冷却区不存在该满轴点位或空轴、满轴点位上有货！");
         }

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java

@@ -55,7 +55,7 @@ public class CoolOutServiceImpl
         String point_code = whereJson.getString("point_code"); // 出库点位
 
         // 查询终点在冷却区是否存在
-        JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1'").uniqueResult(0);
+        JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1' AND point_type = '1' ").uniqueResult(0);
         if (ObjectUtil.isEmpty(jsonCoolIvt)) {
             throw new BadRequestException("点位：" + point_code + "不符，请扫描冷却区满轴点位！");
         }