Merge branch 'feature/bug-815' into develop

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java

@@ -39,6 +39,7 @@ import com.nflg.wms.starter.BaseController;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
@@ -313,6 +314,15 @@ public class TransferCompanyController extends BaseController {
         return ApiResult.success();
     }
 
+    /**
+     * 查询出库单列表（PDA使用）
+     * @param no 调拨单单号
+     */
+    @GetMapping("pda/getTicketForIn")
+    public ApiResult<List<TransferCompanyTicketVO>> getTicketForOut(@Valid @RequestParam @NotBlank String no) {
+        return ApiResult.success(transferCompanyTicketService.getVOByOrderNo(no));
+    }
+
     /**
      * 查询出库单信息（PDA使用）
      * @param no 出库单单号

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java

@@ -294,6 +294,15 @@ public class TransferFactoryController extends BaseController {
         return ApiResult.success();
     }
 
+    /**
+     * 查询出库单列表（PDA使用）
+     * @param no 调拨单单号
+     */
+    @GetMapping("pda/getTicketForIn")
+    public ApiResult<List<TransferFactoryTicketVO>> getTicketForOut(@Valid @RequestParam @NotBlank String no) {
+        return ApiResult.success(transferFactoryTicketService.getVOByOrderNo(no));
+    }
+
     /**
      * 查询出库单信息（PDA使用）
      * @param no 出库单单号

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferCompanyTicketMapper.java

@@ -7,6 +7,8 @@ import com.nflg.wms.common.pojo.qo.TransferCompanySearchQO;
 import com.nflg.wms.common.pojo.vo.TransferCompanyTicketVO;
 import com.nflg.wms.repository.entity.WmsTransferCompanyTicket;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -21,4 +23,6 @@ public interface WmsTransferCompanyTicketMapper extends BaseMapper<WmsTransferCo
     TransferCompanyTicketVO getInfo(Long id);
 
     TransferCompanyTicketVO getByNo(String no);
+
+    List<TransferCompanyTicketVO> getVOByOrderNo(String no);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsTransferFactoryTicketMapper.java

@@ -8,6 +8,8 @@ import com.nflg.wms.common.pojo.vo.TransferFactoryTicketInfoVO;
 import com.nflg.wms.common.pojo.vo.TransferFactoryTicketVO;
 import com.nflg.wms.repository.entity.WmsTransferFactoryTicket;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -22,4 +24,6 @@ public interface WmsTransferFactoryTicketMapper extends BaseMapper<WmsTransferFa
     TransferFactoryTicketInfoVO getInfo(Long id);
 
     TransferFactoryTicketInfoVO getByNo(String no);
+
+    List<TransferFactoryTicketVO> getVOByOrderNo(String no);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferCompanyTicketService.java

@@ -6,8 +6,11 @@ import com.nflg.wms.common.pojo.qo.TransferCompanySearchQO;
 import com.nflg.wms.common.pojo.vo.TransferCompanyTicketVO;
 import com.nflg.wms.repository.entity.WmsTransferCompanyTicket;
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务类
@@ -22,4 +25,6 @@ public interface IWmsTransferCompanyTicketService extends IService<WmsTransferCo
     TransferCompanyTicketVO getInfo(@Valid @NotNull Long id);
 
     TransferCompanyTicketVO getByNo(String no);
+
+    List<TransferCompanyTicketVO> getVOByOrderNo(@Valid @NotBlank String no);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsTransferFactoryTicketService.java

@@ -10,6 +10,8 @@ import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务类
@@ -24,4 +26,6 @@ public interface IWmsTransferFactoryTicketService extends IService<WmsTransferFa
     TransferFactoryTicketInfoVO getInfo(@Valid @NotNull Long id);
 
     TransferFactoryTicketInfoVO getByNo(@Valid @NotBlank String no);
+
+    List<TransferFactoryTicketVO> getVOByOrderNo(@Valid @NotBlank String no);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferCompanyTicketServiceImpl.java

@@ -10,6 +10,8 @@ import com.nflg.wms.repository.mapper.WmsTransferCompanyTicketMapper;
 import com.nflg.wms.repository.service.IWmsTransferCompanyTicketService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -34,4 +36,9 @@ public class WmsTransferCompanyTicketServiceImpl extends ServiceImpl<WmsTransfer
     public TransferCompanyTicketVO getByNo(String no) {
         return baseMapper.getByNo(no);
     }
+
+    @Override
+    public List<TransferCompanyTicketVO> getVOByOrderNo(String no) {
+        return baseMapper.getVOByOrderNo(no);
+    }
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsTransferFactoryTicketServiceImpl.java

@@ -11,6 +11,8 @@ import com.nflg.wms.repository.mapper.WmsTransferFactoryTicketMapper;
 import com.nflg.wms.repository.service.IWmsTransferFactoryTicketService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -35,4 +37,9 @@ public class WmsTransferFactoryTicketServiceImpl extends ServiceImpl<WmsTransfer
     public TransferFactoryTicketInfoVO getByNo(String no) {
         return baseMapper.getByNo(no);
     }
+
+    @Override
+    public List<TransferFactoryTicketVO> getVOByOrderNo(String no) {
+        return baseMapper.getVOByOrderNo(no);
+    }
 }

nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml

@@ -54,4 +54,12 @@
         inner join wms_transfer_company_ticket tct on tc.id = tct.order_id
         where tct."no"=#{no}
     </select>
+
+    <select id="getVOByOrderNo" resultType="com.nflg.wms.common.pojo.vo.TransferCompanyTicketVO">
+        select tct.id,tct.no as "ticket_no",tct.create_by,tct.create_time,tct.update_by,tct.update_time,tct.mat_doc
+             ,tct.doc_year,tct.state,tc.*
+        from wms_transfer_company tc
+        inner join wms_transfer_company_ticket tct on tc.id = tct.order_id
+        where tct.state=0 and tc."no"=#{no}
+    </select>
 </mapper>

nflg-wms-repository/src/main/resources/mapper/WmsTransferFactoryTicketMapper.xml

@@ -46,4 +46,12 @@
         INNER JOIN wms_transfer_factory tf ON tft.order_id=tf."id"
         WHERE tft."no"=#{no}
     </select>
+
+    <select id="getVOByOrderNo" resultType="com.nflg.wms.common.pojo.vo.TransferFactoryTicketVO">
+        SELECT tft."id",tft."no" AS "ticket_no",tft.create_by,tft.create_time,tft.update_time,tft.update_by
+             ,tft.doc_year,tft.mat_doc,tf.*
+        FROM wms_transfer_factory_ticket tft
+        INNER JOIN wms_transfer_factory tf ON tft.order_id=tf."id"
+        WHERE tft.state=0 AND tf."no"= #{no}
+    </select>
 </mapper>