diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
index 88dffb08..1eaa1d2a 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
@@ -469,6 +469,12 @@ public class YieldOrder extends BaseEntity {
 	@TableField(value = "craft_id")
 	private Long craftId;
 
+	/**
+	 * 计划部门
+	 */
+	@TableField(value = "plan_deptcode")
+	private String planDeptCode;
+
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double plateThickness1;
 
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java
index 69c3d74a..3f7bae12 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java
@@ -55,4 +55,5 @@ public class MesRbPacturnrecord {
     private String warctlr;
     private String usedeptcode;
     private String conductor;
+    private String plndeptcode; //计划部门
 }
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java
index 811064dd..66530487 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java
@@ -55,4 +55,5 @@ public class MesRbPk {
     private String prtudeptcode;
     private String newlevname;
     private Date newlevdate;
+    private String plndeptcode; //计划部门
 }
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java
index 9e3679a8..00ee13db 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java
@@ -48,4 +48,5 @@ public class MesRbPurtoso {
     private String prtudeptcode;
     private String newlevname;
     private Date newlevdate;
+    private String plndeptcode;  //计划部门
 }
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java
index 1aebe479..4dd0bc55 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java
@@ -48,4 +48,5 @@ public class MesRbSjso {
     private String prtudeptcode;
     private String newlevname;
     private Date newlevdate;
+    private String plndeptcode; //计划部门
 }
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java
index c1fb7335..be8a7e20 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java
@@ -56,4 +56,5 @@ public class MesRbSodelrecwx {
     private String prtudeptcode;
     private String newlevname;
     private Date newlevdate;
+    private String plndeptcode; //计划部门
 }
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java
index 5de956d4..48c00cfa 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java
@@ -56,4 +56,5 @@ public class MesRbSodelreczg {
     private String prtudeptcode;
     private String newlevname;
     private Date newlevdate;
+    private String plndeptcode; //计划部门
 }
diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java
index 07a2ae0e..ec0d3922 100644
--- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java
+++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java
@@ -56,4 +56,5 @@ public class MesRbWxpromotion {
     private String prtudeptcode;
     private String newlevname;
     private Date newlevdate;
+    private String plndeptcode; //计划部门
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml
index bd6955f0..eeced584 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml
@@ -115,7 +115,7 @@
         <if test = "entity.toolCode != null and entity.toolCode != ''">
             AND a.TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%'))
         </if>
-        <if test = "entity.toolCode != null and entity.toolCode != ''">
+        <if test = "entity.mafStatus != null and entity.mafStatus != ''">
             AND a.MAF_STATUS  = #{entity.mafStatus}
         </if>
     </select>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index f7e2ed92..d02b676c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -342,19 +342,39 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			return false;
 		}
 
-		// 2. 当生产订单类型为：表处理，壳体，插针订单，当镀种为空或面积为0时，不得自动分派并提示
-		if (YieldOrderEnum.YIELD_TYPE_1.equals(yieldOrder.getYieldType())
-			|| YieldOrderEnum.YIELD_TYPE_4.equals(yieldOrder.getYieldType())
-			|| YieldOrderEnum.YIELD_TYPE_5.equals(yieldOrder.getYieldType())) {
-			if (StringUtils.isBlank(yieldOrder.getPlate()) || yieldOrder.getYpArea() == 0) {
-				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode());
-				yieldOrder.setValidationTime(DateUtil.now());
-				yieldOrder.setValidationMomo("生产订单中镀种或面积为空，请维护基础数据");
-				this.updateById(yieldOrder);
-				return false;
-			}
+		//校验批次号、生产标识、使用部门、数量、计划员、计划下达时间、需求交期字段是否为空，为空标记为【数据缺失-16002】
+		List<String> emptyFields = new ArrayList<>();
+		if (StringUtils.isEmpty(yieldOrder.getBatchNo())) emptyFields.add("批次号");
+		if (StringUtils.isEmpty(yieldOrder.getProductIdent())) emptyFields.add("生产标识");
+		if (StringUtils.isEmpty(yieldOrder.getUseDept())) emptyFields.add("使用部门");
+		if (Objects.isNull(yieldOrder.getYpQty()) || yieldOrder.getYpQty() == 0.0) emptyFields.add("数量");
+		if (StringUtils.isEmpty(yieldOrder.getPlanUser())) emptyFields.add("计划员");
+		if (Objects.isNull(yieldOrder.getReleaseDate())) emptyFields.add("计划下达时间");
+		if (Objects.isNull(yieldOrder.getDemandDate())) emptyFields.add("需求交期");
+		if (StringUtils.isEmpty(yieldOrder.getUseDeptCode())) emptyFields.add("使用部门代码");
+		if (!emptyFields.isEmpty()) {
+			String errorMsg = "以下字段不能为空：" + String.join("、", emptyFields);
+			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode());
+			yieldOrder.setValidationTime(DateUtil.now());
+			yieldOrder.setValidationMomo(errorMsg);
+			this.updateById(yieldOrder);
+			return false;
 		}
 
+		//在工艺校验中处理
+//		// 2. 当生产订单类型为：表处理，壳体，插针订单，当镀种为空或面积为0时，不得自动分派并提示
+//		if (YieldOrderEnum.YIELD_TYPE_1.equals(yieldOrder.getYieldType())
+//			|| YieldOrderEnum.YIELD_TYPE_4.equals(yieldOrder.getYieldType())
+//			|| YieldOrderEnum.YIELD_TYPE_5.equals(yieldOrder.getYieldType())) {
+//			if (StringUtils.isBlank(yieldOrder.getPlate()) || yieldOrder.getYpArea() == 0) {
+//				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode());
+//				yieldOrder.setValidationTime(DateUtil.now());
+//				yieldOrder.setValidationMomo("生产订单中镀种或面积为空，请维护基础数据");
+//				this.updateById(yieldOrder);
+//				return false;
+//			}
+//		}
+
 		// 3. 玻璃饼订单工艺路线包含外购不再自动分派，直接关闭订单
 		if (YieldOrderEnum.YIELD_TYPE_3.equals(yieldOrder.getYieldType())
 			&& yieldOrder.getPrimaryCraft().contains(YieldOrderConst.PRIMARY_CRAFT_WG)) {
@@ -426,21 +446,26 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 		DsCraftEntity craft = craftVO.getCraft();
 		DsPartEntity part = dsPartService.getById(craft.getPartId());
-		//判断热表零件面积不能为空
-		if (YieldOrderEnum.YIELD_TYPE_2.getCode() != yieldOrder.getYieldType()
-			&& YieldOrderEnum.YIELD_TYPE_6.getCode() != yieldOrder.getYieldType() && ObjectUtil.isEmpty(part.getArea())) {
-			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
-			yieldOrder.setValidationTime(DateUtil.now());
-			yieldOrder.setValidationMomo("零件面积为空，工艺匹配失败，请联系工艺员！");
-			this.updateById(yieldOrder);
-			return Boolean.FALSE;
+		// 2. 当生产订单类型为：表处理，壳体，插针订单，当镀种为空或面积为0时，不得自动分派并提示
+		// 判断热表零件面积和镀种不能为空
+		Integer yieldType = yieldOrder.getYieldType();
+		if (yieldType != null &&
+				(yieldType.equals(YieldOrderEnum.YIELD_TYPE_1.getCode())
+						|| yieldType.equals(YieldOrderEnum.YIELD_TYPE_4.getCode())
+						|| yieldType.equals(YieldOrderEnum.YIELD_TYPE_5.getCode()))) {
+			if (StringUtils.isBlank(part.getPlate()) || part.getArea() == 0) {
+				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_CRAFT.getCode());
+				yieldOrder.setValidationTime(DateUtil.now());
+				yieldOrder.setValidationMomo("工艺匹配失败，原因：工艺镀种或面积为空");
+				this.updateById(yieldOrder);
+				return Boolean.FALSE;
+			}
 		}
 
 		yieldOrder.setYpArea(part.getArea() == null ? 0D : part.getArea());
 		yieldOrder.setPlate(part.getPlate());
 		yieldOrder.setCraftId(craft.getId());
 		yieldOrder.setRank(craft.getRank());
-		yieldOrder.setYpArea(part.getArea());
 		yieldOrder.setProductType(part.getProductType());
 		yieldOrder.setPartName(part.getPartName());
 		yieldOrder.setPrimaryCraft(part.getCraftWay());
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml
index 3b92f5f6..661f941c 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml
@@ -25,7 +25,8 @@
             a.firseq,
             a.usedeptcode,
             a.conductor,
-            a.cdate
+            a.cdate,
+            a.plndeptcode
         FROM
         dba_mgr.v_mes_rb_pacturnrecord a
         <where>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml
index c49191de..a2eaf20d 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml
@@ -36,7 +36,8 @@
             a.newlevflag,
             a.prtudeptcode,
             a.newlevname,
-            a.newlevdate
+            a.newlevdate,
+            a.plndeptcode
         FROM
         dba_mgr.v_mes_rb_pk a
         <where>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml
index db434488..8ba0d03f 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml
@@ -21,7 +21,7 @@
     <select id = "getMesRbPurtosoList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPurtoso">
         select a.firseq,a.sono,a.wono,a.prtno,a.prtlotno,a.prtudept,
                a.soreqdat,a.soplanner,a.soreldat,a.rouclp,a.splcode,a.newlevsoqty,
-               a.warctlr,a.lewdept,a.prtudeptcode,a.newlevname,a.newlevdate
+               a.warctlr,a.lewdept,a.prtudeptcode,a.newlevname,a.newlevdate,a.plndeptcode
         from dba_mgr.V_MES_RB_PURTOSO a
         <where>
             a.processlinedesc like '%4%'
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml
index 97e69538..f5fd002f 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml
@@ -25,7 +25,8 @@
             a.newlevflag,
             a.prtudeptcode,
             a.newlevname,
-            a.newlevdate
+            a.newlevdate,
+            a.plndeptcode
         FROM
             dba_mgr.v_mes_rb_sjso a
         <where>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml
index 879bc7d3..9d641d41 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml
@@ -35,7 +35,8 @@
             a.newlevflag,
             a.prtudeptcode,
             a.newlevname,
-            a.newlevdate
+            a.newlevdate,
+            a.plndeptcode
         FROM
             dba_mgr.v_mes_rb_sodelrecwx a
         <where>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml
index 18b68a69..f4c71ced 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml
@@ -35,7 +35,8 @@
             a.newlevflag,
             a.prtudeptcode,
             a.newlevname,
-            a.newlevdate
+            a.newlevdate,
+            a.plndeptcode
         FROM
             dba_mgr.v_mes_rb_sodelreczg a
         <where>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml
index 508e1b24..8be629a7 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml
@@ -24,7 +24,8 @@
             a.lewdept,
             a.prtudeptcode,
             a.newlevname,
-            a.newlevdate
+            a.newlevdate,
+            a.plndeptcode
         FROM
             dba_mgr.v_mes_rb_wxpromotion a
         <where>
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
index 609388db..1260f007 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
@@ -291,14 +291,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYoCode(mesRbPurtoso.getSono());//生产单号
 			yieldOrder.setBatchNo(mesRbPurtoso.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbPurtoso.getPrtno());//零件号
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno());
-			if(part != null){
-				yieldOrder.setYpArea(part.getArea());
-				yieldOrder.setProductType(part.getProductType());
-				yieldOrder.setPartName(part.getPartName());
-				yieldOrder.setPrimaryCraft(part.getCraftWay());
-				yieldOrder.setPlate(part.getPlate());
-			}
+//			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno());
+//			if(part != null){
+//				yieldOrder.setYpArea(part.getArea());
+//				yieldOrder.setProductType(part.getProductType());
+//				yieldOrder.setPartName(part.getPartName());
+//				yieldOrder.setPrimaryCraft(part.getCraftWay());
+//				yieldOrder.setPlate(part.getPlate());
+//			}
 			yieldOrder.setProductIdent(mesRbPurtoso.getPrtlotno());
 			yieldOrder.setUseDept(mesRbPurtoso.getPrtudept());
 			yieldOrder.setDemandDate(mesRbPurtoso.getSoreqdat());//需求日期
@@ -320,6 +320,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
 			yieldOrder.setRoamNo(mesRbPurtoso.getFirseq());
+			yieldOrder.setPlanDeptCode(mesRbPurtoso.getPlndeptcode());
 			yieldOrder = updateYieldType(yieldOrder,mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq());
 			/*List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno());
 			//若零件不为空，查询零件的工艺路线
@@ -369,14 +370,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYoCode(mesRbPacturnrecord.getSono());//生产单号
 			yieldOrder.setBatchNo(mesRbPacturnrecord.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbPacturnrecord.getPrtno());//零件号
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
-			if(part != null){
-				yieldOrder.setYpArea(part.getArea());
-				yieldOrder.setProductType(part.getProductType());
-				yieldOrder.setPartName(part.getPartName());
-				yieldOrder.setPrimaryCraft(part.getCraftWay());
-				yieldOrder.setPlate(part.getPlate());
-			}
+//			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
+//			if(part != null){
+//				yieldOrder.setYpArea(part.getArea());
+//				yieldOrder.setProductType(part.getProductType());
+//				yieldOrder.setPartName(part.getPartName());
+//				yieldOrder.setPrimaryCraft(part.getCraftWay());
+//				yieldOrder.setPlate(part.getPlate());
+//			}
 			yieldOrder.setProductIdent(mesRbPacturnrecord.getPrtlotno());
 			yieldOrder.setUseDept(mesRbPacturnrecord.getSedept());
 			yieldOrder.setDemandDate(mesRbPacturnrecord.getWoreqdat());//需求日期
@@ -398,7 +399,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 //			yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
 			yieldOrder.setRoamNo(mesRbPacturnrecord.getFirseq());
-			if(part != null && part.getCraftWay() != null && part.getCraftWay().contains("封接")){
+			yieldOrder.setPlanDeptCode(mesRbPacturnrecord.getPlndeptcode());
+			if(StringUtils.isNotEmpty(mesRbPacturnrecord.getProcesslinedesc()) &&
+					mesRbPacturnrecord.getProcesslinedesc().contains("封接")){
 				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
 			}
 			yieldOrder.setRoamNoNext("");//下级b号
@@ -442,14 +445,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpCode(mesRbtoso.getWono());
 			yieldOrder.setBatchNo(mesRbtoso.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbtoso.getPrtno());//零件号
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbtoso.getPrtno());
-			if(part != null){
-				yieldOrder.setYpArea(part.getArea());
-				yieldOrder.setProductType(part.getProductType());
-				yieldOrder.setPartName(part.getPartName());
-				yieldOrder.setPrimaryCraft(part.getCraftWay());
-				yieldOrder.setPlate(part.getPlate());
-			}
+//			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbtoso.getPrtno());
+//			if(part != null){
+//				yieldOrder.setYpArea(part.getArea());
+//				yieldOrder.setProductType(part.getProductType());
+//				yieldOrder.setPartName(part.getPartName());
+//				yieldOrder.setPrimaryCraft(part.getCraftWay());
+//				yieldOrder.setPlate(part.getPlate());
+//			}
 			yieldOrder.setProductIdent(mesRbtoso.getPrtlotno());
 			yieldOrder.setUseDept(mesRbtoso.getPrtudept());
 			yieldOrder.setDemandDate(mesRbtoso.getSoreqdat());//需求日期
@@ -472,6 +475,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
 			yieldOrder.setRoamNo(mesRbtoso.getFirseq());
 			yieldOrder.setRoamNoNext( "");
+			yieldOrder.setPlanDeptCode(mesRbtoso.getPlndeptcode());
 			if(StringUtils.isNotEmpty(mesRbtoso.getFirseq())){
 				String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbtoso.getPrtno(),mesRbtoso.getFirseq());
 				yieldOrder.setRoamNoNext(roamNoNext);//下级b号
@@ -510,14 +514,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpCode(mesRbWxpromotion.getWono());
 			yieldOrder.setBatchNo(mesRbWxpromotion.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbWxpromotion.getPrtno());//零件号
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno());
-			if(part != null){
-				yieldOrder.setYpArea(part.getArea());
-				yieldOrder.setProductType(part.getProductType());
-				yieldOrder.setPartName(part.getPartName());
-				yieldOrder.setPrimaryCraft(part.getCraftWay());
-				yieldOrder.setPlate(part.getPlate());
-			}
+//			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno());
+//			if(part != null){
+//				yieldOrder.setYpArea(part.getArea());
+//				yieldOrder.setProductType(part.getProductType());
+//				yieldOrder.setPartName(part.getPartName());
+//				yieldOrder.setPrimaryCraft(part.getCraftWay());
+//				yieldOrder.setPlate(part.getPlate());
+//			}
 			yieldOrder.setProductIdent(mesRbWxpromotion.getPrtlotno());
 			yieldOrder.setUseDept(mesRbWxpromotion.getPrtudept());
 			yieldOrder.setDemandDate(mesRbWxpromotion.getSoreqdat());//需求日期
@@ -539,6 +543,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
 			yieldOrder.setRoamNo(mesRbWxpromotion.getFirseq());
+			yieldOrder.setPlanDeptCode(mesRbWxpromotion.getPlndeptcode());
 			yieldOrder = updateYieldType(yieldOrder,mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq());
 			/*List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno());
 			yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
@@ -592,14 +597,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpCode(mesRbSodelrecwx.getWono());
 			yieldOrder.setBatchNo(mesRbSodelrecwx.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbSodelrecwx.getPrtno());//零件号
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno());
-			if(part != null){
-				yieldOrder.setYpArea(part.getArea());
-				yieldOrder.setProductType(part.getProductType());
-				yieldOrder.setPartName(part.getPartName());
-				yieldOrder.setPrimaryCraft(part.getCraftWay());
-				yieldOrder.setPlate(part.getPlate());
-			}
+//			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno());
+//			if(part != null){
+//				yieldOrder.setYpArea(part.getArea());
+//				yieldOrder.setProductType(part.getProductType());
+//				yieldOrder.setPartName(part.getPartName());
+//				yieldOrder.setPrimaryCraft(part.getCraftWay());
+//				yieldOrder.setPlate(part.getPlate());
+//			}
 			yieldOrder.setProductIdent(mesRbSodelrecwx.getPrtlotno());
 			yieldOrder.setUseDept(mesRbSodelrecwx.getPrtudept());
 			yieldOrder.setDemandDate(mesRbSodelrecwx.getSoreqdat());//需求日期
@@ -621,6 +626,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
 			yieldOrder.setRoamNo(mesRbSodelrecwx.getFirseq());
+			yieldOrder.setPlanDeptCode(mesRbSodelrecwx.getPlndeptcode());
 			yieldOrder = updateYieldType(yieldOrder,mesRbSodelrecwx.getPrtno(),mesRbSodelrecwx.getFirseq());
 			/*List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno());
 			if(CollectionUtils.isNotEmpty(dsPartList)&&dsPartList.get(0).getCraftWay().contains("封接")){
@@ -671,14 +677,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpCode(mesRbSodelreczg.getWono());
 			yieldOrder.setBatchNo(mesRbSodelreczg.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbSodelreczg.getPrtno());//零件号
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno());
-			if(part != null){
-				yieldOrder.setYpArea(part.getArea());
-				yieldOrder.setProductType(part.getProductType());
-				yieldOrder.setPartName(part.getPartName());
-				yieldOrder.setPrimaryCraft(part.getCraftWay());
-				yieldOrder.setPlate(part.getPlate());
-			}
+//			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno());
+//			if(part != null){
+//				yieldOrder.setYpArea(part.getArea());
+//				yieldOrder.setProductType(part.getProductType());
+//				yieldOrder.setPartName(part.getPartName());
+//				yieldOrder.setPrimaryCraft(part.getCraftWay());
+//				yieldOrder.setPlate(part.getPlate());
+//			}
 			yieldOrder.setProductIdent(mesRbSodelreczg.getPrtlotno());
 			yieldOrder.setUseDept(mesRbSodelreczg.getPrtudept());
 			yieldOrder.setDemandDate(mesRbSodelreczg.getSoreqdat());//需求日期
@@ -700,6 +706,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
 			yieldOrder.setRoamNo(mesRbSodelreczg.getFirseq());
+			yieldOrder.setPlanDeptCode(mesRbSodelreczg.getPlndeptcode());
 			yieldOrder = updateYieldType(yieldOrder,mesRbSodelreczg.getPrtno(),mesRbSodelreczg.getFirseq());
 			/*//从零件表中查询零件信息
 			List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno());
@@ -754,14 +761,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpCode(mesRbPk.getWono());
 			yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbPk.getPrtno());//零件号
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPk.getPrtno());
-			if(part != null){
-				yieldOrder.setYpArea(part.getArea());
-				yieldOrder.setProductType(part.getProductType());
-				yieldOrder.setPartName(part.getPartName());
-				yieldOrder.setPrimaryCraft(part.getCraftWay());
-				yieldOrder.setPlate(part.getPlate());
-			}
+//			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPk.getPrtno());
+//			if(part != null){
+//				yieldOrder.setYpArea(part.getArea());
+//				yieldOrder.setProductType(part.getProductType());
+//				yieldOrder.setPartName(part.getPartName());
+//				yieldOrder.setPrimaryCraft(part.getCraftWay());
+//				yieldOrder.setPlate(part.getPlate());
+//			}
 			yieldOrder.setProductIdent(mesRbPk.getPrtlotno());
 			yieldOrder.setUseDept(mesRbPk.getPrtudept());
 			yieldOrder.setDemandDate(mesRbPk.getSoreqdat());//需求日期
@@ -787,6 +794,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
 			yieldOrder.setRoamNo(mesRbPk.getFirseq());
 			yieldOrder.setRoamNoNext("");
+			yieldOrder.setPlanDeptCode(mesRbPk.getPlndeptcode());
 			if(StringUtils.isNotEmpty(mesRbPk.getFirseq())){
 				String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPk.getPrtno(),mesRbPk.getFirseq());
 				yieldOrder.setRoamNoNext(roamNoNext);//下级b号