diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/MesRbWoProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/MesRbWoProcessor.java deleted file mode 100644 index bcdedd6a..00000000 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/MesRbWoProcessor.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.springblade.job.processor.quality; - -import lombok.RequiredArgsConstructor; -import org.springblade.desk.order.feign.IApsClient; -import org.springblade.desk.order.pojo.entity.YieldPlan; -import org.springblade.erpdata.feign.IErpMesRbWoClient; -import org.springblade.erpdata.pojo.dto.view.MesRbWo; -import tech.powerjob.worker.core.processor.ProcessResult; -import tech.powerjob.worker.core.processor.TaskContext; -import tech.powerjob.worker.core.processor.sdk.BasicProcessor; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -@RequiredArgsConstructor -public class MesRbWoProcessor implements BasicProcessor { - - private final IErpMesRbWoClient mesRbWoClient; - - private final IApsClient apsClient; - - @Override - public ProcessResult process(TaskContext taskContext) throws Exception { - List mesRbWoList=mesRbWoClient.getList(null).getData(); - List yieldPlanList=new ArrayList<>(); - mesRbWoList.forEach(mesRbWo -> { - YieldPlan yieldPlan=new YieldPlan(); - yieldPlan.setYpCode(mesRbWo.getWono()); - yieldPlan.setPartCode(mesRbWo.getPrtno()); - yieldPlan.setProductType(mesRbWo.getPrtlotno()); - yieldPlan.setPartName(mesRbWo.getPlndept()); - yieldPlan.setPlate(mesRbWo.getWoporqty()); - yieldPlan.setProductIdent(mesRbWo.getWoreqdat()); - yieldPlan.setUseDept(Long.valueOf(mesRbWo.getPlannerdesc())); - yieldPlan.setYpQty(Long.valueOf(mesRbWo.getWototqty())); - yieldPlan.setYpArea(new BigDecimal(mesRbWo.getPrtmdept())); - yieldPlanList.add(yieldPlan); - }); - apsClient.saveList(yieldPlanList); - return new ProcessResult(true); - } -} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/SynMesRbWoProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/SynMesRbWoProcessor.java new file mode 100644 index 00000000..52a164e5 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/SynMesRbWoProcessor.java @@ -0,0 +1,21 @@ +package org.springblade.job.processor.quality; + +import lombok.RequiredArgsConstructor; +import org.springblade.erpdata.feign.IErpMesRbWoClient; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +@RequiredArgsConstructor +public class SynMesRbWoProcessor implements BasicProcessor { + + private final IErpMesRbWoClient mesRbWoClient; + + + + @Override + public ProcessResult process(TaskContext taskContext) throws Exception { + mesRbWoClient.synMesRbWo(); + return new ProcessResult(true); + } +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClient.java new file mode 100644 index 00000000..d42e3096 --- /dev/null +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClient.java @@ -0,0 +1,52 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.erpdata.feign; + + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * Feign接口类 + * + * @author Chill + */ +@FeignClient( + value = AppConstant.APPLICATION_SYSTEM_NAME, + fallback = IErpMesRbPacturnrecordClientFallback.class +) +public interface IErpMesRbPacturnrecordClient { + + String API_PREFIX = "/feign/erpdata/pacturnrecord"; + String SYN_PACTURNRECORD = API_PREFIX + "/synPacturnrecord"; + + /** + * 同步推进计划转工单 + */ + @GetMapping(SYN_PACTURNRECORD) + void synPacturnrecord(); +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClientFallback.java new file mode 100644 index 00000000..007404fc --- /dev/null +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClientFallback.java @@ -0,0 +1,19 @@ +package org.springblade.erpdata.feign; + +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Component; + +/** + * Feign失败配置 + * + * @author lqk + * @date 2025-12-17 15:13 + */ +@Component +public class IErpMesRbPacturnrecordClientFallback implements IErpMesRbPacturnrecordClient { + + @Override + public void synPacturnrecord() { + R.fail("同步推进计划转工单失败"); + } +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClient.java new file mode 100644 index 00000000..28f7a612 --- /dev/null +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClient.java @@ -0,0 +1,52 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.erpdata.feign; + + +import org.springblade.core.launch.constant.AppConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * Feign接口类 + * + * @author Chill + */ +@FeignClient( + value = AppConstant.APPLICATION_SYSTEM_NAME, + fallback = IErpMesRbPartoplinkClientFallback.class +) +public interface IErpMesRbPartoplinkClient { + + String API_PREFIX = "/feign/erpdata/partoplink"; + String SYN_PARTOPLINK = API_PREFIX + "/synPartoplink"; + + /** + * 同步推进计划转工单 + */ + @GetMapping(SYN_PARTOPLINK) + void synPartoplink(); +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClientFallback.java new file mode 100644 index 00000000..c1d78e97 --- /dev/null +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClientFallback.java @@ -0,0 +1,20 @@ +package org.springblade.erpdata.feign; + +import org.springblade.core.tool.api.R; +import org.springframework.stereotype.Component; + +/** + * Feign失败配置 + * + * @author lqk + * @date 2025-12-17 15:13 + */ +@Component +public class IErpMesRbPartoplinkClientFallback implements IErpMesRbPartoplinkClient { + + + @Override + public void synPartoplink() { + R.fail("同步推进计划转工单失败"); + } +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClient.java new file mode 100644 index 00000000..0ab9193a --- /dev/null +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClient.java @@ -0,0 +1,57 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.erpdata.feign; + + +import org.springblade.core.launch.constant.AppConstant; +import org.springblade.core.tool.api.R; +import org.springblade.erpdata.pojo.dto.view.MesRbWo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; + +import java.util.List; + +/** + * Feign接口类 + * + * @author Chill + */ +@FeignClient( + value = AppConstant.APPLICATION_SYSTEM_NAME, + fallback = IErpMesRbPurtosoClientFallback.class +) +public interface IErpMesRbPurtosoClient { + + String API_PREFIX = "/feign/erpdata/mesrbpurtoso"; + String SYN_PURTOSO = API_PREFIX + "/synPurtoso"; + + /** + * 同步推进计划转工单 + */ + @GetMapping(SYN_PURTOSO) + void synPurtoso(); +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClientFallback.java new file mode 100644 index 00000000..6a062b2e --- /dev/null +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClientFallback.java @@ -0,0 +1,23 @@ +package org.springblade.erpdata.feign; + +import org.springblade.core.tool.api.R; +import org.springblade.erpdata.pojo.dto.view.MesRbWo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Feign失败配置 + * + * @author lqk + * @date 2025-12-17 15:13 + */ +@Component +public class IErpMesRbPurtosoClientFallback implements IErpMesRbPurtosoClient { + + + @Override + public void synPurtoso() { + R.fail("获取数据失败"); + } +} diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java index 835f92d9..b096effd 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java @@ -59,5 +59,8 @@ public interface IErpMesRbWoClient { */ @PostMapping(GET_LIST) R> getList(MesRbWo entity); - + /** + * 同步生产计划数据 + */ + void synMesRbWo(); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java index 3ea6696e..71e79991 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java @@ -19,4 +19,9 @@ public class IErpMesRbWoClientFallback implements IErpMesRbWoClient { public R> getList(MesRbWo entity) { return R.fail("获取数据失败"); } + + @Override + public void synMesRbWo() { + R.fail("获取数据失败"); + } } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java index d7082de7..f35be009 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java @@ -1,10 +1,46 @@ package org.springblade.erpdata.pojo.dto.view; +import lombok.Data; + /** * 对应ERP中视图 v_mes_rb_pacturnrecord * * @author lqk * @date 2026-01-16 17:34 */ +@Data public class MesRbPacturnrecord { + + private String invadjcode; //转工单号 + private String splcode; //批次号 + private String prtno; //物料号 + private String sono; //车间订单号 + private String onductor; //周转工 + private String cdate; //周转时间 + private String seqavlqty; //提交数量 + private String arctlr; //保管员 + private String sedeptcode; //使用部门代码 + private String lndeptcode; //计划部门代码 + private String sedept; //使用部门 + private String lndept; //计划部门 + private String eqopman; //车间打票保管 + private String warno; //库房号 + private String warlocno; //库位号 + private String deptnocode; //周转部门代码 + private String eptno; //周转部门 + private String prnflag; //是否打印(0 未打印 1已打印) + private String turnflag; //周转类型(0 入库 1 转工) + private String recdept; //接收部门 + private String recname; //接收人 + private String recdate; //接收日期 + private String recflag; //接收标记 + private String recsoqty; //接收数量 + private String recseqno; //协作工序号 + private String recsono; //协作车间订单 + private String lanner; //计划员 + private String oreqdat; //需求日期 + private String rtlotno; //生产标识 + private String ouclp; //路线卡号 + private String processlinedesc; //一级路线 + private String wono; //工作订单号 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java index 55b763f4..b50bd416 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPartoplink.java @@ -1,10 +1,22 @@ package org.springblade.erpdata.pojo.dto.view; +import lombok.Data; + /** * 对应ERP中视图 v_mes_rb_partoplink * * @author lqk * @date 2026-01-16 17:34 */ +@Data public class MesRbPartoplink { + + private String prtno; //物料号 + private String prtname; //物料名称 + private String firpp; //一级工艺计划 + private String firppname; //一级工艺计划名称 + private String firseq; //一级工序 + private String firseqname; //一级工序名称 + private String firseqno; //一级工序序号号 + private String cnumber; //一级工序对应工艺能力 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java index 323a2b52..7526f30d 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java @@ -1,10 +1,31 @@ package org.springblade.erpdata.pojo.dto.view; +import lombok.Data; + /** * 对应ERP中视图 v_mes_rb_purtoso * * @author lqk * @date 2026-01-16 17:34 */ +@Data public class MesRbPurtoso { + + private String trseqid; //车间订单号 + private String qutno; //批次号 + private String prtno; //物料号 + private String prtlotno; //质量等级 + private String mtltmrk; //型号 + private String mtnqty; //需求数量 + private String mtndat; //下达时间 + private String yjgx; //一级工序（B号） + private String deptno; //接收部门 + private String jhbm; //计划部门 + private String sybm; //使用部门 + private String jhy; //计划员 + private String bgy; //保管员 + private String processlinedesc; //一级工艺路线 + private String kdofplat; //镀种 + private String prtmeterial; //材料 + private String rigidity; //硬度 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java index 56f5fc2e..8bd2b24c 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java @@ -2,6 +2,8 @@ package org.springblade.erpdata.pojo.dto.view; import lombok.Data; +import java.util.Date; + /** * 对应ERP中视图 v_mes_rb_wo * @@ -11,20 +13,26 @@ import lombok.Data; @Data public class MesRbWo { - private String wono; - private String prtno; - private String prtlotno; - private String plndept; - private String woporqty; - private String woreqdat; - private String plannerdesc; - private String wopordat; - private String remark; - private String wototqty; - private String prtmdept; - private String processline; - private String warctlrdesc; - private String kdofplat; - private String processlinedesc; - private String prodline; + private String wono; //工作订单号 + private String prtno; //物料号 + private String mtltmrk; //型号 + private String plnsign; //计划标记 + private String prtlotno; //生产标识 + private Date wopordat; //下达日期 + private String woreqdat; //需求日期 + private String woporqty; //需求数量 + private String wototqty; //完成数量 + private String mono; //制造订单号 + private String prtmdept; //主制部门 + private String worelstat; //下达状态：0未下达，1已下达，2部分下达 + private String woexcstat; //执行状态：0执行中，1正常完成，2欠交完成，3超量完成，4未执行，5脱期完成 + private String kdofplat; //镀种 + private String prtmeterial; //材料 + private String rigidity; //硬度 + private String prtdesc; //物料名称 + private String remark; //备注 + private String plndept; //计划部门 + private String processline; //工艺路线 + private String processlinedesc; //工艺路线详情 + private String prodline; //产品系列 } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbWoClient.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbWoClient.java index 1dc38a9d..a653eab5 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbWoClient.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbWoClient.java @@ -1,41 +1,11 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ 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; import org.springblade.core.tool.api.R; -import org.springblade.erpdata.pojo.dto.AllocationDTO; import org.springblade.erpdata.pojo.dto.view.MesRbWo; -import org.springblade.erpdata.service.IErpDataSearchService; import org.springblade.erpdata.service.IErpMesRbWoService; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -59,4 +29,9 @@ public class ErpMesRbWoClient implements IErpMesRbWoClient { public R> getList(MesRbWo entity) { return R.data(erpMesRbWoService.getList(entity)); } + + @Override + public void synMesRbWo() { + erpMesRbWoService.synMesRbWo(); + } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.java new file mode 100644 index 00000000..b7543b08 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.java @@ -0,0 +1,21 @@ +package org.springblade.erpdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.Mapper; +import org.springblade.erpdata.pojo.dto.view.MesRbPacturnrecord; + +import java.util.List; + +/** + * Mapper 接口 + * + * @author lqk + */ +public interface ErpMesRbPacturnrecordMapper extends Mapper { + + /** + * 从ERP视图中获取要同步的推进计划转工单 + * + * @return + */ + List getMesRbPacturnrecordErpList(); +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml new file mode 100644 index 00000000..ff896a38 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.java new file mode 100644 index 00000000..d84c4335 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.java @@ -0,0 +1,21 @@ +package org.springblade.erpdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.Mapper; +import org.springblade.erpdata.pojo.dto.view.MesRbPartoplink; + +import java.util.List; + +/** + * Mapper 接口 + * + * @author lqk + */ +public interface ErpMesRbPartoplinkMapper extends Mapper { + + /** + * 从ERP视图中获取要同步的推进计划转工单 + * + * @return + */ + List getMesRbPartoplinkErpList(); +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.xml new file mode 100644 index 00000000..c195a0d8 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.java new file mode 100644 index 00000000..4fa0252f --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.java @@ -0,0 +1,21 @@ +package org.springblade.erpdata.mapper; + +import com.baomidou.mybatisplus.core.mapper.Mapper; +import org.springblade.erpdata.pojo.dto.view.MesRbPurtoso; + +import java.util.List; + +/** + * Mapper 接口 + * + * @author lqk + */ +public interface ErpMesRbPurtosoMapper extends Mapper { + + /** + * 从ERP视图中获取要同步的推进计划转工单 + * + * @return + */ + List getMesRbPurtosoErpList(); +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml new file mode 100644 index 00000000..2e8d6beb --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPacturnrecordService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPacturnrecordService.java new file mode 100644 index 00000000..0be0c542 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPacturnrecordService.java @@ -0,0 +1,14 @@ +package org.springblade.erpdata.service; + +/** + * ERP数据查询service + * + * @author lqk + */ +public interface IErpMesRbPacturnrecordService { + + /** + * 同步推进计划转工单 + */ + void synMesRbPacturnrecord(); +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPartoplinkService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPartoplinkService.java new file mode 100644 index 00000000..71969bc8 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPartoplinkService.java @@ -0,0 +1,14 @@ +package org.springblade.erpdata.service; + +/** + * ERP数据查询service + * + * @author lqk + */ +public interface IErpMesRbPartoplinkService { + + /** + * 同步推进计划转工单 + */ + void synMesRbPartoplink(); +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPurtosoService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPurtosoService.java new file mode 100644 index 00000000..31309b34 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPurtosoService.java @@ -0,0 +1,18 @@ +package org.springblade.erpdata.service; + +import org.springblade.erpdata.pojo.dto.view.MesRbWo; + +import java.util.List; + +/** + * ERP数据查询service + * + * @author lqk + */ +public interface IErpMesRbPurtosoService { + + /** + * 同步推进计划转工单 + */ + void synPurtoso(); +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java index 22ac2527..06426f9f 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java @@ -18,5 +18,8 @@ public interface IErpMesRbWoService { * @return */ List getList(MesRbWo entity); - + /** + * 同步生产计划数据 + */ + void synMesRbWo(); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPacturnrecordServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPacturnrecordServiceImpl.java new file mode 100644 index 00000000..5134d815 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPacturnrecordServiceImpl.java @@ -0,0 +1,29 @@ +package org.springblade.erpdata.service.impl; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.order.feign.IApsClient; +import org.springblade.erpdata.mapper.ErpMesRbPacturnrecordMapper; +import org.springblade.erpdata.mapper.ErpMesRbPartoplinkMapper; +import org.springblade.erpdata.service.IErpMesRbPacturnrecordService; +import org.springblade.erpdata.service.IErpMesRbPartoplinkService; +import org.springframework.stereotype.Service; + +/** + * @author lqk + * @date 2025-11-26 9:39 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class ErpMesRbPacturnrecordServiceImpl implements IErpMesRbPacturnrecordService { + + private final ErpMesRbPacturnrecordMapper mesRbPacturnrecordMapper; + + private final IApsClient apsClient; + + @Override + public void synMesRbPacturnrecord() { + + } +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPartoplinkServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPartoplinkServiceImpl.java new file mode 100644 index 00000000..1fceb510 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPartoplinkServiceImpl.java @@ -0,0 +1,30 @@ +package org.springblade.erpdata.service.impl; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.order.feign.IApsClient; +import org.springblade.erpdata.mapper.ErpMesRbPartoplinkMapper; +import org.springblade.erpdata.mapper.ErpMesRbPurtosoMapper; +import org.springblade.erpdata.service.IErpMesRbPartoplinkService; +import org.springblade.erpdata.service.IErpMesRbPurtosoService; +import org.springframework.stereotype.Service; + +/** + * @author lqk + * @date 2025-11-26 9:39 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class ErpMesRbPartoplinkServiceImpl implements IErpMesRbPartoplinkService { + + private final ErpMesRbPartoplinkMapper mesRbPartoplinkMapper; + + private final IApsClient apsClient; + + + @Override + public void synMesRbPartoplink() { + + } +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPurtosoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPurtosoServiceImpl.java new file mode 100644 index 00000000..2e80b846 --- /dev/null +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPurtosoServiceImpl.java @@ -0,0 +1,36 @@ +package org.springblade.erpdata.service.impl; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.order.feign.IApsClient; +import org.springblade.desk.order.pojo.entity.YieldPlan; +import org.springblade.erpdata.mapper.ErpMesRbPurtosoMapper; +import org.springblade.erpdata.mapper.ErpMesRbWoMapper; +import org.springblade.erpdata.pojo.dto.view.MesRbWo; +import org.springblade.erpdata.service.IErpMesRbPurtosoService; +import org.springblade.erpdata.service.IErpMesRbWoService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * @author lqk + * @date 2025-11-26 9:39 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class ErpMesRbPurtosoServiceImpl implements IErpMesRbPurtosoService { + + private final ErpMesRbPurtosoMapper mesRbPurtosoMapper; + + private final IApsClient apsClient; + + + @Override + public void synPurtoso() { + + } +} diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index cb51e739..95fc08f2 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -1,17 +1,16 @@ 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.tool.api.R; -import org.springblade.erpdata.mapper.ErpDataSearchMapper; +import org.springblade.desk.order.feign.IApsClient; +import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.erpdata.mapper.ErpMesRbWoMapper; -import org.springblade.erpdata.pojo.dto.AllocationDTO; import org.springblade.erpdata.pojo.dto.view.MesRbWo; -import org.springblade.erpdata.service.IErpDataSearchService; import org.springblade.erpdata.service.IErpMesRbWoService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -25,9 +24,32 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { private final ErpMesRbWoMapper mesRbWoMapper; + private final IApsClient apsClient; + @Override public List getList(MesRbWo entity) { return mesRbWoMapper.getYieldPlanErpList(); } + + @Override + public void synMesRbWo() { + List mesRbWoList=mesRbWoMapper.getYieldPlanErpList(); + List yieldPlanList=new ArrayList<>(); + mesRbWoList.forEach(mesRbWo -> { + YieldPlan yieldPlan=new YieldPlan(); + yieldPlan.setYpCode(mesRbWo.getWono()); + yieldPlan.setPartCode(mesRbWo.getPrtno()); + yieldPlan.setProductType(mesRbWo.getPrtlotno()); + yieldPlan.setPartName(mesRbWo.getPlndept()); + yieldPlan.setPlate(mesRbWo.getKdofplat()); + yieldPlan.setProductIdent(mesRbWo.getWoreqdat()); + yieldPlan.setYpQty(Long.valueOf(mesRbWo.getWototqty())); + yieldPlan.setYpArea(new BigDecimal(mesRbWo.getPrtmdept())); + yieldPlan.setYpQty(Long.valueOf(mesRbWo.getWototqty())); + yieldPlan.setDemandDate(mesRbWo.getWopordat()); + yieldPlanList.add(yieldPlan); + }); + apsClient.saveList(yieldPlanList); + } }