pda签名；

mhd_oms/src/main/java/com/mhd/oms/domain/electronicSignature/service/ElectronicSignatureDomainService.java

@@ -2,6 +2,7 @@ package com.mhd.oms.domain.electronicSignature.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mhd.oms.domain.electronicSignature.entity.ElectronicSignature;
 import com.mhd.oms.domain.electronicSignature.entity.ElectronicSignatureMaterialDetail;
 import com.mhd.oms.domain.electronicSignature.repository.facade.IElectronicSignatureMaterialDetailService;
@@ -97,7 +98,9 @@ public class ElectronicSignatureDomainService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean inQqcode(ElectronicSignatureDO electronicSignatureDO) {
         Long orderId = electronicSignatureDO.getOrderId();
-        ElectronicSignature existing = electronicSignatureService.getById(orderId);
+        ElectronicSignature existing = electronicSignatureService.getOne(new LambdaQueryWrapper<ElectronicSignature>()
+                .eq(ElectronicSignature::getOrderId, orderId)
+                .eq(ElectronicSignature::getDelFlag, 1), false);
         if (existing != null) {
             existing.setSignatureTime(new Date()); // 设置签名时间
             existing.setSignatureStatus(2); // 设置签名状态为已签名
@@ -111,7 +114,9 @@ public class ElectronicSignatureDomainService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean outQqcode(ElectronicSignatureDO electronicSignatureDO) {
         Long orderId = electronicSignatureDO.getOrderId();
-        ElectronicSignature existing = electronicSignatureService.getById(orderId);
+        ElectronicSignature existing = electronicSignatureService.getOne(new LambdaQueryWrapper<ElectronicSignature>()
+                .eq(ElectronicSignature::getOrderId, orderId)
+                .eq(ElectronicSignature::getDelFlag, 1), false);
         if (existing != null) {
             existing.setSignatureTime(new Date()); // 设置签名时间
             existing.setSignatureStatus(2); // 设置签名状态为已签名
@@ -129,6 +134,15 @@ public class ElectronicSignatureDomainService {
         return electronicSignatureMapper.selectSignatureList(queryDTO);
     }
 
+    /**
+     * 根据订单编号查询电子签名列表
+     */
+    public List<ElectronicSignature> getByOrderNumber(ElectronicSignatureQueryDTO queryDTO) {
+        return electronicSignatureMapper.selectList(new LambdaQueryWrapper<ElectronicSignature>()
+                .eq(ElectronicSignature::getOrderNumber, queryDTO.getOrderNumber())
+                .eq(ElectronicSignature::getDelFlag, 1));
+    }
+
     /**
      * 根据签名ID查询
      */

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/electronicSignature/ElectronicSignatureApi.java

@@ -100,6 +100,16 @@ public class ElectronicSignatureApi extends BaseController {
         return getDataTable(voList);
     }
 
+    /**
+     * 根据订单编号查询电子签名列表
+     */
+    @ApiOperation("根据订单编号查询电子签名列表")
+    @GetMapping("/getByOrderNumber")
+    public AjaxResult getByOrderNumber(ElectronicSignatureQueryDTO queryDTO) {
+        List<ElectronicSignature> list = electronicSignatureDomainService.getByOrderNumber(queryDTO);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 查询签名详情（含物料明细）
      */