外协结算

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/PriceSheetPageQuery.java

@@ -0,0 +1,13 @@
+package org.springblade.desk.oem.pojo.request;
+
+import lombok.Data;
+
+import org.springblade.core.mp.support.Query;
+
+@Data
+public class PriceSheetPageQuery {
+
+    private PriceSheetQuery priceSheetQuery;
+
+    private Query query;
+}

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

@@ -5,14 +5,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.oem.pojo.request.PriceSheetPageQuery;
 import org.springblade.desk.oem.pojo.request.PriceSheetQuery;
 import org.springblade.desk.oem.pojo.vo.PriceSheetVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 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.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 外协相关erp操作Feign接口类
@@ -29,6 +34,8 @@ public interface IErpDataOemClient {
     String API_PREFIX = "/feign/erpdata/oem";
     String CLOSE_ERP_ORDER = API_PREFIX + "/closeErpOrder";
     String PRICE_SHEET_DATA = API_PREFIX + "/priceSheetData";
+
+    String PRICE_SHEET_DATA_ALL = API_PREFIX + "/priceSheetDataAll";
     String FULL_ORDER_OUTSOURCING = API_PREFIX + "/fullOrderOutsourcing";
     String COLLABORATIVE_OUTSOURCING = API_PREFIX + "/collaborativeOutsourcing";
 
@@ -44,10 +51,13 @@ public interface IErpDataOemClient {
     /**
      * 报价单查询
      *
-     * @param priceSheetQuery
+     * @param paramsMap
      */
-    @GetMapping(PRICE_SHEET_DATA)
+    @PostMapping(PRICE_SHEET_DATA)
-    R<Page<PriceSheetVO>> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery);
+    R<Page<PriceSheetVO>> priceSheetData(@RequestBody PriceSheetPageQuery priceSheetPageQuery);
+
+    @GetMapping(PRICE_SHEET_DATA_ALL)
+    R<List<PriceSheetVO>> priceSheetDataAll(@SpringQueryMap PriceSheetQuery priceSheetQuery);
 
     /**
      * 协作外协订单接收

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

@@ -3,9 +3,14 @@ package org.springblade.erpdata.feign;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.oem.pojo.request.PriceSheetPageQuery;
 import org.springblade.desk.oem.pojo.request.PriceSheetQuery;
 import org.springblade.desk.oem.pojo.vo.PriceSheetVO;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * Feign失败配置
@@ -22,7 +27,12 @@ public class IErpDataOemClientFallback implements IErpDataOemClient {
     }
 
     @Override
-    public R<Page<PriceSheetVO>> priceSheetData(PriceSheetQuery priceSheetQuery) {
+    public R<Page<PriceSheetVO>> priceSheetData(PriceSheetPageQuery priceSheetPageQuery) {
+        return R.fail("查询报价单 失败");
+    }
+
+    @Override
+    public R<List<PriceSheetVO>> priceSheetDataAll(PriceSheetQuery priceSheetQuery) {
         return R.fail("查询报价单 失败");
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemOrderController.java

@@ -184,7 +184,10 @@ public class OemOrderController extends BladeController {
     @ApiOperationSupport(order = 9)
     @Operation(summary = "报价单分页", description = "传入mesOemStatement")
     public R<IPage<PriceSheetVO>> priceSheetData(PriceSheetQuery priceSheetQuery, Query query) {
-        R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(priceSheetQuery);
+        PriceSheetPageQuery priceSheetPageQuery = new PriceSheetPageQuery();
+        priceSheetPageQuery.setPriceSheetQuery(priceSheetQuery);
+        priceSheetPageQuery.setQuery(query);
+        R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(priceSheetPageQuery);
         Page<PriceSheetVO> data = pageR.getData();
         Page<PriceSheetVO> pages = new Page<>();
         // 复制分页属性
@@ -249,7 +252,10 @@ public class OemOrderController extends BladeController {
     @ApiOperationSupport(order = 14)
     @Operation(summary = "报价单导出数据", description = "")
     public void exportPriceSheetData(PriceSheetQuery priceSheetQuery, Query query, HttpServletResponse response) {
-        R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(priceSheetQuery);
+        PriceSheetPageQuery priceSheetPageQuery = new PriceSheetPageQuery();
+        priceSheetPageQuery.setPriceSheetQuery(priceSheetQuery);
+        priceSheetPageQuery.setQuery(query);
+        R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(priceSheetPageQuery);
         Page<PriceSheetVO> data = pageR.getData();
         List<PriceSheetVO> list = data.getRecords();
         List<PriceSheetExcel> excels = new ArrayList<>();

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -658,10 +658,10 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             query.setOcName(oemName);
             query.setInDateStart(putStoreDate);
             query.setInDateEnd(putStoreDate);
-            R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query);
+            R<List<PriceSheetVO>> listR = erpDataOemClient.priceSheetDataAll(query);
 
-            if (pageR != null && pageR.getData() != null) {
+            if (listR != null && listR.getData() != null) {
-                return pageR.getData().getRecords();
+                return listR.getData();
             }
         } catch (Exception e) {
             log.error("获取报价单失败，失败原因：{}", e);
@@ -676,10 +676,10 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
     private List<PriceSheetVO> getPriceSheets(String oemName) {
         PriceSheetQuery query = new PriceSheetQuery();
         query.setOcName(oemName);
-        R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query);
+        R<List<PriceSheetVO>> listR = erpDataOemClient.priceSheetDataAll(query);
 
-        if (pageR != null && pageR.getData() != null) {
+        if (listR != null && listR.getData() != null) {
-            return pageR.getData().getRecords();
+            return listR.getData();
         }
         return Collections.emptyList();
     }
@@ -1582,10 +1582,10 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         if (minPutStoreTime != null) {
             query.setInDateEnd(minPutStoreTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
         }
-        R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query);
+        R<List<PriceSheetVO>> listR = erpDataOemClient.priceSheetDataAll(query);
 
-        if (pageR != null && pageR.getData() != null) {
+        if (listR != null && listR.getData() != null) {
-            return pageR.getData().getRecords();
+            return listR.getData();
         }
         return Collections.emptyList();
         //假数据测试用

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

@@ -11,14 +11,19 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.desk.oem.pojo.request.PriceSheetPageQuery;
 import org.springblade.desk.oem.pojo.request.PriceSheetQuery;
 import org.springblade.desk.oem.pojo.vo.PriceSheetVO;
 import org.springblade.erpdata.service.IErpDataOemService;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 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.Date;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -42,11 +47,10 @@ public class ErpDataOemClientImpl implements IErpDataOemClient {
     }
 
     @Override
-    @GetMapping(PRICE_SHEET_DATA)
+    @PostMapping(PRICE_SHEET_DATA)
-    public R<Page<PriceSheetVO>> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery) {
+    public R<Page<PriceSheetVO>> priceSheetData(@RequestBody PriceSheetPageQuery priceSheetPageQuery) {
-        Query query = new Query() {{
+        PriceSheetQuery priceSheetQuery = priceSheetPageQuery.getPriceSheetQuery();
-            setSize(99999);
+        Query query = priceSheetPageQuery.getQuery();
-        }};
         IPage<PriceSheetVO> iPages = erpDataOemService.priceSheetData(Condition.getPage(query), priceSheetQuery);
         Page<PriceSheetVO> pages = new Page<>();
 
@@ -60,6 +64,13 @@ public class ErpDataOemClientImpl implements IErpDataOemClient {
         return R.data(pages);
     }
 
+    @Override
+    @GetMapping(PRICE_SHEET_DATA_ALL)
+    public R<List<PriceSheetVO>> priceSheetDataAll(@SpringQueryMap PriceSheetQuery priceSheetQuery) {
+        List<PriceSheetVO> list = erpDataOemService.priceSheetDataAll(priceSheetQuery);
+        return R.data(list);
+    }
+
     @Override
     public R<String> fullOrderOutsourcing(String v_prtno, String v_prtlotno, String v_splcode, String v_splycode, String v_seqcc, String v_sono, String v_planner, String v_pedate, Double v_woporqty, String v_pricetype) {
         Date pedate = DateUtil.parse(v_pedate, "yyyy-MM-dd HH:mm:ss");

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

@@ -22,4 +22,6 @@ public interface ErpDataOemMapper extends Mapper {
      * @return
      */
     List<PriceSheetVO> priceSheetData(IPage<PriceSheetVO> page, PriceSheetQuery query);
+
+    List<PriceSheetVO> priceSheetDataAll(PriceSheetQuery query);
 }

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

@@ -55,4 +55,58 @@
         </where>
         -- ORDER BY a.reqdate DESC
     </select>
+
+
+    <select id="priceSheetDataAll" resultType="org.springblade.desk.oem.pojo.vo.PriceSheetVO">
+        SELECT
+        a.*,
+        a.coating_desc as coatingDesc,
+        a.AU_AG_PRICE as auAgPrice,
+        a.STANDARD_PROCESS_CODE as standardProcessCode
+        FROM
+        dba_mgr.v_mes_rb_prtprice a
+        <where>
+            <if test="ocCode != null and ocCode != ''">
+                AND a.splycode LIKE concat(concat('%', #{ocCode}),'%')
+            </if>
+            <if test="ocName != null and ocName != ''">
+                AND a.splyname LIKE concat(concat('%', #{ocName}),'%')
+            </if>
+            <if test="partCode != null and partCode != ''">
+                AND a.prtno LIKE concat(concat('%', #{partCode}),'%')
+            </if>
+            <if test="ppsCode != null and ppsCode != ''">
+                AND a.gxinfo LIKE concat(concat('%', #{ppsCode}),'%')
+            </if>
+            <if test="productIdent != null and productIdent != ''">
+                AND a.prtlotno LIKE concat(concat('%', #{productIdent}),'%')
+            </if>
+            <if test="plate != null and plate != ''">
+                AND a.coating_desc LIKE concat(concat('%', #{plate}),'%')
+            </if>
+            <if test="memo != null and memo != ''">
+                AND a.remark LIKE concat(concat('%', #{memo}),'%')
+            </if>
+            <if test="inDateStart != null">
+                AND #{inDateStart} <![CDATA[ >= ]]> a.startdat
+            </if>
+            <if test="inDateEnd != null">
+                AND #{inDateEnd}  <![CDATA[ <= ]]> a.validdat
+            </if>
+            <if test="validflags != null and validflags != ''">
+                AND a.validflag IN
+                <foreach collection="validflags.split(',')" item="validflag"
+                         open="(" separator="," close=")" index="index">
+                    #{validflag}
+                </foreach>
+            </if>
+            <if test="papertype != null and papertype != ''">
+                AND a.papertype = #{papertype}
+            </if>
+            <if test="pricetype != null and pricetype != ''">
+                AND a.pricetype = #{pricetype}
+            </if>
+        </where>
+        -- ORDER BY a.reqdate DESC
+    </select>
 </mapper>

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataOemService.java

@@ -6,6 +6,7 @@ import org.springblade.desk.oem.pojo.request.PriceSheetQuery;
 import org.springblade.desk.oem.pojo.vo.PriceSheetVO;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 外协相关erp操作service
@@ -32,6 +33,8 @@ public interface IErpDataOemService {
      */
     IPage<PriceSheetVO> priceSheetData(IPage<PriceSheetVO> page, PriceSheetQuery priceSheetQuery);
 
+    List<PriceSheetVO> priceSheetDataAll(PriceSheetQuery priceSheetQuery);
+
     /**
      * 协作外协订单接收
      *

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataOemServiceImpl.java

@@ -68,6 +68,11 @@ public class ErpDataOemServiceImpl implements IErpDataOemService {
         return page.setRecords(erpDataOemMapper.priceSheetData(page, priceSheetQuery));
     }
 
+    @Override
+    public List<PriceSheetVO> priceSheetDataAll(PriceSheetQuery priceSheetQuery) {
+        return erpDataOemMapper.priceSheetDataAll(priceSheetQuery);
+    }
+
     @Override
     public String fullOrderOutsourcing(String v_prtno, String v_prtlotno, String v_splcode, String v_splycode, String v_seqcc, String v_sono,
                                   String v_planner, Date v_pedate, Double v_woporqty, String v_pricetype) {