From 0f92a14f28848c61fcf5733b9806c17320950edc Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 20 Apr 2026 21:15:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erpdata/pojo/dto/view/MesRbSjso.java | 2 +- .../pojo/dto/view/MesRbWxpromotion.java | 2 +- .../service/impl/ErpMesRbWoServiceImpl.java | 71 +++++++++++-------- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java index b95e6a65..1aebe479 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java @@ -40,7 +40,7 @@ public class MesRbSjso { private String prtudept; private Date soreqdat; private String soplanner; - private String soreldat; + private Date soreldat; private String rouclp; private String newlevsoqty; private String lewdept; diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java index c8fd4b64..07a2ae0e 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java @@ -48,7 +48,7 @@ public class MesRbWxpromotion { private String prtudept; private Date soreqdat; private String soplanner; - private String soreldat; + private Date soreldat; private String rouclp; private String newlevsoqty; private String warctlr; 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 82d306b8..609388db 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 @@ -23,6 +23,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.text.ParseException; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -309,13 +312,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPkUsername(mesRbPurtoso.getNewlevname()); yieldOrder.setPkDate(mesRbPurtoso.getNewlevdate()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); - yieldOrder.setReceiveTime(new Date()); +// yieldOrder.setReceiveTime(new Date()); yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); - yieldOrder.setReceiveUser(2038615120549822465L); - yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); +// yieldOrder.setReceiveUser(2038615120549822465L); +// yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + yieldOrder.setRoamNo(mesRbPurtoso.getFirseq()); yieldOrder = updateYieldType(yieldOrder,mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq()); /*List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno()); //若零件不为空，查询零件的工艺路线 @@ -375,7 +379,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { } yieldOrder.setProductIdent(mesRbPacturnrecord.getPrtlotno()); yieldOrder.setUseDept(mesRbPacturnrecord.getSedept()); - yieldOrder.setDemandDate(mesRbPacturnrecord.getOreqdat());//需求日期 + yieldOrder.setDemandDate(mesRbPacturnrecord.getWoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbPacturnrecord.getPlanner()); yieldOrder.setReleaseDate(mesRbPacturnrecord.getRecdate()); yieldOrder.setCardNo(mesRbPacturnrecord.getRouclp()); @@ -386,13 +390,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname()); yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); - yieldOrder.setReceiveTime(new Date()); +// yieldOrder.setReceiveTime(new Date()); yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); - yieldOrder.setReceiveUser(2038615120549822465L); - yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); +// yieldOrder.setReceiveUser(2038615120549822465L); +// yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + yieldOrder.setRoamNo(mesRbPacturnrecord.getFirseq()); if(part != null && part.getCraftWay() != null && part.getCraftWay().contains("封接")){ yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); } @@ -449,7 +454,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDept(mesRbtoso.getPrtudept()); yieldOrder.setDemandDate(mesRbtoso.getSoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbtoso.getSoplanner()); - yieldOrder.setReleaseDate(mesRbtoso.getSoreqdat()); + yieldOrder.setReleaseDate(mesRbtoso.getSoreldat()); yieldOrder.setCardNo(mesRbtoso.getRouclp()); yieldOrder.setYpQty(Double.valueOf(mesRbtoso.getNewlevsoqty()));//生产数量 yieldOrder.setCustodian(mesRbtoso.getWarctlr());//保管员 @@ -458,13 +463,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPkUsername(mesRbtoso.getNewlevname()); yieldOrder.setPkDate(mesRbtoso.getNewlevdate()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); - yieldOrder.setReceiveTime(new Date()); +// yieldOrder.setReceiveTime(new Date()); yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); - yieldOrder.setReceiveUser(2038615120549822465L); - yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); +// yieldOrder.setReceiveUser(2038615120549822465L); +// yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + yieldOrder.setRoamNo(mesRbtoso.getFirseq()); yieldOrder.setRoamNoNext( ""); if(StringUtils.isNotEmpty(mesRbtoso.getFirseq())){ String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbtoso.getPrtno(),mesRbtoso.getFirseq()); @@ -516,7 +522,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDept(mesRbWxpromotion.getPrtudept()); yieldOrder.setDemandDate(mesRbWxpromotion.getSoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbWxpromotion.getSoplanner()); - yieldOrder.setReleaseDate(mesRbWxpromotion.getSoreqdat()); + yieldOrder.setReleaseDate(mesRbWxpromotion.getSoreldat()); yieldOrder.setCardNo(mesRbWxpromotion.getRouclp()); yieldOrder.setYpQty(Double.valueOf(mesRbWxpromotion.getNewlevsoqty()));//生产数量 yieldOrder.setCustodian(mesRbWxpromotion.getWarctlr());//保管员 @@ -524,14 +530,15 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDeptCode(mesRbWxpromotion.getPrtudeptcode()); yieldOrder.setPkUsername(mesRbWxpromotion.getNewlevname()); yieldOrder.setPkDate(mesRbWxpromotion.getNewlevdate()); - yieldOrder.setReceiveTime(new Date()); +// yieldOrder.setReceiveTime(new Date()); yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); - yieldOrder.setReceiveUser(2038615120549822465L); - yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); +// yieldOrder.setReceiveUser(2038615120549822465L); +// yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + yieldOrder.setRoamNo(mesRbWxpromotion.getFirseq()); yieldOrder = updateYieldType(yieldOrder,mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); /*List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); @@ -549,7 +556,12 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { }*/ yieldOrderList.add(yieldOrder); }); - apsOrderClient.saveOrderList(yieldOrderList); + if(!CollectionUtils.isEmpty(yieldOrderList)){ + apsOrderClient.saveOrderList(yieldOrderList); + }else { + log.info("同步采购LOTTJ数据为空"); + } + } /** * 同步外协工单 @@ -592,7 +604,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDept(mesRbSodelrecwx.getPrtudept()); yieldOrder.setDemandDate(mesRbSodelrecwx.getSoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbSodelrecwx.getSoplanner()); - yieldOrder.setReleaseDate(mesRbSodelrecwx.getSoreqdat()); + yieldOrder.setReleaseDate(mesRbSodelrecwx.getSoreldat()); yieldOrder.setCardNo(mesRbSodelrecwx.getRouclp()); yieldOrder.setYpQty(Double.valueOf(mesRbSodelrecwx.getNewlevsoqty()));//生产数量 yieldOrder.setCustodian(mesRbSodelrecwx.getWarctlr());//保管员 @@ -601,13 +613,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPkUsername(mesRbSodelrecwx.getNewlevname()); yieldOrder.setPkDate(mesRbSodelrecwx.getNewlevdate()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); - yieldOrder.setReceiveTime(new Date()); +// yieldOrder.setReceiveTime(new Date()); yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); - yieldOrder.setReceiveUser(2038615120549822465L); - yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); +// yieldOrder.setReceiveUser(2038615120549822465L); +// yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + yieldOrder.setRoamNo(mesRbSodelrecwx.getFirseq()); yieldOrder = updateYieldType(yieldOrder,mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); /*List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno()); if(CollectionUtils.isNotEmpty(dsPartList)&&dsPartList.get(0).getCraftWay().contains("封接")){ @@ -670,7 +683,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDept(mesRbSodelreczg.getPrtudept()); yieldOrder.setDemandDate(mesRbSodelreczg.getSoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbSodelreczg.getSoplanner()); - yieldOrder.setReleaseDate(mesRbSodelreczg.getSoreqdat()); + yieldOrder.setReleaseDate(mesRbSodelreczg.getSoreldat()); yieldOrder.setCardNo(mesRbSodelreczg.getRouclp()); yieldOrder.setYpQty(Double.valueOf(mesRbSodelreczg.getNewlevsoqty()));//生产数量 yieldOrder.setCustodian(mesRbSodelreczg.getWarctlr());//保管员 @@ -678,14 +691,15 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDeptCode(mesRbSodelreczg.getPrtudeptcode()); yieldOrder.setPkUsername(mesRbSodelreczg.getNewlevname()); yieldOrder.setPkDate(mesRbSodelreczg.getNewlevdate()); - yieldOrder.setReceiveTime(new Date()); +// yieldOrder.setReceiveTime(new Date()); yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); - yieldOrder.setReceiveUser(2038615120549822465L); - yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); +// yieldOrder.setReceiveUser(2038615120549822465L); +// yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + yieldOrder.setRoamNo(mesRbSodelreczg.getFirseq()); yieldOrder = updateYieldType(yieldOrder,mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); /*//从零件表中查询零件信息 List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno()); @@ -752,7 +766,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDept(mesRbPk.getPrtudept()); yieldOrder.setDemandDate(mesRbPk.getSoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbPk.getSoplanner()); - yieldOrder.setReleaseDate(mesRbPk.getSoreqdat()); + yieldOrder.setReleaseDate(mesRbPk.getSoreldat()); yieldOrder.setCardNo(mesRbPk.getRouclp()); yieldOrder.setYpQty(Double.valueOf(mesRbPk.getNewlevsoqty()));//生产数量 yieldOrder.setCustodian(mesRbPk.getWarctlr());//保管员 @@ -764,13 +778,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPkUsername(mesRbPk.getNewlevname()); yieldOrder.setPkDate(mesRbPk.getNewlevdate()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); - yieldOrder.setReceiveTime(new Date()); +// yieldOrder.setReceiveTime(new Date()); yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); - yieldOrder.setReceiveUser(2038615120549822465L); - yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); +// yieldOrder.setReceiveUser(2038615120549822465L); +// yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode()); yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + yieldOrder.setRoamNo(mesRbPk.getFirseq()); yieldOrder.setRoamNoNext(""); if(StringUtils.isNotEmpty(mesRbPk.getFirseq())){ String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPk.getPrtno(),mesRbPk.getFirseq());