返工订单接口开发

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

@@ -1,9 +1,12 @@
 package org.springblade.erpdata.feign;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
+import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -18,8 +21,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 )
 public interface IErpDataProduceClient {
 
-	String API_PREFIX = "/feign/erpdata/client";
+	String API_PREFIX = "/feign/erpdata/produce";
 	String QUERY_BATCH = API_PREFIX + "/queryBatch";
+	String REWORK_ORDER = API_PREFIX + "/loadReworkOrder";
 
 	/**
 	 * 缺件申报-通过零件号获取批次号
@@ -27,4 +31,7 @@ public interface IErpDataProduceClient {
 	@GetMapping(QUERY_BATCH)
 	R<QueryBatchVO> queryBatch(String partCode);
 
+	@GetMapping(REWORK_ORDER)
+	R<IPage<ReworkProcessVO>> loadReworkOrder(ReworkProcessDTO query);
+
 }

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

@@ -1,7 +1,10 @@
 package org.springblade.erpdata.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
+import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
 import org.springframework.stereotype.Component;
 
 /**
@@ -17,4 +20,9 @@ public class IErpDataProduceClientFallback implements IErpDataProduceClient {
 	public R<QueryBatchVO> queryBatch(String partCode) {
 		return R.fail("获取数据失败");
 	}
+
+	@Override
+	public R<IPage<ReworkProcessVO>> loadReworkOrder(ReworkProcessDTO query) {
+		return R.fail("获取数据失败");
+	}
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/ReworkProcessDTO.java

@@ -0,0 +1,25 @@
+package org.springblade.erpdata.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springblade.core.mp.support.Query;
+
+/**
+ * 返工订单 数据传输对象实体类
+ * @author litao
+ */
+@Data
+public class ReworkProcessDTO {
+
+	@Schema(description = "返工单号")
+	private String reworkCode;
+
+	@Schema(description = "物料号")
+	private String partCode;
+
+	@Schema(description = "批次")
+	private String batchNo;
+
+	private Query query;
+
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/vo/ReworkProcessVO.java

@@ -0,0 +1,146 @@
+package org.springblade.erpdata.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 返工订单 视图实体类
+ *
+ * @author litao
+ */
+@Data
+public class ReworkProcessVO {
+
+    /**
+     * 返修单号
+     */
+    @Schema(description = "返修单号")
+    private String redono;
+    /**
+     * 路线编号
+     */
+    @Schema(description = "路线编号")
+    private Integer seqno;
+    /**
+     * 处理单位
+     */
+    @Schema(description = "处理单位")
+    private String seqdept;
+    /**
+     * 物料号
+     */
+    @Schema(description = "物料号")
+    private String prtno;
+    /**
+     * 执行状态
+     */
+    @Schema(description = "执行状态")
+    private Short excstatus;
+    /**
+     * 加工数量
+     */
+    @Schema(description = "加工数量")
+    private Double amount;
+    /**
+     * 需求日期
+     */
+    @Schema(description = "需求日期")
+    private String reqdate;
+    /**
+     * 需求数量
+     */
+    @Schema(description = "需求数量")
+    private String reqqty;
+    /**
+     * 接收日期
+     */
+    @Schema(description = "接收日期")
+    private String recdate;
+    /**
+     * 接收人
+     */
+    @Schema(description = "接收人")
+    private String recman;
+    /**
+     * 接收数量
+     */
+    @Schema(description = "接收数量")
+    private String recqty;
+    /**
+     * 完成时间
+     */
+    @Schema(description = "完成时间")
+    private String enddat;
+    /**
+     * 完成人
+     */
+    @Schema(description = "完成人")
+    private String endman;
+    /**
+     * 完成数量
+     */
+    @Schema(description = "完成数量")
+    private String endqty;
+    /**
+     * 批次号
+     */
+    @Schema(description = "批次号")
+    private String splcode;
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+    /**
+     * 交接日期
+     */
+    @Schema(description = "交接日期")
+    private String hrecdate;
+    /**
+     * 报废数量
+     */
+    @Schema(description = "报废数量")
+    private Integer bfqty;
+
+    /**
+     * 发生单位
+     */
+    @Schema(description = "发生单位")
+    private String usedept;
+    /**
+     * 处理意见
+     */
+    @Schema(description = "处理意见")
+    private String detail;
+    /**
+     * 生产标识
+     */
+    @Schema(description = "生产标识")
+    private String prtlotno;
+    /**
+     * 工艺路线
+     */
+    @Schema(description = "工艺路线")
+    private String deptcode;
+    /**
+     * 是否无工艺
+     */
+//    @Schema(description = "是否无工艺")
+//    private String reworkgyFlag;
+    /**
+     * 开单车间订单号
+     */
+    @Schema(description = "开单车间订单号")
+    private String sono;
+    /**
+     * 镀种
+     */
+//    @Schema(description = "镀种")
+//    private String plate;
+    /**
+     * 工艺责任人
+     */
+//    @Schema(description = "工艺责任人")
+//    private String gyname;
+
+}

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

@@ -1,10 +1,14 @@
 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.mp.support.Condition;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
+import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
 import org.springblade.erpdata.service.IErpDataProduceService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,4 +32,10 @@ public class ErpDataProduceClient implements IErpDataProduceClient {
 	public R<QueryBatchVO> queryBatch(String partCode) {
 		return R.data(erpDataProduceService.queryBatch(partCode));
 	}
+
+	@Override
+	@GetMapping(REWORK_ORDER)
+	public R<IPage<ReworkProcessVO>> loadReworkOrder(ReworkProcessDTO query) {
+		return R.data(erpDataProduceService.loadReworkOrder(Condition.getPage(query.getQuery()), query));
+	}
 }

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

@@ -1,7 +1,12 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
+import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
+
+import java.util.List;
 
 /**
  * Mapper 接口
@@ -11,4 +16,6 @@ import org.springblade.erpdata.pojo.vo.QueryBatchVO;
 public interface ErpDataProduceMapper extends Mapper {
 
     QueryBatchVO queryBatch(String partCode);
+
+    List<ReworkProcessVO> loadReworkOrder(IPage<ReworkProcessVO> page, ReworkProcessDTO query);
 }

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

@@ -38,4 +38,28 @@
         WHERE
             a.prtno = #{partCode}
     </select>
+    <select id="loadReworkOrder" resultType="org.springblade.erpdata.pojo.vo.ReworkProcessVO">
+        SELECT
+            a.*,
+            b.usedept,
+            b.detail,
+            b.prtlotno,
+            b.deptcode
+        FROM
+            dba_mgr.v_mes_rb_redorout @erp_mes_link a,
+            dba_mgr.v_mes_rb_redo @erp_mes_link b
+        <where>
+            a.redono = b.redono AND a.splcode = b.splcode AND a.prtno = b.prtno AND a.amount = b.amount
+            <if test="query.reworkCode != null and query.reworkCode != ''">
+                AND a.redono LIKE concat(concat('%', #{query.reworkCode}),'%')
+            </if>
+            <if test="query.partCode != null and query.partCode != ''">
+                AND a.prtno LIKE concat(concat('%', #{query.partCode}),'%')
+            </if>
+            <if test="query.batchNo != null and query.batchNo != ''">
+                AND a.splcode LIKE concat(concat('%', #{query.batchNo}),'%')
+            </if>
+        </where>
+        ORDER BY a.reqdate DESC
+    </select>
 </mapper>

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

@@ -1,6 +1,9 @@
 package org.springblade.erpdata.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
+import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
 
 /**
  * ERP数据查询service
@@ -11,4 +14,6 @@ public interface IErpDataProduceService {
 
 
 	QueryBatchVO queryBatch(String partCode);
+
+    IPage<ReworkProcessVO> loadReworkOrder(IPage<ReworkProcessVO> page, ReworkProcessDTO query);
 }

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

@@ -1,9 +1,12 @@
 package org.springblade.erpdata.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.erpdata.mapper.ErpDataProduceMapper;
+import org.springblade.erpdata.pojo.dto.ReworkProcessDTO;
 import org.springblade.erpdata.pojo.vo.QueryBatchVO;
+import org.springblade.erpdata.pojo.vo.ReworkProcessVO;
 import org.springblade.erpdata.service.IErpDataProduceService;
 import org.springframework.stereotype.Service;
 
@@ -21,4 +24,9 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService {
 	public QueryBatchVO queryBatch(String partCode) {
 		return erpDataProduceMapper.queryBatch(partCode);
 	}
+
+	@Override
+	public IPage<ReworkProcessVO> loadReworkOrder(IPage<ReworkProcessVO> page, ReworkProcessDTO query) {
+		return page.setRecords(erpDataProduceMapper.loadReworkOrder(page, query));
+	}
 }