From a54e0e447bcc52e2e0b0605dc039848b55ae5a81 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Thu, 8 Aug 2024 18:19:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9EB1=E5=88=86=E5=88=87?=
 =?UTF-8?q?=E4=B8=8A=E6=96=99=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
index b2fca0f22..333e59c3a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
@@ -289,7 +289,7 @@ public class FeedingServiceImpl implements FeedingService {
             throw new BadRequestException("该点位上不存在母卷！");
         }
 
-        if (cool_jo.getString("product_area").equals("B1")) {
+        if (cool_jo.getString("product_area").equals("B1") && cool_jo.getString("point_type").equals("3")) {
             if (ObjectUtil.isNotEmpty(cool_jo) && cool_jo.getString("point_type").equals("4")) {
                 JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("full_point_code = '" + next_point_code + "'").uniqueResult(0);
                 //起点为分切缓存位，终点为分切机
@@ -425,8 +425,8 @@ public class FeedingServiceImpl implements FeedingService {
                 }
             }
 
-            AbstractAcsTask task = new CoolCutTask();
-            String task_id = task.createTask(jo);
+            CoolCutTask coolCutTask = SpringContextHolder.getBean(CoolCutTask.class);
+            String task_id = coolCutTask.createTask(jo);
 
             //查询该母卷号对应的生箔信息
             JSONObject raw_jo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder").query("container_name = '" + cool_jo.getString("container_name") + "'").uniqueResult(0);