update

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDeviceDeliveryMapper.java

@@ -93,7 +93,7 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
      * @return 查询结果
      */
     List<DeviceSignResult> listDeviceSign(@Param("crmNo") String crmNo,
-            @Param("statusList") List<DeviceDeliveryStatusEnum> statusList);
+            @Param("statusList") List<DeviceDeliveryStatusEnum> statusList, @Param("deliveryType") InOutTypeEnum deliveryType);
 
     /**
      * 设备去处列表

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -733,7 +733,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
     @Override
     public List<DeviceSignResult> signList(String crmNo) {
-        return baseMapper.listDeviceSign(crmNo, Arrays.asList(DeviceDeliveryStatusEnum.DELIVER, DeviceDeliveryStatusEnum.USING));
+        return baseMapper.listDeviceSign(crmNo, Arrays.asList(DeviceDeliveryStatusEnum.DELIVER, DeviceDeliveryStatusEnum.USING), InOutTypeEnum.OUT);
     }
 
     @Override

sop-business/src/main/resources/mapper/TBDeviceDeliveryMapper.xml

@@ -208,6 +208,7 @@
             d.serial_no = se.serial_no
           AND d.supplier_id = sp.id
           AND d.crm_no = #{crmNo}
+          AND d.delivery_type = #{deliveryType}
           AND d.status in
         <foreach collection="statusList" item="status" open="(" separator="," close=")">
             #{status}