审理单erp查询修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ErpQueryRequest.java

@@ -0,0 +1,23 @@
+package org.springblade.desk.quality.pojo.dto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
+
+@Data
+public class ErpQueryRequest {
+    /**
+     * 当前页
+     */
+    private Integer current;
+
+    /**
+     * 每页大小
+     */
+    private Integer size;
+
+    /**
+     * 搜索条件
+     */
+    private ReviewSheetErpSearch search;
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java

@@ -1,13 +1,21 @@
 package org.springblade.erpdata.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.quality.pojo.dto.ErpQueryRequest;
+import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO;
+import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * Feign接口类
  *
@@ -19,8 +27,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface IErpMesRbPkpqryClient {
 
-	String API_PREFIX = "/feign/erpdata/mesRbPkpqry/";
+	String API_PREFIX = "/feign/client/mesRbPkpqry/";
 	String SELECT_PAGE = API_PREFIX + "selectPage";
+	String LIST_ERP = API_PREFIX + "listerp";
 
 	/**
 	 * 查询配置结果
@@ -40,4 +49,7 @@ public interface IErpMesRbPkpqryClient {
 										@RequestParam(value = "prtmdept", required = false) String prtmdept,
 										@RequestParam(value = "subpkdateStart", required = false) String subpkdateStart,
 										@RequestParam(value = "subpkdateEnd", required = false) String subpkdateEnd);
+
+	@PostMapping(LIST_ERP)
+	List<PpmReportDetailDTO> listErpNew(@RequestBody ErpQueryRequest erpQueryRequest);
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java

@@ -3,7 +3,13 @@ package org.springblade.erpdata.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.quality.pojo.dto.ErpQueryRequest;
+import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO;
+import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * Feign接口类
@@ -16,4 +22,11 @@ public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient {
 	public R<IPage<MesRbPkpqryDTO>> selectPage(Integer current, Integer size, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
 		return R.fail("获取数据失败");
 	}
+
+	@Override
+	public List<PpmReportDetailDTO> listErpNew(@RequestBody ErpQueryRequest erpQueryRequest) {
+		return List.of();
+	}
+
+
 }

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

@@ -32,9 +32,7 @@ import org.springblade.desk.quality.constant.InspectionTaskConst;
 import org.springblade.desk.quality.constant.ReviewSheetConst;
 import org.springblade.desk.quality.excel.ReviewSheetExcel;
 import org.springblade.desk.quality.mapper.ReviewSheetMapper;
-import org.springblade.desk.quality.pojo.dto.ReviewDutyDTO;
+import org.springblade.desk.quality.pojo.dto.*;
-import org.springblade.desk.quality.pojo.dto.ReviewFaultDTO;
-import org.springblade.desk.quality.pojo.dto.ReviewSheetDTO;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.ReviewDuty;
 import org.springblade.desk.quality.pojo.entity.ReviewFault;
@@ -48,14 +46,17 @@ import org.springblade.desk.quality.service.IReviewDutyService;
 import org.springblade.desk.quality.service.IReviewFaultService;
 import org.springblade.desk.quality.service.IReviewSheetService;
 import org.springblade.desk.quality.wrapper.ReviewSheetDetailWrapper;
+import org.springblade.erpdata.feign.IErpMesRbPkpqryClient;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
 import org.springblade.system.pojo.entity.UserInfo;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO;
+
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -73,9 +74,12 @@ import org.springframework.http.MediaType;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
+//@RefreshScope
 public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper, ReviewSheet>
         implements IReviewSheetService {
-
+//    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
+//    @Value("${request.newErp.url}")
+//    private String newErpUrl;
     @Resource
     private IInspectionTaskService taskService;
     @Resource
@@ -91,6 +95,8 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     private IDictClient dictClient;
     @Resource
     private RestTemplate httpClientTemplate;
+    @Resource
+    private IErpMesRbPkpqryClient erpMesRbPkpqryClient;
 
     @Override
     public IPage<ReviewSheetDetailVO> selectReviewSheetPage(IPage<ReviewSheetDetailVO> page, ReviewSheetDetailVO reviewSheet) {
@@ -429,6 +435,9 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
             try {
                 responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" +
                         "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
+
+//                responseEntity = httpClientTemplate.postForEntity(newErpUrl +
+//                        "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
                 JSONObject result = responseEntity.getBody();
 
                 responseBody = result.getJSONObject("responseBody");
@@ -545,7 +554,12 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
 
     @Override
     public IPage<PpmReportDetailDTO> listErp(IPage<PpmReportDetailDTO> page, ReviewSheetErpSearch search) {
-        List<PpmReportDetailDTO> listVO = baseMapper.listErpNew(page, search);
+//        List<PpmReportDetailDTO> listVO = baseMapper.listErpNew(page, search);
+        ErpQueryRequest erpQueryRequest = new ErpQueryRequest();
+        erpQueryRequest.setCurrent(Integer.parseInt(page.getCurrent()+""));
+        erpQueryRequest.setSize(Integer.parseInt(page.getSize()+""));
+        erpQueryRequest.setSearch(search);
+        List<PpmReportDetailDTO> listVO = erpMesRbPkpqryClient.listErpNew(erpQueryRequest);
         for (PpmReportDetailDTO oneVO : listVO) {
             oneVO.setSheetNo(oneVO.getCode());
             oneVO.setP5layer1(oneVO.getP5layer1());

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java

@@ -2,17 +2,26 @@ package org.springblade.erpdata.feign;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.quality.pojo.dto.ErpQueryRequest;
+import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO;
+import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
+import org.springblade.erpdata.mapper.ErpMesRbPkpqryMapper;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 import org.springblade.erpdata.service.IErpMesRbPkpqryService;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * 字典服务Feign实现类
@@ -27,6 +36,8 @@ public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient {
 
 	private final IErpMesRbPkpqryService mesRbPkpqryService;
 
+	private final ErpMesRbPkpqryMapper erpMesRbPkpqryMapper;
+
 	@GetMapping(SELECT_PAGE)
 	@Override
 	public R<IPage<MesRbPkpqryDTO>> selectPage(Integer current, Integer size, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
@@ -35,4 +46,15 @@ public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient {
 		query.setSize(size);
 		return R.data(mesRbPkpqryService.page(Condition.getPage(query), pkno, prtmdept, subpkdateStart, subpkdateEnd));
 	}
+
+	@Override
+	public List<PpmReportDetailDTO> listErpNew(ErpQueryRequest erpQueryRequest) {
+
+		IPage<PpmReportDetailDTO> page = new Page<>(erpQueryRequest.getCurrent(), erpQueryRequest.getSize());
+		List<PpmReportDetailDTO> result = erpMesRbPkpqryMapper.listErpNew(page, erpQueryRequest.getSearch());
+
+		return result;
+	}
+
+
 }

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

@@ -2,6 +2,9 @@ package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO;
+import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 
 import java.util.List;
@@ -24,4 +27,7 @@ public interface ErpMesRbPkpqryMapper extends Mapper {
 	 * @return
 	 */
 	List<MesRbPkpqryDTO> selectPage(IPage page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd);
+
+	List<PpmReportDetailDTO> listErpNew(IPage<PpmReportDetailDTO> page,
+										@Param("q") ReviewSheetErpSearch search);
 }

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

@@ -19,4 +19,23 @@
 			</if>
 		</where>
     </select>
+
+	<select id="listErpNew"
+			resultType="org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO">
+		select a.code,a.p5layer1,a.p5layer3,a.useproc,a.useseq,a.precode,
+		a.redodeptcode,a.p1remark,a.disposename,a.deptcode,a.p2layer1,a.chker,a.prtno,a.lotno
+		from dba_mgr.v_mes_rb_qisbillqry a
+		where 1=1
+		<if test="q.rsCode != null and q.rsCode != ''">
+			and code = #{q.rsCode}
+		</if>
+		<if test="q.dutyPart != null and q.dutyPart != ''">
+			and prtno like concat(concat('%', #{q.dutyPart}),'%')
+		</if>
+		<if test="q.dutyBatNo != null and q.dutyBatNo != ''">
+			and lotno like concat(concat('%', #{q.dutyBatNo}),'%')
+		</if>
+	</select>
+
+
 </mapper>