修改合规性校验

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

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

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

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