修改计划相关

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

@@ -249,7 +249,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode());
 			this.updateById(yieldOrder);
 
-			if(yieldOrder.getValidationResult().equals(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode()) &&
+			if(yieldOrder.getValidationResult() != null &&
+					yieldOrder.getValidationResult().equals(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode()) &&
 					yieldOrder.getReceiveStatus().equals(YieldOrderEnum.RECEIVE_STATUS_YES.getCode())){
 				//订单状态为验证完成并且已接收 进行分派
 				boolean result = this.verifyYieldOrderResource(yieldOrder);
@@ -548,6 +549,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 							moldDemand.setNeedDate(yieldOrder.getDemandDate());
 							moldDemand.setQuaLevel(yieldOrder.getProductIdent());
 							moldDemand.setMdCode(generateMdCode());
+							moldDemand.setIsDeleted(0);
 							moldDemandMapper.insert(moldDemand);
 						}else{
 							moldDemand.setDemandNum(moldDemand.getDemandNum() + subPart.getQuota() * yieldOrder.getYpQty());
@@ -581,6 +583,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 						moldDemand.setNeedDate(yieldOrder.getDemandDate());
 						moldDemand.setQuaLevel(yieldOrder.getProductIdent());
 						moldDemand.setMdCode(generateMdCode());
+						moldDemand.setIsDeleted(0);
 						moldDemandMapper.insert(moldDemand);
 					}else{
 						moldDemand.setDemandNum(moldDemand.getDemandNum() + yieldOrder.getYpQty());
@@ -610,6 +613,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 						moldDemand.setNeedDate(yieldOrder.getDemandDate());
 						moldDemand.setQuaLevel(yieldOrder.getProductIdent());
 						moldDemand.setMdCode(generateMdCode());
+						moldDemand.setIsDeleted(0);
 						moldDemandMapper.insert(moldDemand);
 					}else{
 						moldDemand.setDemandNum(moldDemand.getDemandNum() + subPart.getQuota() * yieldOrder.getYpQty());
@@ -1322,11 +1326,11 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				throw new BusinessException("非石墨模玻璃饼子件面积为空无法创建生产订单！");
 			}
 			//验证子件是否存在二级工艺路线
-			dsCraftList = dsCraftService.listByPartId(dsPart.getId());
+//			dsCraftList = dsCraftService.listByPartId(dsPart.getId());
-			if (dsCraftList == null || dsCraftList.size() == 0) {
+//			if (dsCraftList == null || dsCraftList.size() == 0) {
-				String errMsg = MessageFormat.format("子件{}未编制二级工艺！", dsPartSub.getPartCode());
+//				String errMsg = MessageFormat.format("子件{}未编制二级工艺！", dsPartSub.getPartCode());
-				throw new BusinessException(errMsg);
+//				throw new BusinessException(errMsg);
-			}
+//			}
 
 			//获取金属件子件B号，如果未获取到，提示异常
 			String roamNo = null;
@@ -1335,10 +1339,10 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 					DsPartConstant.SIN_TER_TYPE_BLB.equals(dsPartSub.getSinTerType())
 			) {
 				roamNo = yieldOrderClient.getChildRoamNoByPartCode(dsPartSub.getPartCode());
-				if (StringUtils.isBlank(roamNo)) {
+//				if (StringUtils.isBlank(roamNo)) {
-					String errMsg = MessageFormat.format("子件{}未找到对应B号，请在ERP核查子件一级路线!", dsPartSub.getPartCode());
+//					String errMsg = MessageFormat.format("子件{}未找到对应B号，请在ERP核查子件一级路线!", dsPartSub.getPartCode());
-					throw new BusinessException(errMsg);
+//					throw new BusinessException(errMsg);
-				}
+//				}
 			}
 			YieldOrder subYield = BeanUtil.copy(yieldOrder, YieldOrder.class);
 			subYield.setId(null);
@@ -1355,13 +1359,14 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			subYield.setCardNo(nextCardNo());
 			subYield.setBatchNo(nextBatchNo());
 			subYield.setSiteWork(Boolean.TRUE);
-			subYield.setYpQty(yieldOrder.getYpQty() * dsPartSub.getQuota().intValue());
+			subYield.setYpQty(yieldOrder.getYpQty() * dsPartSub.getQuota());
 			subYield.setPrimaryCraft(dsPart.getCraftWay());
 			subYield.setRoamNo(roamNo);
 			subYield.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode());
 			subYield.setYieldType(yieldType);
 			subYield.setEntrustDept("热表分厂");
 			subYield.setBusinessType(-1);
+			subYield.setPlanDeptCode("3400");
 			//记录父订单的id
 			subYield.setParentYoId(yieldOrder.getId());
 			// 父件订单中无接收人信息时， 以当前人为接收人

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpYieldOrderMapper.xml

@@ -36,7 +36,7 @@
                 SELECT
                     a.*
                 FROM
-                    dba_mgr.v_mes_rb_partoplink
+                    dba_mgr.v_mes_rb_partoplink a
                 WHERE
                     a.prtno = #{partCode}
                   AND a.firseqname NOT LIKE '库%'