From 1222ecb33089a38cb3e22231ccaa9d65fdf58ce5 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 8 Jun 2026 11:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processor/erp/SynPurchaseProcessor.java | 2 +- .../erpdata/feign/IErpMesRbWoClient.java | 2 +- .../feign/IErpMesRbWoClientFallback.java | 2 +- .../controller/YieldOrderController.java | 10 +++++++ .../order/service/IYieldOrderService.java | 7 +++++ .../service/impl/YieldOrderServiceImpl.java | 11 +++++++ .../erpdata/feign/ErpMesRbWoClient.java | 4 +-- .../erpdata/mapper/ErpMesRbPurtosoMapper.java | 3 +- .../erpdata/mapper/ErpMesRbPurtosoMapper.xml | 3 ++ .../service/IErpMesRbPurtosoService.java | 2 +- .../erpdata/service/IErpMesRbWoService.java | 2 +- .../impl/ErpMesRbPurtosoServiceImpl.java | 4 +-- .../service/impl/ErpMesRbWoServiceImpl.java | 30 ++++++++----------- 13 files changed, 55 insertions(+), 27 deletions(-) diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java index 4e6f3ebfc..de41d8d47 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseProcessor.java @@ -24,7 +24,7 @@ public class SynPurchaseProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext taskContext) throws Exception { log.info("同步物资转车间协作加工订单定时任务开始"); - CompletableFuture runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synPurchase()); + CompletableFuture runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synPurchase(null)); runFuture.whenComplete((result, exception) -> { if (exception != null) { log.error("同步物资转车间协作加工订单定时任务失败", exception); 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 a6b57a6aa..f7cf69575 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 @@ -62,7 +62,7 @@ public interface IErpMesRbWoClient { @GetMapping(GET_WO) R getWoOne(String ypCode); @GetMapping(SYN_PURCHASE) - R synPurchase(); + R synPurchase(@RequestParam("yoCode") String yoCode); @GetMapping(SYN_TEMPORARY) R synTemporary(); @GetMapping(SYN_SINTER) 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 d1f19c425..6267521d2 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 @@ -42,7 +42,7 @@ public class IErpMesRbWoClientFallback implements IErpMesRbWoClient { } @Override - public R synPurchase() { + public R synPurchase(String ypCode) { return R.fail("获取数据失败"); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 4895da857..de3620a1a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -391,4 +391,14 @@ public class YieldOrderController extends BladeController { Boolean result = yieldOrderService.saveYieldOrder(entity); return R.status(result); } + + /** + * 同步订单 + */ + @PostMapping("/syncYieldOrder") + @Operation(summary = "同步订单", description = "") + public R syncYieldOrder(@RequestParam String yoCode) { + Boolean result = yieldOrderService.syncYieldOrder(yoCode); + return R.status(result); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java index bd0ef73c6..cd1caab6e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -323,4 +323,11 @@ public interface IYieldOrderService extends BaseService { * @return */ Boolean saveYieldOrder(YieldOrder entity); + + /** + * 同步订单 + * @param yoCode + * @return + */ + Boolean syncYieldOrder(String yoCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 11524154a..51ad61071 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -57,6 +57,7 @@ import org.springblade.desk.order.service.IYieldOrderCraftService; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.produce.mapper.WorkOrderMapper; import org.springblade.desk.produce.pojo.entity.WorkOrder; +import org.springblade.erpdata.feign.IErpMesRbWoClient; import org.springblade.erpdata.feign.IErpYieldOrderClient; import org.springblade.scheduling.pojo.entity.PartRelationEntity; import org.springblade.scheduling.pojo.entity.QualityGradeEntity; @@ -169,6 +170,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl selectPage(IPage page, YieldOrderDto entity) { //烧结 热表订单 @@ -2026,6 +2030,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl voidR = mesRbWoClient.synPurchase(yoCode); + + return null; + } + /** * @param codeType 0:订单号、1：流程卡号；2、批次号 * @return String 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 f482859a9..38cb66179 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 @@ -57,8 +57,8 @@ public class ErpMesRbWoClient implements IErpMesRbWoClient { } @Override - public R synPurchase() { - erpMesRbWoService.synPurchase(); + public R synPurchase(String yoCode) { + erpMesRbWoService.synPurchase(yoCode); return R.success(); } 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 index 89f3e9701..fd4364f6a 100644 --- 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 @@ -1,6 +1,7 @@ package org.springblade.erpdata.mapper; import com.baomidou.mybatisplus.core.mapper.Mapper; +import org.apache.ibatis.annotations.Param; import org.springblade.erpdata.pojo.dto.view.MesRbPurtoso; import java.util.List; @@ -31,7 +32,7 @@ public interface ErpMesRbPurtosoMapper extends Mapper { * @param newlevdateMax * @return */ - List getMesRbPurtosoList(String newlevdateMax); + List getMesRbPurtosoList(@Param("newlevdateMax") String newlevdateMax,@Param("yoCode") String yoCode); /** * 获取ERP推进计划转工单的vcount * 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 index 8ba0d03ff..b4dbf5edb 100644 --- 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 @@ -28,6 +28,9 @@ AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') + + AND a.sono = #{yoCode} + order by a.newlevdate desc 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 index 642ee48ed..bbbe52309 100644 --- 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 @@ -26,7 +26,7 @@ public interface IErpMesRbPurtosoService { * @param newlevdateMax * @return */ - List getMesRbPurtosoList(String newlevdateMax); + List getMesRbPurtosoList(String newlevdateMax,String yoCode); /** * 获取vcount * @param prtno 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 3d084f33d..39c4e1878 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 @@ -31,7 +31,7 @@ public interface IErpMesRbWoService { R getWoOne(String ypCode); - void synPurchase(); + void synPurchase(String yoCode); /** * 同步临时数据 */ 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 index 22e6d9d34..b63db26e6 100644 --- 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 @@ -35,8 +35,8 @@ public class ErpMesRbPurtosoServiceImpl implements IErpMesRbPurtosoService { } @Override - public List getMesRbPurtosoList(String newlevdateMax) { - return mesRbPurtosoMapper.getMesRbPurtosoList(newlevdateMax); + public List getMesRbPurtosoList(String newlevdateMax,String yoCode) { + return mesRbPurtosoMapper.getMesRbPurtosoList(newlevdateMax,yoCode); } @Override 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 ddac3f5f6..668a96fa8 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 @@ -268,16 +268,20 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { */ @Override @Transactional(rollbackFor = Exception.class) - public void synPurchase() { - //用字典的code查更新日期 - String selectTime=apsOrderClient.getSelectTime("SYCN_TRANSFERCG_TIME1"); - //从ERP视图查询最大日期 -// String newlevdateMax=mesRbPurtosoService.getNewlevdateMax(selectTime); -// apsOrderClient.upByDateMax(newlevdateMax, "SYCN_TRANSFERCG_TIME1"); - List purtosoList=mesRbPurtosoService.getMesRbPurtosoList(selectTime); - if(!CollectionUtils.isEmpty(purtosoList)){ - apsOrderClient.upByDateMax(DateFormatUtils.format(purtosoList.get(0).getNewlevdate(),"yyyy-MM-dd HH:mm:ss"), "SYCN_TRANSFERCG_TIME1"); + public void synPurchase(String yoCode) { + List purtosoList = null; + if(StringUtils.isNotEmpty(yoCode)){ + purtosoList=mesRbPurtosoService.getMesRbPurtosoList(null,yoCode); + }else { + //用字典的code查更新日期 + String selectTime=apsOrderClient.getSelectTime("SYCN_TRANSFERCG_TIME1"); + //从ERP视图查询最大日期 + purtosoList=mesRbPurtosoService.getMesRbPurtosoList(selectTime,null); + if(!CollectionUtils.isEmpty(purtosoList)){ + apsOrderClient.upByDateMax(DateFormatUtils.format(purtosoList.get(0).getNewlevdate(),"yyyy-MM-dd HH:mm:ss"), "SYCN_TRANSFERCG_TIME1"); + } } + Gson gson = new Gson(); String jsonString = gson.toJson(purtosoList); log.info("qyl:同步物资转车间协作加工 data: {}", jsonString); @@ -292,14 +296,6 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setYoCode(mesRbPurtoso.getSono());//生产单号 yieldOrder.setBatchNo(mesRbPurtoso.getSplcode());//批次号 yieldOrder.setPartCode(mesRbPurtoso.getPrtno());//零件号 -// DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno()); -// if(part != null){ -// yieldOrder.setYpArea(part.getArea()); -// yieldOrder.setProductType(part.getProductType()); -// yieldOrder.setPartName(part.getPartName()); -// yieldOrder.setPrimaryCraft(part.getCraftWay()); -// yieldOrder.setPlate(part.getPlate()); -// } yieldOrder.setProductIdent(mesRbPurtoso.getPrtlotno()); yieldOrder.setUseDept(mesRbPurtoso.getPrtudept()); yieldOrder.setDemandDate(mesRbPurtoso.getSoreqdat());//需求日期