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

生产订单必填项

Browse Source
liweidong
qinyulong 2 weeks ago
parent 5e89fd8849
commit 86826c1be5
2 changed files with 25 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java
  2. 23
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

3
blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java
Unescape View File

@ -215,6 +215,9 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
yieldOrder.setRoamNoNext("");
yieldOrder.setYoCode(yoCode);
yieldOrder.setYpCode("");
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
yieldOrder.setPartCode(dsPartEntity.getPartCode());
yieldOrder.setPartName(dsPartEntity.getPartName());
yieldOrder.setProductIdent(yieldPlan.getProductIdent());

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

@ -273,6 +273,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
purtosoList.forEach(mesRbPurtoso -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpCode(mesRbPurtoso.getWono());
yieldOrder.setYpMemo("物资转车间协作加工");
yieldOrder.setManualIncrease(false);
@ -329,6 +332,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
pacturnrecordList.forEach(mesRbPacturnrecord -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpMemo("临时工艺转工");
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbPacturnrecord.getSono());//生产单号
@ -381,6 +387,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
rbtosoList.forEach(mesRbtoso -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号
yieldOrder.setBatchNo(mesRbtoso.getSplcode());//批次号
@ -426,6 +435,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
wxpromotionList.forEach(mesRbWxpromotion -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpMemo("推进计划");
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbWxpromotion.getSono());//生产单号
@ -479,6 +491,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
mesRbSodelrecwxList.forEach(mesRbSodelrecwx -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(false);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号
yieldOrder.setBatchNo(mesRbSodelrecwx.getSplcode());//批次号
@ -534,6 +549,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
mesRbSodelreczgList.forEach(mesRbSodelreczg -> {
//将查询出的数据放到单个的变量中
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpMemo("正式工艺转工");
yieldOrder.setManualIncrease(false);
yieldOrder.setYoCode(mesRbSodelreczg.getSono());//生产单号
@ -595,6 +613,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
mesRbPkList.forEach(mesRbPk -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYoCode(mesRbPk.getWono());//生产单号
yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号
yieldOrder.setPartCode(mesRbPk.getPrtno());//零件号
@ -614,7 +635,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setPkUsername(mesRbPk.getNewlevname());
yieldOrder.setPkDate(mesRbPk.getNewlevdate());
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
yieldOrder.setRoamNoNext( "");
yieldOrder.setRoamNoNext("");
if(StringUtils.isNotEmpty(mesRbPk.getFirseq())){
String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPk.getPrtno(),mesRbPk.getFirseq());
yieldOrder.setRoamNoNext(roamNoNext);//下级b号

Write Preview
Loading…
Cancel
Save