From cca0fbdf4cc0a3f8f8811ff5b896a3efd8786574 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Thu, 2 Apr 2026 20:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/feign/IApsOrderClient.java | 2 +- .../feign/IErpPartoplinkFirseqClient.java | 3 +- .../erpdata/pojo/dto/view/MesRbPurtoso.java | 2 +- .../erpdata/pojo/dto/view/MesRbWo.java | 1 + .../desk/order/feign/ApsOrderClient.java | 21 +- .../impl/YieldOrderCraftServiceImpl.java | 7 + .../mapper/ErpMesRbPartoplinkMapper.xml | 8 +- .../mapper/ErpPartoplinkFirseqMapper.xml | 2 +- .../service/impl/ErpMesRbWoServiceImpl.java | 195 ++++++++++++------ .../service/impl/WorkOrderServiceImpl.java | 4 +- 10 files changed, 164 insertions(+), 81 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java index bc1200d9..79a738cc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java @@ -68,7 +68,7 @@ public interface IApsOrderClient { @PostMapping(GET_SELECT_TIME) String getSelectTime(@RequestParam("sycnTime") String sycnTime); @GetMapping(GET_CRAFT_CODE) - List getDsCraftListByCode(@RequestParam("prtno") String prtno); + DsPartEntity getDsCraftListByCode(@RequestParam("prtno") String prtno); @PostMapping(SAVE_ORDER_LIST) void saveOrderList(@RequestBody List yieldOrderList); @GetMapping (UP_DATE_MAX) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpPartoplinkFirseqClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpPartoplinkFirseqClient.java index df1922ec..608ce9c1 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpPartoplinkFirseqClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpPartoplinkFirseqClient.java @@ -6,6 +6,7 @@ import org.springblade.core.tool.api.R; import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -30,5 +31,5 @@ public interface IErpPartoplinkFirseqClient { * @return */ @GetMapping(LIST_BY_PART_CODE) - R> listByPartCode(String partCode); + R> listByPartCode(@RequestParam("partCode") String partCode); } 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 27419d3e..9e3679a8 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 @@ -39,7 +39,7 @@ public class MesRbPurtoso { private String prtudept; private Date soreqdat; private String soplanner; - private String soreldat; + private Date soreldat; private String rouclp; private String splcode; private String newlevsoqty; 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 8bd2b24c..437e5d16 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 @@ -35,4 +35,5 @@ public class MesRbWo { private String processline; //工艺路线 private String processlinedesc; //工艺路线详情 private String prodline; //产品系列 + private Double prtarea; //单件面积平方毫米 } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java index 08331967..3517b9b0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java @@ -3,13 +3,17 @@ package org.springblade.desk.order.feign; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.v3.oas.annotations.Hidden; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; +import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity; import org.springblade.desk.dashboard.service.IDsCraftService; import org.springblade.desk.dashboard.service.IDsPartService; +import org.springblade.desk.dashboard.service.IDsPartVersionService; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.desk.order.service.IYieldOrderService; @@ -17,6 +21,7 @@ import org.springblade.desk.order.service.IYieldPlanService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Comparator; import java.util.List; /** @@ -38,6 +43,8 @@ public class ApsOrderClient implements IApsOrderClient { private final IDsPartService dsPartService; + private final IDsPartVersionService dsPartVersionService; + //private final IErpMesRbWoClient mesRbWoClient; @Override @@ -117,9 +124,17 @@ public class ApsOrderClient implements IApsOrderClient { return yieldPlanService.getSelectTime(sycnTime); } @Override - public List getDsCraftListByCode(String prtno) { - return dsPartService.list(new QueryWrapper().lambda() - .eq(DsPartEntity::getPartCode, prtno)); + public DsPartEntity getDsCraftListByCode(String prtno) { + DsPartEntity part = null; + List partVersionList = dsPartVersionService.list(Wrappers.lambdaQuery().eq(DsPartVersionEntity::getPartCode,prtno)); + if(CollectionUtils.isNotEmpty(partVersionList)){ + Long partId = partVersionList.stream() + .max(Comparator.comparing(DsPartVersionEntity::getPartVersion)) + .map(DsPartVersionEntity::getPartId) + .orElse(null); + part = dsPartService.getById(partId); + } + return part; } @Override diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java index 89b11e2d..6921931b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java @@ -72,6 +72,13 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl craftList = baseMapper.selectList(queryWrapper); + craftList.stream().forEach(item ->{ + BsProcessSetEntity processSet = processSetService.getById(item.getPpsId()); + if(processSet != null){ + item.setProcessCode(processSet.getCode()); + item.setProcessName(processSet.getName()); + } + }); return craftList; } 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 index e84c4441..619c8d91 100644 --- 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 @@ -9,12 +9,8 @@ SELECT count(1) as vCount FROM dba_mgr.v_mes_rb_partoplink a - - AND a.prtno = #{prtno} - - - AND a.firseq = #{firseq} - + a.prtno = #{prtno} + AND a.firseq = #{firseq} - select a.partno as partcode, a.partname, a.firpp, a.firppname, a.firseq, a.firseqname, a.firseqno + select a.prtno as partcode, a.prtname as partname, a.firpp, a.firppname, a.firseq, a.firseqname, a.firseqno from dba_mgr.v_partoplink_firseq a where prtno = #{partCode} 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 14b2e433..60837cdc 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 @@ -4,7 +4,9 @@ import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; import org.springblade.core.tool.api.R; import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; @@ -22,6 +24,7 @@ import org.springblade.system.cache.DictCache; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @@ -154,28 +157,21 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { List yieldPlanList=new ArrayList<>(); mesRbWoList.forEach(mesRbWo -> { YieldPlan yieldPlan=new YieldPlan(); - mesRbWo.getPlnsign(); - mesRbWo.getWorelstat(); - mesRbWo.getWoexcstat(); - mesRbWo.getPrtmeterial(); - mesRbWo.getRigidity(); - mesRbWo.getProcesslinedesc(); - mesRbWo.getPlndept(); yieldPlan.setProductIdent(mesRbWo.getPrtlotno()); yieldPlan.setYpQty(Long.valueOf(mesRbWo.getWoporqty())); + DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbWo.getPrtno()); + if(part != null){ + yieldPlan.setYpArea(part.getArea()); + yieldPlan.setProductType(part.getProductType()); + yieldPlan.setPartName(part.getPartName()); + yieldPlan.setPrimaryCraft(part.getCraftWay()); + } + yieldPlan.setUseDept(Long.valueOf(mesRbWo.getPlndept())); yieldPlan.setPlate(mesRbWo.getKdofplat()); - yieldPlan.setPartName(mesRbWo.getPrtdesc()); yieldPlan.setMemo(mesRbWo.getRemark()); yieldPlan.setDominantDept(mesRbWo.getPrtmdept()); - yieldPlan.setPrimaryCraft(mesRbWo.getProcessline()); yieldPlan.setProductLine(mesRbWo.getProdline()); yieldPlan.setPlanType(Long.valueOf(YieldPlanEnum.PLAN_TYPE_1.getCode()));//赋值默认值12001 - -// if(mesRbWo.getProcesslinedesc().contains("封接") -// ||"LX08-05-028,LX08-05-030,LX08-05-031".contains(mesRbWo.getProcessline())){ -// yieldPlan.setPlanType(12002L); -// yieldPlan.setPlate("烧结电镀"); -// } if (StringUtils.isNotEmpty(mesRbWo.getProcesslinedesc())) { List targetProcessLines = Arrays.asList("LX08-05-028", "LX08-05-030", "LX08-05-031"); if (mesRbWo.getProcesslinedesc().contains("封接") @@ -190,9 +186,13 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldPlan.setRoamNo(""); yieldPlan.setYpCode(mesRbWo.getWono()); yieldPlan.setPartCode(mesRbWo.getPrtno()); - yieldPlan.setProductIdent(mesRbWo.getWoreqdat()); - yieldPlan.setYpQty(Long.valueOf(mesRbWo.getWoporqty())); - yieldPlan.setDemandDate(mesRbWo.getWopordat()); + try { + yieldPlan.setDemandDate(DateUtils.parseDate(mesRbWo.getWoreqdat(),"yyyy-MM-dd HH:mm:ss")); + } catch (ParseException e) { + throw new RuntimeException(e); + } + yieldPlan.setYpQty(Long.valueOf(mesRbWo.getWoporqty())); + yieldPlan.setReleaseDate(mesRbWo.getWopordat()); yieldPlanList.add(yieldPlan); }); @@ -280,13 +280,13 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setYpMemo("物资转车间协作加工"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbPurtoso.getSono());//生产单号 - yieldOrder.setBatchNo(mesRbPurtoso.getQutno());//批次号 + yieldOrder.setBatchNo(mesRbPurtoso.getSplcode());//批次号 yieldOrder.setPartCode(mesRbPurtoso.getPrtno());//零件号 yieldOrder.setProductIdent(mesRbPurtoso.getPrtlotno()); yieldOrder.setUseDept(mesRbPurtoso.getPrtudept()); yieldOrder.setDemandDate(mesRbPurtoso.getSoreqdat());//需求日期 yieldOrder.setPlanUser(mesRbPurtoso.getSoplanner()); - yieldOrder.setReleaseDate(mesRbPurtoso.getSoreqdat()); + yieldOrder.setReleaseDate(mesRbPurtoso.getSoreldat()); yieldOrder.setCardNo(mesRbPurtoso.getRouclp()); yieldOrder.setYpQty(Double.valueOf(mesRbPurtoso.getNewlevsoqty()));//生产数量 yieldOrder.setCustodian(mesRbPurtoso.getWarctlr());//保管员 @@ -294,10 +294,16 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDeptCode(mesRbPurtoso.getPrtudeptcode()); yieldOrder.setPkUsername(mesRbPurtoso.getNewlevname()); yieldOrder.setPkDate(mesRbPurtoso.getNewlevdate()); - List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); + yieldOrder.setReceiveTime(new Date()); + yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); + yieldOrder.setReceiveUser(2038615120549822465L); + yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); + yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); + yieldOrder = updateYieldType(yieldOrder,mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq()); + /*List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno()); //若零件不为空，查询零件的工艺路线 - if (dsPartList != null && dsPartList.get(0).getCraftWay().contains("封接")) { + if (CollectionUtils.isNotEmpty(dsPartList) && dsPartList.get(0).getCraftWay().contains("封接")) { yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); } yieldOrder.setRoamNo("");//当前b号 @@ -308,7 +314,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setRoamNo(roamNo);//当前b号 String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq()); yieldOrder.setRoamNoNext(roamNoNext);//下级b号 - } + }*/ yieldOrderList.add(yieldOrder); }); // this.saveOrder(yieldOrderList); @@ -346,17 +352,22 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPlanUser(mesRbPacturnrecord.getPlanner()); yieldOrder.setReleaseDate(mesRbPacturnrecord.getRecdate()); yieldOrder.setCardNo(mesRbPacturnrecord.getRouclp()); - yieldOrder.setYpQty(Double.valueOf(mesRbPacturnrecord.getRecsoqty()));//生产数量 + yieldOrder.setYpQty(Double.valueOf(mesRbPacturnrecord.getSeqavlqty()));//生产数量 yieldOrder.setCustodian(mesRbPacturnrecord.getWarctlr());//保管员 yieldOrder.setEntrustDept(mesRbPacturnrecord.getUsedept()); yieldOrder.setUseDeptCode(mesRbPacturnrecord.getUsedeptcode()); yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname()); yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat()); -// List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); -// if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ -// yieldOrder.setYieldType(12002); -// } + 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); + DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno()); + if(part != null && part.getCraftWay() != null && part.getCraftWay().contains("封接")){ + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); + } yieldOrder.setRoamNoNext("");//下级b号 if(StringUtils.isNotEmpty(mesRbPacturnrecord.getFirseq())){ String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPacturnrecord.getPrtno(),mesRbPacturnrecord.getFirseq()); @@ -407,6 +418,11 @@ 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.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); + yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); + yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); + yieldOrder.setReceiveUser(2038615120549822465L); yieldOrder.setRoamNoNext( ""); if(StringUtils.isNotEmpty(mesRbtoso.getFirseq())){ String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbtoso.getPrtno(),mesRbtoso.getFirseq()); @@ -455,20 +471,27 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDeptCode(mesRbWxpromotion.getPrtudeptcode()); yieldOrder.setPkUsername(mesRbWxpromotion.getNewlevname()); yieldOrder.setPkDate(mesRbWxpromotion.getNewlevdate()); -// List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno()); -// yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); -// if (dsPartList != null && dsPartList.get(0).getCraftWay().contains("封接")) { -// yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); -// } + yieldOrder.setReceiveTime(new Date()); + yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); + yieldOrder.setReceiveUser(2038615120549822465L); + yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); + yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); + yieldOrder = updateYieldType(yieldOrder,mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); + /*List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno()); + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); + if (CollectionUtils.isNotEmpty(dsPartList) && dsPartList.get(0).getCraftWay().contains("封接")) { + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); + } yieldOrder.setRoamNo("");//当前b号 yieldOrder.setRoamNoNext("");//下级b号 -// Long vCount=mesRbPartoplinkService.getVcount(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); -// if(vCount>0){ -// String roamNo=mesRbPartoplinkService.getRoamNo(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); -// yieldOrder.setRoamNo(roamNo);//当前b号 -// String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); -// yieldOrder.setRoamNoNext(roamNoNext);//下级b号 -// } + Long vCount=mesRbPartoplinkService.getVcount(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); + if(vCount>0){ + String roamNo=mesRbPartoplinkService.getRoamNo(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); + yieldOrder.setRoamNo(roamNo);//当前b号 + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + }*/ yieldOrderList.add(yieldOrder); }); apsOrderClient.saveOrderList(yieldOrderList); @@ -510,20 +533,26 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDeptCode(mesRbSodelrecwx.getPrtudeptcode()); yieldOrder.setPkUsername(mesRbSodelrecwx.getNewlevname()); yieldOrder.setPkDate(mesRbSodelrecwx.getNewlevdate()); - List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); -// if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ -// yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); -// } + yieldOrder.setReceiveTime(new Date()); + yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); + yieldOrder.setReceiveUser(2038615120549822465L); + yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); + yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); + yieldOrder = updateYieldType(yieldOrder,mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); + /*List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno()); + if(CollectionUtils.isNotEmpty(dsPartList)&&dsPartList.get(0).getCraftWay().contains("封接")){ + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); + } yieldOrder.setRoamNo("");//当前b号 yieldOrder.setRoamNoNext("");//下级b号 Long vCount=mesRbPartoplinkService.getVcount(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); -// if(vCount>0){ -// String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); -// yieldOrder.setRoamNo(roamNo);//当前b号 -// String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); -// yieldOrder.setRoamNoNext(roamNoNext);//下级b号 -// } + if(vCount>0){ + String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); + yieldOrder.setRoamNo(roamNo);//当前b号 + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + }*/ yieldOrderList.add(yieldOrder); }); // this.saveOrder(yieldOrderList); @@ -569,25 +598,31 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDeptCode(mesRbSodelreczg.getPrtudeptcode()); yieldOrder.setPkUsername(mesRbSodelreczg.getNewlevname()); yieldOrder.setPkDate(mesRbSodelreczg.getNewlevdate()); - //从零件表中查询零件信息 -// List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno()); -// yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); -// //若零件不为空，查询零件的工艺路线 -// if (dsPartList != null && dsPartList.get(0).getCraftWay().contains("封接")) { -// yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); -// } + yieldOrder.setReceiveTime(new Date()); + yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); + yieldOrder.setReceiveUser(2038615120549822465L); + yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); + yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); + yieldOrder = updateYieldType(yieldOrder,mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); + /*//从零件表中查询零件信息 + List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno()); + //若零件不为空，查询零件的工艺路线 + if (CollectionUtils.isNotEmpty(dsPartList) && dsPartList.get(0).getCraftWay().contains("封接")) { + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); + } yieldOrder.setRoamNo("");//当前b号 yieldOrder.setRoamNoNext("");//下级b号 //根据零件号和上级b号查询视图 -// Long vCount=mesRbPartoplinkService.getVcount(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); -// if(vCount>0){ -// //从ERP视图中查询当前B号 -// String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); -// yieldOrder.setRoamNo(roamNo);//当前b号 -// //从ERP视图中查询下级B号 -// String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); -// yieldOrder.setRoamNoNext(roamNoNext);//下级b号 -// } + Long vCount=mesRbPartoplinkService.getVcount(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); + if(vCount>0){ + //从ERP视图中查询当前B号 + String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); + yieldOrder.setRoamNo(roamNo);//当前b号 + //从ERP视图中查询下级B号 + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + }*/ yieldOrderList.add(yieldOrder); }); log.info("qyl:同步工艺工单 data: {}", gson.toJson(yieldOrderList)); @@ -635,6 +670,11 @@ 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.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); + yieldOrder.setReceiveUser(2038615120549822465L); + yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode()); + yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode()); yieldOrder.setRoamNoNext(""); if(StringUtils.isNotEmpty(mesRbPk.getFirseq())){ String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPk.getPrtno(),mesRbPk.getFirseq()); @@ -655,4 +695,27 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { apsOrderClient.saveOrder(yieldOrderList); // apsOrderClient.saveOrderList(yieldOrderList); } + + private YieldOrder updateYieldType(YieldOrder yieldOrder,String pritno,String firseq){ + //从零件表中查询零件信息 + DsPartEntity part=apsOrderClient.getDsCraftListByCode(pritno); + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); + //若零件不为空，查询零件的工艺路线 + if (part != null && part.getCraftWay() != null && part.getCraftWay().contains("封接")) { + yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); + } + yieldOrder.setRoamNo("");//当前b号 + yieldOrder.setRoamNoNext("");//下级b号 + //根据零件号和上级b号查询视图 + Long vCount=mesRbPartoplinkService.getVcount(pritno,firseq); + if(vCount>0){ + //从ERP视图中查询当前B号 + String roamNo=mesRbPartoplinkService.getRoamNo(pritno,firseq); + yieldOrder.setRoamNo(roamNo);//当前b号 + //从ERP视图中查询下级B号 + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(pritno,firseq); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + } + return yieldOrder; + } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index e54db8fa..9f08b46e 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -952,9 +952,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl