From 95dcfd10db15b0f7694b4502850f9a6383c850cd Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 19 Jul 2024 15:36:21 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-19=20=E8=AE=BE=E5=A4=87-=E7=BB=84?=
 =?UTF-8?q?=E7=BA=BF=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=82=B9=E6=A3=80?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/service/impl/DeviceTaskServiceImpl.java    | 9 ++++++---
 .../src/main/resources/mapper/device/EquOrderMapper.xml  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
index b64a48077..eb415717b 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.context.SecurityContextHolder;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
+import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.security.utils.SecurityUtils;
@@ -340,9 +341,11 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
             order.setOutsourceCode("BW" + orderCode);
         }
 
-        //查询组线
-        String lineName = equOrderMapper.getGroupLine(plan.getEquipmentCode());
-        order.setPlanProdLine(lineName);
+        if(StringUtils.isNotEmpty(plan.getEquipmentCode())){
+            //查询组线
+            String lineName = equOrderMapper.getGroupLine(plan.getEquipmentCode());
+            order.setPlanProdLine(lineName);
+        }
 
         /**equ_order**/
         sce = equOrderMapper.insertEquOrder(order);
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index d20a4aaf3..27598cf64 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -518,7 +518,7 @@
 
     <!--  获取组线信息 -->
     <select id="getGroupLine" parameterType="java.lang.String" resultType="java.lang.String">
-		select equipment_name
+		select TOP 1 equipment_name
 		from equ_bind_auxiliary_equipment
 		where auxiliary_equipment_code  = #{auxiliaryEquipmentCode}
 	    and del_flag = '0'