suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erp订单直接入库

Browse Source
liweidong
qinyulong 3 weeks ago
parent 1867fc3ddb
commit b8cb4a9df5
1 changed files with 53 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

100
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
Unescape View File

@ -302,7 +302,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
} }
yieldOrderList.add(yieldOrder); 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.setUseDeptCode(mesRbPacturnrecord.getUsedeptcode());
yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname()); yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname());
yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat()); yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat());
List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno()); // List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
yieldOrder.setYieldType(12001); // yieldOrder.setYieldType(12001);
if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ // if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){
yieldOrder.setYieldType(12002); // yieldOrder.setYieldType(12002);
} // }
yieldOrder.setRoamNoNext("");//下级b号 yieldOrder.setRoamNoNext("");//下级b号
if(StringUtils.isNotEmpty(mesRbPacturnrecord.getFirseq())){ if(StringUtils.isNotEmpty(mesRbPacturnrecord.getFirseq())){
String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPacturnrecord.getPrtno(),mesRbPacturnrecord.getFirseq()); String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPacturnrecord.getPrtno(),mesRbPacturnrecord.getFirseq());
@ -353,7 +354,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setEntrustDept(mesRbPacturnrecord.getDeptno()); yieldOrder.setEntrustDept(mesRbPacturnrecord.getDeptno());
yieldOrderList.add(yieldOrder); yieldOrderList.add(yieldOrder);
}); });
this.saveOrder(yieldOrderList); // this.saveOrder(yieldOrderList);
apsOrderClient.saveOrderList(yieldOrderList);
} }
/** /**
* 同步烧结数据 * 同步烧结数据
@ -397,7 +399,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
} }
yieldOrderList.add(yieldOrder); yieldOrderList.add(yieldOrder);
}); });
this.saveOrder(yieldOrderList); // this.saveOrder(yieldOrderList);
apsOrderClient.saveOrderList(yieldOrderList);
} }
/** /**
* 同步采购LOTTJ * 同步采购LOTTJ
@ -434,20 +437,20 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setUseDeptCode(mesRbWxpromotion.getPrtudeptcode()); yieldOrder.setUseDeptCode(mesRbWxpromotion.getPrtudeptcode());
yieldOrder.setPkUsername(mesRbWxpromotion.getNewlevname()); yieldOrder.setPkUsername(mesRbWxpromotion.getNewlevname());
yieldOrder.setPkDate(mesRbWxpromotion.getNewlevdate()); yieldOrder.setPkDate(mesRbWxpromotion.getNewlevdate());
List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno()); // List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno());
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); // yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
if (dsPartList != null && dsPartList.get(0).getCraftWay().contains("封接")) { // if (dsPartList != null && dsPartList.get(0).getCraftWay().contains("封接")) {
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); // yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
} // }
yieldOrder.setRoamNo("");//当前b号 yieldOrder.setRoamNo("");//当前b号
yieldOrder.setRoamNoNext("");//下级b号 yieldOrder.setRoamNoNext("");//下级b号
Long vCount=mesRbPartoplinkService.getVcount(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); // Long vCount=mesRbPartoplinkService.getVcount(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq());
if(vCount>0){ // if(vCount>0){
String roamNo=mesRbPartoplinkService.getRoamNo(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); // String roamNo=mesRbPartoplinkService.getRoamNo(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq());
yieldOrder.setRoamNo(roamNo);//当前b号 // yieldOrder.setRoamNo(roamNo);//当前b号
String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); // String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq());
yieldOrder.setRoamNoNext(roamNoNext);//下级b号 // yieldOrder.setRoamNoNext(roamNoNext);//下级b号
} // }
yieldOrderList.add(yieldOrder); yieldOrderList.add(yieldOrder);
}); });
apsOrderClient.saveOrderList(yieldOrderList); apsOrderClient.saveOrderList(yieldOrderList);
@ -488,21 +491,22 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setPkDate(mesRbSodelrecwx.getNewlevdate()); yieldOrder.setPkDate(mesRbSodelrecwx.getNewlevdate());
List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno()); List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno());
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ // if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); // yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
} // }
yieldOrder.setRoamNo("");//当前b号 yieldOrder.setRoamNo("");//当前b号
yieldOrder.setRoamNoNext("");//下级b号 yieldOrder.setRoamNoNext("");//下级b号
Long vCount=mesRbPartoplinkService.getVcount(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); Long vCount=mesRbPartoplinkService.getVcount(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq());
if(vCount>0){ // if(vCount>0){
String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); // String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq());
yieldOrder.setRoamNo(roamNo);//当前b号 // yieldOrder.setRoamNo(roamNo);//当前b号
String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq()); // String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq());
yieldOrder.setRoamNoNext(roamNoNext);//下级b号 // yieldOrder.setRoamNoNext(roamNoNext);//下级b号
} // }
yieldOrderList.add(yieldOrder); 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.setPkUsername(mesRbSodelreczg.getNewlevname());
yieldOrder.setPkDate(mesRbSodelreczg.getNewlevdate()); yieldOrder.setPkDate(mesRbSodelreczg.getNewlevdate());
//从零件表中查询零件信息 //从零件表中查询零件信息
List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno()); // List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno());
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); // yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
//若零件不为空，查询零件的工艺路线 // //若零件不为空，查询零件的工艺路线
if (dsPartList != null && dsPartList.get(0).getCraftWay().contains("封接")) { // if (dsPartList != null && dsPartList.get(0).getCraftWay().contains("封接")) {
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode()); // yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
} // }
yieldOrder.setRoamNo("");//当前b号 yieldOrder.setRoamNo("");//当前b号
yieldOrder.setRoamNoNext("");//下级b号 yieldOrder.setRoamNoNext("");//下级b号
//根据零件号和上级b号查询视图 //根据零件号和上级b号查询视图
Long vCount=mesRbPartoplinkService.getVcount(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); // Long vCount=mesRbPartoplinkService.getVcount(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq());
if(vCount>0){ // if(vCount>0){
//从ERP视图中查询当前B号 // //从ERP视图中查询当前B号
String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); // String roamNo=mesRbPartoplinkService.getRoamNo(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq());
yieldOrder.setRoamNo(roamNo);//当前b号 // yieldOrder.setRoamNo(roamNo);//当前b号
//从ERP视图中查询下级B号 // //从ERP视图中查询下级B号
String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq()); // String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq());
yieldOrder.setRoamNoNext(roamNoNext);//下级b号 // yieldOrder.setRoamNoNext(roamNoNext);//下级b号
} // }
yieldOrderList.add(yieldOrder); yieldOrderList.add(yieldOrder);
}); });
//调用通用保存方法，保存生产订单 //调用通用保存方法，保存生产订单
this.saveOrder(yieldOrderList); // this.saveOrder(yieldOrderList);
apsOrderClient.saveOrderList(yieldOrderList);
} }
/** /**
* 同步配套工单 * 同步配套工单
@ -609,7 +614,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
} }
yieldOrderList.add(yieldOrder); yieldOrderList.add(yieldOrder);
}); });
this.saveOrder(yieldOrderList); // this.saveOrder(yieldOrderList);
apsOrderClient.saveOrderList(yieldOrderList);
} }
/** /**

Write Preview
Loading…
Cancel
Save