Merge remote-tracking branch 'origin/master'

blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/TestPlanInCompleteProcessor.java

@@ -1,6 +1,7 @@
 package org.springblade.job.processor.quality;
 
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.desk.quality.feign.ITestPlanInCompleteTaskClient;
 import org.springframework.stereotype.Component;
 import tech.powerjob.worker.core.processor.ProcessResult;
@@ -13,6 +14,7 @@ import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
  * @create 2026-04-22 14:00
  */
 @Component
+@Slf4j
 public class TestPlanInCompleteProcessor implements BasicProcessor {
 
     @Resource
@@ -21,7 +23,8 @@ public class TestPlanInCompleteProcessor implements BasicProcessor {
 
     @Override
     public ProcessResult process(TaskContext taskContext) throws Exception {
-        client.testPlanIncomplete();
+        Integer count = client.testPlanIncomplete();
+        log.info("转试计划完成修改数量:{}", count);
         return new ProcessResult(true);
     }
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java

@@ -42,4 +42,6 @@ public class DsProcessProjectVO extends DsProcessProjectEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private String processNo;
+
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java

@@ -13,7 +13,7 @@ import org.springblade.desk.logistics.pojo.vo.AllocationMessVO;
 @Data
 public class AllocationMessPageDTO extends AllocationMessVO {
 
-    private Integer pageNum;
+    private Integer current;
 
-    private Integer pageSize;
+    private Integer size;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ITestPlanInCompleteTaskClient.java

@@ -22,5 +22,5 @@ public interface ITestPlanInCompleteTaskClient {
      * 转试计划未完成
      */
     @GetMapping(TEST_PLAN_INCOMPLETE)
-    void testPlanIncomplete();
+    Integer testPlanIncomplete();
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java

@@ -297,11 +297,10 @@ public class DsPartController extends BladeController {
 	 * 测试接口
 	 */
 	@GetMapping("/test")
-	public R test(@RequestParam String partCode,
-	              @RequestParam String roamNo,
-				  @RequestParam String partVersion) {
+	public R test(@RequestParam Long creatId,
+	              @RequestParam String processNo) {
 
-		return R.data(dsPartService.getClassCakeWork(partCode,roamNo,partVersion));
+		return R.data(dsPartService.selectDsProcessProjectByCraftId(creatId,processNo));
 	}
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java

@@ -77,4 +77,6 @@ public interface DsProcessMapper extends BaseMapper<DsProcessEntity> {
     List<DsProcessEntity> selectOldMesProcessByOldMesCraftId(@Param("oldMesCraftId") Long oldMesCraftId);
 
     List<DsProcessEntity> selectDsProcessByCraftIdList(@Param("craftIds") List<Long> craftIds);
+
+	List<DsProcessEntity> selectDsProcessByCraftIdAndProcessNo(@Param("craftId")Long craftId, @Param("processNo")String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java

@@ -77,4 +77,6 @@ public interface DsProcessProjectMapper extends BaseMapper<DsProcessProjectEntit
     List<DsProcessProjectEntity> selectDsProcessProjectByProcessId(@Param("processId")Long processId);
 
 	List<DsProcessProjectEntity> selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId);
+
+	List<DsProcessProjectVO> selectProjectByProcessIds(@Param("processIds") List<Long> processIdList);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java

@@ -68,4 +68,9 @@ public interface PrReworkProcessMapper extends BaseMapper<PrReworkProcessEntity>
 															  @Param("partCode") String partCode,
 															  @Param("batchNo") String batchNo,
 															  @Param("reworkNo") String reworkNo);
+
+	List<PrReworkProcessEntity> selectPrReworkProcessByProcessNo(@Param("reworkOrder")String reworkOrder,
+																 @Param("partCode") String partCode,
+																 @Param("batchNo") String batchNo,
+																 @Param("processNo") String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml

@@ -60,6 +60,16 @@
             #{craftId}
         </foreach>
     </select>
+    <select id="selectDsProcessByCraftIdAndProcessNo"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity">
+         select * from DS_PROCESS
+         where IS_DELETED = 0
+         and CRAFT_ID = #{craftId}
+         <if test="processNo != null and processNo !=''">
+             PROCESS_NO = #{processNo}
+         </if>
+          order by PROCESS_NO asc
+    </select>
 
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml

@@ -53,6 +53,16 @@
             resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity">
         select * from P_RB_SYNC_PROCESS_PROJECT where PROCESS_ID = #{oldMesProcessId}
     </select>
+    <select id="selectProjectByProcessIds"
+            resultType="org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO">
+        select dp.PROCESS_NO,pp.* from DS_PROCESS_PROJECT pp
+        left join ds_process dp on pp.PROCESS_ID =dp.ID
+        where pp.IS_DELETED = 0
+         and  process_id in
+        <foreach collection="processIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
 
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml

@@ -61,5 +61,15 @@
             and BATCH_NO = #{batchNo}
             and REWORK_NO = #{reworkNo}
     </select>
+    <select id="selectPrReworkProcessByProcessNo"
+            resultType="org.springblade.desk.dashboard.pojo.entity.PrReworkProcessEntity">
+        select * from PR_REWORK_PROCESS where is_deleted = 0
+            and REWORK_CODE = #{reworkOrder}
+            and PART_CODE = #{partCode}
+            and BATCH_NO = #{batchNo}
+            <if test="processNo != null and processNo !=''">
+                and PROCESS_NO = #{processNo}
+            </if>
+    </select>
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml

@@ -126,7 +126,7 @@
     </select>
     <select id="getMaxSyncTime" resultType="org.springblade.desk.dashboard.pojo.entity.DsTaskingEntity">
         SELECT * FROM (
-    SELECT * FROM DS_TASKING
+    SELECT * FROM DS_TASKING WHERE TASK_TYPE in (2,3)
     ORDER BY SYNC_TIME DESC
         ) WHERE ROWNUM = 1;
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java

@@ -301,6 +301,6 @@ public interface IDsPartService extends BaseService<DsPartEntity> {
 	 * @param creatId
 	 * @return
 	 */
-	List<DsProcessProjectEntity> selectDsProcessProjectByCraftId(Long creatId);
+	List<DsProcessProjectVO> selectDsProcessProjectByCraftId(Long creatId,String processNo);
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java

@@ -104,4 +104,11 @@ public interface IDsProcessProjectService extends BaseService<DsProcessProjectEn
 	 * @return
 	 */
     List<DsProcessProjectEntity> selectOldMesByPid(Long oldMesProcessId);
+
+	/**
+	 * 查询检验项目（包含工序）
+	 * @param processIdList
+	 * @return
+	 */
+	List<DsProcessProjectVO> selectProjectByProcessIds(List<Long> processIdList);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java

@@ -104,4 +104,12 @@ public interface IDsProcessService extends BaseService<DsProcessEntity> {
 	 * @return
 	 */
 	List<DsProcessEntity> selectDsProcessByCraftIdList(List<Long> craftIds);
+
+	/**
+	 * 根据工艺ID和工序号查询
+	 * @param craftId
+	 * @param processNo
+	 * @return
+	 */
+	List<DsProcessEntity> selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java

@@ -81,4 +81,14 @@ public interface IPrReworkProcessService extends BaseService<PrReworkProcessEnti
 	 * @return
 	 */
 	List<PrReworkProcessEntity> selectPrReworkProcess(String reworkOrder, String partCode, String batchNo,String reworkNo);
+
+	/**
+	 * 查询返工工序
+	 * @param reworkOrder
+	 * @param partCode
+	 * @param batchNo
+	 * @param processNo
+	 * @return
+	 */
+	List<PrReworkProcessEntity> selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java

@@ -897,7 +897,7 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 	}
 
 	@Override
-	public List<DsProcessProjectEntity> selectDsProcessProjectByCraftId(Long craftId) {
+	public List<DsProcessProjectVO> selectDsProcessProjectByCraftId(Long craftId,String processNo) {
 		//参数校验
 		if (craftId == null) {
 			log.warn("工艺ID为空");
@@ -912,20 +912,22 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 		}
 
 		//获取工艺对应的工序ID列表
-		List<Long> processIdList = getProcessIdListByCraft(craft);
+		List<Long> processIdList = getProcessIdListByCraft(craft,processNo);
 		if (CollectionUtils.isEmpty(processIdList)) {
 			log.info("未找到工序ID, craftId: {}, reworkOrder: {}", craftId, craft.getReworkOrder());
 			return Collections.emptyList();
 		}
 
 		//查询工序项目
-		return processProjectService.selectDsProcessProjectByProcessIds(processIdList);
+		List<DsProcessProjectVO> processProjectEntityList = processProjectService.selectProjectByProcessIds(processIdList);
+
+		return processProjectEntityList;
 	}
 
 	/**
 	 * 根据工艺获取工序ID列表（支持返工工艺和正常工艺）
 	 */
-	private List<Long> getProcessIdListByCraft(DsCraftEntity craft) {
+	private List<Long> getProcessIdListByCraft(DsCraftEntity craft, String processNo) {
 		if (craft == null) {
 			return Collections.emptyList();
 		}
@@ -934,10 +936,11 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 
 		if (isRework) {
 			// 返工工艺：从返工工序表查询
-			List<PrReworkProcessEntity> reworkProcessList = prReworkProcessService.selectPrReworkProcess(
+			List<PrReworkProcessEntity> reworkProcessList = prReworkProcessService.selectPrReworkProcessByProcessNo(
 					craft.getReworkOrder(),
 					craft.getPartCode(),
-					craft.getPartVersions()
+					craft.getPartVersions(),
+					processNo
 			);
 
 			return Optional.ofNullable(reworkProcessList)
@@ -950,7 +953,8 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 					.collect(Collectors.toList());
 		} else {
 			// 正常工艺：从工序表查询
-			List<DsProcessEntity> processList = processService.selectDsProcessByCraftId(craft.getId());
+			List<DsProcessEntity> processList = processService.selectDsProcessByCraftIdAndProcessNo(craft.getId(),processNo);
+
 
 			return Optional.ofNullable(processList)
 					.orElse(Collections.emptyList())

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java

@@ -118,4 +118,9 @@ public class DsProcessProjectServiceImpl extends BaseServiceImpl<DsProcessProjec
 		return processProjectMapper.selectOldMesByPid(oldMesProcessId);
 	}
 
+	@Override
+	public List<DsProcessProjectVO> selectProjectByProcessIds(List<Long> processIdList) {
+		return processProjectMapper.selectProjectByProcessIds(processIdList);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java

@@ -170,4 +170,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl<DsProcessMapper, DsPro
 		return processMapper.selectDsProcessByCraftIdList(craftIds);
 	}
 
+	@Override
+	public List<DsProcessEntity> selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo) {
+		return processMapper.selectDsProcessByCraftIdAndProcessNo(craftId,processNo);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java

@@ -81,4 +81,9 @@ public class PrReworkProcessServiceImpl extends BaseServiceImpl<PrReworkProcessM
 		return reworkProcessMapper.selectPrReworkProcessReworkNo(reworkOrder,partCode,batchNo,reworkNo);
 	}
 
+	@Override
+	public List<PrReworkProcessEntity> selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo) {
+		return reworkProcessMapper.selectPrReworkProcessByProcessNo(reworkOrder,partCode,batchNo,processNo);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -30,6 +30,7 @@ import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.basic.service.*;
 import org.springblade.desk.dashboard.pojo.entity.*;
+import org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO;
 import org.springblade.desk.dashboard.service.IBsProcessSetService;
 import org.springblade.desk.dashboard.service.IBsTeamSetService;
 import org.springblade.desk.dashboard.service.IDsPartService;
@@ -1105,13 +1106,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         }
 
                         // 转试记录
-                        List<PlanTest> prPlanTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, prWorkPlan.getPpsId()));
+                        List<PlanTest> prPlanTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, prWorkPlan.getId()));
                         if (prPlanTests != null && !prPlanTests.isEmpty()) {
                             for (PlanTest planTest : prPlanTests) {
                                 newPlanTest = new PlanTest();
                                 BeanUtils.copyProperties(planTest, newPlanTest);
                                 newPlanTest.setId(null);
-                                newPlanTest.setWpId(workPlan.getPpsId());
+                                newPlanTest.setWpId(workPlan.getId());
                                 planTestService.save(newPlanTest);
                             }
                         }
@@ -2625,20 +2626,24 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     @Override
     public Boolean isTransferTest(Long woId) {
-        List<WorkPlanItem> prWorkPlanItems = workPlanItemService.listByWoId(woId);
-
-        // 没有试验项目，不能转试
-        if (!(prWorkPlanItems != null && !prWorkPlanItems.isEmpty())) {
+        WorkOrder workOrder = this.getById(woId);
+        if(workOrder == null){
+            return false;
+        }
+        YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
+        if(yieldOrder == null){
+            return false;
+        }
+        List<DsProcessProjectVO> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId(),null);
+        if (dsProcessProjectEntities == null || dsProcessProjectEntities.isEmpty()) {
             return false;
         }
-
         boolean flag = false;
-        for (WorkPlanItem prWorkPlanItem : prWorkPlanItems) {
+        for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) {
             // 如果试验项目中包含  承压检测 则代表可以发起转试 24/8/5 牛营杰确认
-            if ("承压检测".equals(prWorkPlanItem.getItemName())) {
-                if (prWorkPlanItem.getCheckResult() == -1) {
-                    flag = true;
-                }
+            if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) {
+                flag = true;
+                break;
             }
         }
         return flag;
@@ -2669,7 +2674,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         List<AllocationMessVO> allocationMessList = erpDataLogisticsClient.queryAllocationMess(dto).getData();
         int totalAllocationMessNum = erpDataLogisticsClient.queryAllocationMessNum(dto).getData();
         Map<String,Object> result = new HashMap<>(3);
-        result.put("current",dto.getPageNum());
+        result.put("current",dto.getCurrent());
         result.put("record",allocationMessList);
         result.put("total",totalAllocationMessNum);
         return result;
@@ -2711,7 +2716,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         StringBuilder pptCode = new StringBuilder("LCR" + year + "-" + formattedMonth);
 
         if (latestData != null && latestData.getId() != null) {
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(latestData.getCode())) {
+            if (StringUtils.isNotBlank(latestData.getCode())) {
                 String numStr = String.valueOf(Integer.parseInt(latestData.getCode().substring(10)) + 1);
                 pptCode.append("0".repeat(Math.max(0, 6 - numStr.length())));
                 pptCode.append(numStr);
@@ -2723,12 +2728,16 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     }
 
     private WorkPlan findRelevantWorkPlan(Long woId) {
-        List<WorkPlanItem> prWorkPlanItems = workPlanItemService.listByWoId(woId);
+        WorkOrder workOrder = this.getById(woId);
+        YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
+        List<DsProcessProjectVO> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId(),null);
         WorkPlan prWorkPlan = null;
-        for (WorkPlanItem item : prWorkPlanItems) {
-            if ("承压检测".equals(item.getItemName()) || "承压测试".equals(item.getItemName()) || "承压测试检测".equals(item.getItemName())) {
-                if (item.getCheckResult() == -1) {
-                    prWorkPlan = workPlanService.getById(item.getWpId());
+        if (dsProcessProjectEntities != null && !dsProcessProjectEntities.isEmpty()) {
+            for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) {
+                if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) {
+                    prWorkPlan = workPlanService.getOne(new LambdaQueryWrapper<WorkPlan>()
+                            .eq(WorkPlan::getWoId, woId)
+                            .eq(WorkPlan::getOrders,null));
                 }
             }
         }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/TestPlanInCompleteTaskClient.java

@@ -18,7 +18,7 @@ public class TestPlanInCompleteTaskClient implements ITestPlanInCompleteTaskClie
     private IPlanTestService planTestService;
 
     @Override
-    public void testPlanIncomplete() {
-        planTestService.testPlanIncomplete();
+    public Integer testPlanIncomplete() {
+        return planTestService.testPlanIncomplete();
     }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java

@@ -75,5 +75,5 @@ public interface IPlanTestService extends BaseService<PlanTest> {
 	/**
 	 * 转试计划未完成
 	 */
-	void testPlanIncomplete();
+	Integer testPlanIncomplete();
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java

@@ -55,11 +55,4 @@ public interface IWorkPlanItemService extends BaseService<WorkPlanItem> {
 	void saveCheckItem(WorkPlan wp, List<WorkPlanItem> checkItemList, List<Long> deleteIds, String s);
 
 	void deleteItem(List<Long> deleteIds);
-
-	/**
-	 * 根据订单id查询
-	 * @param woId 订单id
-	 * @return 工序检验项
-	 */
-    List<WorkPlanItem> listByWoId(Long woId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java

@@ -178,9 +178,10 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes
     }
 
     @Override
-    public void testPlanIncomplete() {
+    public Integer testPlanIncomplete() {
         List<PlanTest> planTestList = this.list(new LambdaQueryWrapper<PlanTest>()
                 .isNull(PlanTest::getResult));
+        Integer count = 0;
         if (planTestList != null && !planTestList.isEmpty()) {
             for (PlanTest prPlanTest : planTestList) {
                 List<WorkOrder> prWorkOrderList = workOrderMapper.selectList(new LambdaQueryWrapper<WorkOrder>()
@@ -206,8 +207,10 @@ public class PlanTestServiceImpl extends BaseServiceImpl<PlanTestMapper, PlanTes
                         }
                     }
                     this.updateById(prPlanTest);
+                    count ++;
                 }
             }
         }
+        return count;
     }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java

@@ -228,26 +228,4 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
             wpItemDetailService.remove(Wrappers.lambdaQuery(WorkPlanItemDetail.class).in(WorkPlanItemDetail::getWorkPlanItemId, deleteIds));
         }
     }
-
-    @Override
-    public List<WorkPlanItem> listByWoId(Long woId) {
-        if (woId == null) {
-            return null;
-        }
-        // 创建查询条件
-        LambdaQueryWrapper<WorkPlanItem> queryWrapper = new LambdaQueryWrapper<>();
-        // 关联查询条件
-        queryWrapper.exists(
-                "SELECT 1 FROM MES_WORK_PLAN wp " +
-                        "JOIN BS_PROCESS_SET ps ON wp.pps_id = ps.id " +
-                        "WHERE wp.wo_id = {0} " +
-                        "AND ps.name <> {1}",
-                woId, "烧结包装防护"
-        );
-        // 其他条件
-        queryWrapper.ne(WorkPlanItem::getItemName, "单件包装材料数量")
-                .orderByAsc(WorkPlanItem::getItemCode)
-                .orderByDesc(WorkPlanItem::getId);
-        return this.list(queryWrapper);
-    }
 }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml

@@ -3,45 +3,50 @@
 <mapper namespace="org.springblade.erpdata.mapper.ErpDataLogisticsMapper">
     <!-- 查询调拨单列表 -->
     <select id="queryAllocationMess" resultType="org.springblade.desk.logistics.pojo.vo.AllocationMessVO">
-        select ROWNUM no,a.* from dba_mgr.v_mes_rb_pkpqry a
+        SELECT * FROM (
+        SELECT t1.*, ROWNUM no FROM (
+        SELECT a.*
+        FROM dba_mgr.v_mes_rb_pkpqry a
         <where>
             <if test="dto.pkno != null and dto.pkno != ''">
-                AND pkno LIKE CONCAT('%', #{dto.pkno}, '%')
+                AND a.pkno LIKE '%' || #{dto.pkno} || '%'
             </if>
             <if test="dto.prntno != null and dto.prntno != ''">
-                AND prntno LIKE CONCAT('%', #{dto.prntno}, '%')
+                AND a.prntno LIKE '%' || #{dto.prntno} || '%'
             </if>
             <if test="dto.mtltmrk != null and dto.mtltmrk != ''">
-                AND mtltmrk = #{dto.mtltmrk}
+                AND a.mtltmrk = #{dto.mtltmrk}
             </if>
             <if test="dto.prtlotno != null and dto.prtlotno != ''">
-                AND prtlotno = #{dto.prtlotno}
+                AND a.prtlotno = #{dto.prtlotno}
             </if>
             <if test="dto.mono != null and dto.mono != ''">
-                AND mono = #{dto.mono}
+                AND a.mono = #{dto.mono}
             </if>
             <if test="dto.schemer != null and dto.schemer != ''">
-                AND schemer = #{dto.schemer}
+                AND a.schemer = #{dto.schemer}
             </if>
             <if test="dto.planner1 != null and dto.planner1 != ''">
-                AND planner1 = #{dto.planner1}
+                AND a.planner1 = #{dto.planner1}
             </if>
             <if test="dto.warctlr != null and dto.warctlr != ''">
-                AND warctlr = #{dto.warctlr}
+                AND a.warctlr = #{dto.warctlr}
             </if>
             <if test="dto.plandept != null and dto.plandept != ''">
-                AND plandept = #{dto.plandept}
+                AND a.plandept = #{dto.plandept}
             </if>
             <if test="dto.prtclass != null and dto.prtclass != ''">
-                AND prtclass = #{dto.prtclass}
+                AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        ORDER BY subpkdate DESC
-        <if test="dto.pageNum != null">
-            WHERE no BETWEEN (#{dto.pageNum}-1)*#{dto.getPageSize} +1 AND #{dto.pageNum} * #{dto.getPageSize};
-        </if>
+        ORDER BY a.subpkdate DESC
+        ) t1
+        WHERE ROWNUM &lt;= #{dto.current} * #{dto.size}
+        )
+        WHERE no &gt;= (#{dto.current} - 1) * #{dto.size} + 1
     </select>
 
+
     <!-- 查询调拨单数量 -->
     <select id="queryAllocationMessNum" resultType="java.lang.Integer">
         SELECT COUNT(1) FROM dba_mgr.v_mes_rb_pkpqry