Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java

@@ -76,7 +76,7 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
      * @param location 位置：上半部分还是下半部分
      * @return
      */
-    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String specification ,String pointCode, String location);
+    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize ,String pointCode, String location);
 
     /**
      * 获取没任务的气涨轴缓存位

lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java

@@ -14,7 +14,7 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper<BstIvtShafttubeivt>
 
     List<BstIvtShafttubeivt> getAllShaftPointsByConditions(String type, String location, String have);
 
-    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String specification ,String pointCode, String location);
+    List<BstIvtShafttubeivt> getByQzzSize(String qzzSize ,String pointCode, String location);
 
     /**
      * 获取含有气胀轴的气胀轴暂存位

lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml

@@ -18,9 +18,6 @@
         FROM `bst_ivt_shafttubeivt` bsf
         WHERE bsf.is_used = '1'
           AND bsf.qzz_size = #{qzzSize}
-        <if test="qzzSize != 6">
-            AND bsf.qzz_generation = #{specification}
-        </if>
           AND bsf.point_type = '1'
           AND bsf.point_location = #{location}
           AND bsf.parent_code = #{pointCode}
@@ -53,7 +50,7 @@
           AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code)
             AND 0 = (SELECT COUNT(*) FROM bst_ivt_shafttubeivt bb WHERE bb.have_qzz ='1' AND bb.point_type = '6'
                 <if test="startPoint.qzz_size != 6">
-                    AND b.qzz_generation = #{startPoint.qzz_generation}
+                    AND bb.qzz_generation = #{startPoint.qzz_generation}
                 </if>
             AND bb.qzz_size = #{startPoint.qzz_size} AND bb.point_location = #{startPoint.point_location} AND bb.sort_seq > b.sort_seq)
         ORDER BY b.sort_seq ASC

lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java

@@ -118,8 +118,8 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
     }
 
     @Override
-    public List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String specification ,String pointCode, String location) {
+    public List<BstIvtShafttubeivt> getByQzzSize(String qzzSize ,String pointCode, String location) {
-        return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, specification,pointCode, location);
+        return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize,pointCode, location);
     }
 
     @Override

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java

@@ -234,7 +234,7 @@ public class AutoCallAirShaftTask {
         List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification);
         if (qzzPoint.size() == 0) {
             // 调用ACS滚条气涨轴下来
-            if (!toAcsOutShaft(qzzSize, qzz_generation,location, empty)) {
+            if (!toAcsOutShaft(qzzSize,location, empty)) {
                 log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
                 return;
             }
@@ -250,7 +250,7 @@ public class AutoCallAirShaftTask {
             saveCutPlanMessage(empty, needPlans, qzzSize);
             // 如果不存在，则发起信号滚气涨轴
             // 调用ACS滚条气涨轴下来
-            if (!toAcsOutShaft(qzzSize,qzz_generation, location, empty)) {
+            if (!toAcsOutShaft(qzzSize, location, empty)) {
                 log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
                 return;
             }
@@ -437,9 +437,9 @@ public class AutoCallAirShaftTask {
      * @param location 位置：上半部分还是下半部分
      * @param empty    套拔轴点位
      */
-    private Boolean toAcsOutShaft(String qzzSize, String specification,  String location, BstIvtShafttubeivt empty) {
+    private Boolean toAcsOutShaft(String qzzSize,  String location, BstIvtShafttubeivt empty) {
         // 需要区分上下
-        List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize, specification ,empty.getPoint_code(), location);
+        List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize ,empty.getPoint_code(), location);
         if (shafttubeivts.size() == 0) {
             log.error("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位");
             return false;