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

修改合规性校验

Browse Source
liweidong
liweidong-hj 2 days ago
parent 8fdb320417
commit 3cd929cce5
2 changed files with 9 additions and 5 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. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java
  2. 12
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

2
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java
Unescape View File

@ -30,7 +30,7 @@ public enum MoldDemandEnum {
* 状态枚举; 11001、新建，11002:已下发，11003、已完成 * 状态枚举; 11001、新建，11002:已下发，11003、已完成
*/ */
MAF_STATUS_CREATE("新建", 11001), MAF_STATUS_CREATE("新建", 11001),
MAF_STATUS_SEND("已下发", 11002), MAF_STATUS_SEND("已申报", 11002),
MAF_STATUS_DONE("已关闭", 11003), MAF_STATUS_DONE("已关闭", 11003),
/** /**

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

@ -533,12 +533,15 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
if(moldDemand == null){ if(moldDemand == null){
moldDemand = new MoldDemand(); moldDemand = new MoldDemand();
moldDemand.setMoCode(null); moldDemand.setMoCode(null);
moldDemand.setPartCode(subPart.getPartCode()); moldDemand.setPartCode(yieldOrder.getPartCode());
moldDemand.setPartName(subPart.getPartName()); moldDemand.setPartName(yieldOrder.getPartName());
moldDemand.setToolCode(subPart.getPartCode());
moldDemand.setToolName(subPart.getPartName());
moldDemand.setDemandNum(subPart.getQuota() * yieldOrder.getYpQty()); moldDemand.setDemandNum(subPart.getQuota() * yieldOrder.getYpQty());
moldDemand.setLinkOrderIds(yieldOrder.getId().toString()); moldDemand.setLinkOrderIds(yieldOrder.getId().toString());
moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode()); // moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode()); moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
moldDemand.setMafType(MoldDemandEnum.MAF_TYPE_RB.getCode());
moldDemand.setNeedDate(yieldOrder.getDemandDate()); moldDemand.setNeedDate(yieldOrder.getDemandDate());
moldDemand.setQuaLevel(yieldOrder.getProductIdent()); moldDemand.setQuaLevel(yieldOrder.getProductIdent());
moldDemandMapper.insert(moldDemand); moldDemandMapper.insert(moldDemand);
@ -567,8 +570,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
moldDemand.setToolCode(processMoldToolList.get(0).getMoldCode()); moldDemand.setToolCode(processMoldToolList.get(0).getMoldCode());
moldDemand.setToolName(processMoldToolList.get(0).getMoldName()); moldDemand.setToolName(processMoldToolList.get(0).getMoldName());
moldDemand.setLinkOrderIds(yieldOrder.getId().toString()); moldDemand.setLinkOrderIds(yieldOrder.getId().toString());
moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode()); // moldDemand.setStatus(MoldDemandEnum.STATUS_WAITING.getCode());
moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode()); moldDemand.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
moldDemand.setMafType(MoldDemandEnum.MAF_TYPE_RB.getCode());
moldDemand.setNeedDate(yieldOrder.getDemandDate()); moldDemand.setNeedDate(yieldOrder.getDemandDate());
moldDemand.setQuaLevel(yieldOrder.getProductIdent()); moldDemand.setQuaLevel(yieldOrder.getProductIdent());
moldDemandMapper.insert(moldDemand); moldDemandMapper.insert(moldDemand);

Write Preview
Loading…
Cancel
Save