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 bd18e8f8..a2f4f81b 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 @@ -302,7 +302,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { } yieldOrderList.add(yieldOrder); }); - this.saveOrder(yieldOrderList); +// this.saveOrder(yieldOrderList); + apsOrderClient.saveOrderList(yieldOrderList); } /** * 同步临时工单 @@ -339,11 +340,11 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setUseDeptCode(mesRbPacturnrecord.getUsedeptcode()); yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname()); yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat()); - List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno()); - yieldOrder.setYieldType(12001); - if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ - yieldOrder.setYieldType(12002); - } +// List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno()); +// yieldOrder.setYieldType(12001); +// if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ +// yieldOrder.setYieldType(12002); +// } yieldOrder.setRoamNoNext("");//下级b号 if(StringUtils.isNotEmpty(mesRbPacturnrecord.getFirseq())){ String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPacturnrecord.getPrtno(),mesRbPacturnrecord.getFirseq()); @@ -353,7 +354,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setEntrustDept(mesRbPacturnrecord.getDeptno()); yieldOrderList.add(yieldOrder); }); - this.saveOrder(yieldOrderList); +// this.saveOrder(yieldOrderList); + apsOrderClient.saveOrderList(yieldOrderList); } /** * 同步烧结数据 @@ -397,7 +399,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { } yieldOrderList.add(yieldOrder); }); - this.saveOrder(yieldOrderList); +// this.saveOrder(yieldOrderList); + apsOrderClient.saveOrderList(yieldOrderList); } /** * 同步采购LOTTJ @@ -434,20 +437,20 @@ 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()); - } +// 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.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); @@ -488,21 +491,22 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { 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()); - } +// if(dsPartList!=null&&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); +// this.saveOrder(yieldOrderList); + apsOrderClient.saveOrderList(yieldOrderList); } /** * 同步工艺工单 @@ -542,28 +546,29 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { 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()); - } +// 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.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); }); //调用通用保存方法,保存生产订单 - this.saveOrder(yieldOrderList); +// this.saveOrder(yieldOrderList); + apsOrderClient.saveOrderList(yieldOrderList); } /** * 同步配套工单 @@ -609,7 +614,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { } yieldOrderList.add(yieldOrder); }); - this.saveOrder(yieldOrderList); +// this.saveOrder(yieldOrderList); + apsOrderClient.saveOrderList(yieldOrderList); } /**