生产管理修改

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

@@ -25,6 +25,7 @@ public interface IErpDataProduceClient {
     String API_PREFIX = "/feign/erpdata/produce";
     String QUERY_BATCH = API_PREFIX + "/queryBatch";
     String REWORK_ORDER = API_PREFIX + "/loadReworkOrder";
+    String REWORK_ORDER_SIZE = API_PREFIX + "/loadReworkOrderSize";
     String PRODUCT_APP_AREA = API_PREFIX + "/productAppArea";
     String VERSION = API_PREFIX + "/version";
     String CUSTODIAN = API_PREFIX + "/getCustodian";
@@ -43,8 +44,17 @@ public interface IErpDataProduceClient {
     @GetMapping(REWORK_ORDER)
     R<List<ReworkProcessVO>> loadReworkOrder(@RequestParam(value = "reworkCode", required = false) String reworkCode,
                                              @RequestParam(value = "partCode", required = false) String partCode,
-                                             @RequestParam(value = "batchNo", required = false) String batchNo);
+                                             @RequestParam(value = "batchNo", required = false) String batchNo,
+                                             @RequestParam(value = "current") Integer current,
+                                             @RequestParam(value = "size") Integer size);
 
+    /**
+     * 返工订单数量
+     */
+    @GetMapping(REWORK_ORDER_SIZE)
+    R<Integer> loadReworkOrderSize(@RequestParam(value = "reworkCode", required = false) String reworkCode,
+                                   @RequestParam(value = "partCode", required = false) String partCode,
+                                   @RequestParam(value = "batchNo", required = false) String batchNo);
     /**
      * 获取产品区域
      */

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

@@ -1,5 +1,6 @@
 package org.springblade.erpdata.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
 import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
@@ -23,7 +24,12 @@ public class IErpDataProduceClientFallback implements IErpDataProduceClient {
     }
 
     @Override
-    public R<List<ReworkProcessVO>> loadReworkOrder(String reworkCode, String partCode, String batchNo) {
+    public R<List<ReworkProcessVO>> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size) {
+        return R.fail("获取数据失败");
+    }
+
+    @Override
+    public R<Integer> loadReworkOrderSize(String reworkCode, String partCode, String batchNo) {
         return R.fail("获取数据失败");
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ReworkProcessController.java

@@ -71,12 +71,12 @@ public class ReworkProcessController extends BladeController {
 //        records.add(reworkProcessVO);
 //        page.setRecords(records);
 //        return R.data(page);
-        IPage<ReworkProcessVO> page = Condition.getPage(query);
-        String reworkCode = prReworkProcess.getReworkCode();
-        String partCode = prReworkProcess.getPartCode();
-        String batchNo = prReworkProcess.getBatchNo();
-        R<List<ReworkProcessVO>> listR = erpDataProduceClient.loadReworkOrder(reworkCode, partCode, batchNo);
-        return R.data(page.setRecords(listR.getData()));
+        IPage<ReworkProcessVO> iPage = Condition.getPage(query);
+        List<ReworkProcessVO> process = erpDataProduceClient.loadReworkOrder(prReworkProcess.getReworkCode(), prReworkProcess.getPartCode(), prReworkProcess.getBatchNo(), query.getCurrent(), query.getSize()).getData();
+        iPage.setRecords(process);
+        int size = erpDataProduceClient.loadReworkOrderSize(prReworkProcess.getReworkCode(), prReworkProcess.getPartCode(), prReworkProcess.getBatchNo()).getData();
+        iPage.setTotal(size);
+        return R.data(iPage);
     }
 
 //    @GetMapping("/treeProcess")

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

@@ -303,7 +303,9 @@ public class MakeRecServiceImpl extends BaseServiceImpl<MakeRecMapper, MakeRec>
             List<Long> ppsIds = new ArrayList<>();
             List<Long> makeTeams = new ArrayList<>();
             for (MesMakeRecVO record : records) {
-                ppsIds.add(record.getPpsId());
+                if (record.getPpsId() != null) {
+                    ppsIds.add(record.getPpsId());
+                }
                 if (record.getFrontPpsId() != null) {
                     ppsIds.add(record.getFrontPpsId());
                 }

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

@@ -1,5 +1,6 @@
 package org.springblade.erpdata.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
@@ -35,8 +36,13 @@ public class ErpDataProduceClient implements IErpDataProduceClient {
 
 	@Override
 	@GetMapping(REWORK_ORDER)
-	public R<List<ReworkProcessVO>> loadReworkOrder(String reworkCode, String partCode, String batchNo) {
-		return R.data(erpDataProduceService.loadReworkOrder(reworkCode, partCode, batchNo));
+	public R<List<ReworkProcessVO>> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size) {
+		return R.data(erpDataProduceService.loadReworkOrder(reworkCode, partCode, batchNo, current, size));
+	}
+
+	@Override
+	public R<Integer> loadReworkOrderSize(String reworkCode, String partCode, String batchNo) {
+		return R.data(erpDataProduceService.loadReworkOrderSize(reworkCode, partCode, batchNo));
 	}
 
 	@Override

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

@@ -18,11 +18,13 @@ public interface ErpDataProduceMapper extends Mapper {
 
     QueryBatchVO queryBatch(String partCode);
 
-    List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo);
+    List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size);
 
     Map<String, String> getProductAppareaByPartCode(String partCode);
 
     String getVersionByPartCode(String partCode);
 
     String getCustodianByRecDept(String partCode, String recDept);
+
+    int loadReworkOrderSize(String reworkCode, String partCode, String batchNo);
 }

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

@@ -39,6 +39,10 @@
             a.prtno = #{partCode}
     </select>
     <select id="loadReworkOrder" resultType="org.springblade.erpdata.pojo.vo.ReworkProcessVO">
+        SELECT *
+        FROM (
+        SELECT row_.*, ROWNUM rownum_
+        FROM (
         SELECT
             a.*,
             b.usedept,
@@ -51,16 +55,20 @@
         <where>
             a.redono = b.redono AND a.splcode = b.splcode AND a.prtno = b.prtno AND a.amount = b.amount
             <if test="reworkCode != null and reworkCode != ''">
-                AND a.redono LIKE concat(concat('%', #{query.reworkCode}),'%')
+                AND a.redono LIKE concat(concat('%', #{reworkCode}),'%')
             </if>
             <if test="partCode != null and partCode != ''">
-                AND a.prtno LIKE concat(concat('%', #{query.partCode}),'%')
+                AND a.prtno LIKE concat(concat('%', #{partCode}),'%')
             </if>
             <if test="batchNo != null and batchNo != ''">
-                AND a.splcode LIKE concat(concat('%', #{query.batchNo}),'%')
+                AND a.splcode LIKE concat(concat('%', #{batchNo}),'%')
             </if>
         </where>
         ORDER BY a.reqdate DESC
+        ) row_
+        WHERE ROWNUM &lt;= (#{current} * #{size})
+        )
+        WHERE rownum_ &gt; (#{current} - 1) * #{size}
     </select>
     <select id="getProductAppareaByPartCode" resultType="java.util.Map">
         select nvl(b.productapparea,'无') as productapparea, nvl(b.cgzmark,'无') as cgzmark from ( select a.* from dba_mgr.t_prtbasdef a
@@ -78,4 +86,22 @@
           and b.prtno = #{partCode}
           and b.plndept = #{recDept}
     </select>
+    <select id="loadReworkOrderSize" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        dba_mgr.v_mes_rb_redorout a
+        <where>
+            1 = 1
+            <if test="reworkCode != null and reworkCode != ''">
+                AND a.redono LIKE concat(concat('%', #{reworkCode}),'%')
+            </if>
+            <if test="partCode != null and partCode != ''">
+                AND a.prtno LIKE concat(concat('%', #{partCode}),'%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND a.splcode LIKE concat(concat('%', #{batchNo}),'%')
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -18,7 +18,7 @@ public interface IErpDataProduceService {
 
 	QueryBatchVO queryBatch(String partCode);
 
-    List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo);
+    List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size);
 
     Map<String, String> getProductAppareaByPartCode(String partCode);
 
@@ -29,4 +29,6 @@ public interface IErpDataProduceService {
     String chkSjjd(String ypCode, String batchNo);
 
     String chkShjh(String woCode, String ypCode, String partCode, String productIdent, Double makeQty, String memo);
+
+    Integer loadReworkOrderSize(String reworkCode, String partCode, String batchNo);
 }

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

@@ -3,6 +3,8 @@ package org.springblade.erpdata.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.erpdata.mapper.ErpDataProduceMapper;
 import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
@@ -15,6 +17,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcCall;
 import org.springframework.stereotype.Service;
 
 import java.sql.Types;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,8 +41,8 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService {
     }
 
     @Override
-    public List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo) {
-        return erpDataProduceMapper.loadReworkOrder(reworkCode, partCode, batchNo);
+    public List<ReworkProcessVO> loadReworkOrder(String reworkCode, String partCode, String batchNo, Integer current, Integer size) {
+        return erpDataProduceMapper.loadReworkOrder(reworkCode, partCode, batchNo, current, size);
     }
 
     @Override
@@ -128,4 +131,9 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService {
 
         return excflag;
     }
+
+    @Override
+    public Integer loadReworkOrderSize(String reworkCode, String partCode, String batchNo) {
+        return erpDataProduceMapper.loadReworkOrderSize(reworkCode, partCode, batchNo);
+    }
 }