diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java
index 190b556c..8e17c1ae 100644
--- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java
+++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/dto/StPdmPartDTO.java
@@ -26,24 +26,24 @@ public class StPdmPartDTO implements Serializable {
 	private String prtno;
 	private String prtdesc;
 	private String source;
-	private String releaseNo;
-	private String prtType;
-	private String materialModel;
-	private Double weight;
+	private String releaseno;
+	private String prttype;
+	private String mtltmrk;
+	private Double prtwt;
 	private String remark;
 	private String prtum;
-	private String productCategory;
+	private String cplb;
 	private String mtlspcf;
-	private String productTechSpec;
-	private Double density;
-	private String partRevisionStatus;
+	private String prtstd;
+	private Double mtlsgrt;
+	private String prtrevedit;
 	private String drwpartno;
-	private String ecnNo;
-	private Short endItem;
+	private String ecnno;
+	private Short enditem;
 	private String priority;
 	private String partLink;
-	private String cavityNo;
-	private String tradeMark;
+	private String cavityno;
+	private String trademark;
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date rcdchgdatd;
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index 2304cdd9..c2b69bb5 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
@@ -832,8 +832,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                     }
                                 }
                             } else {
-                                prevProcessEnd = prevProcessEnd.plusMinutes(30);
-                                totalTime = 30.0;
+                                order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力");
+                                order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
+                                yieldOrderService.updateById(order);
+                                isSchecuding = false;
+                                break;
                             }
 
                             workPlan.setWoId(order.getId());
@@ -851,10 +854,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             workPlanList.add(workPlan);
 
                         } else {
-                            //未匹配到设备和人力资源，将工序状态改为6，标识为未排产
-                            craft.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
-                            yieldOrderCraftService.updateById(craft);
                             log.info("未匹配到设备和人力资源的工序是：" + craft.getPpsId());
+                            order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力和设备能力");
+                            order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
+                            yieldOrderService.updateById(order);
+                            isSchecuding = false;
+                            break;
                         }
                     }
 
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java
index bf5e2c61..f232afda 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.java
@@ -40,7 +40,7 @@ public interface StGoodsMapper extends BaseMapper<StGoods> {
 	 */
 	List<StGoodsExcel> exportStGoods(@Param("ew") Wrapper<StGoods> queryWrapper);
 
-	StGoods queryByCodeAndVersion(@Param("patno") String prtno, @Param("releaseNo") String releaseNo);
+	StGoods queryByCodeAndVersion(@Param("prtno") String prtno, @Param("releaseNo") String releaseNo);
 
 	List<StGoodsVO> selectFindAllGoodsPage(IPage<StGoodsVO> page, StGoodsVO stGoods);
 }
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
index 1231c21b..bf9c68b5 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
@@ -97,7 +97,7 @@
         FROM (
         SELECT *
         FROM st_goods
-        WHERE goods_code = #{code}
+        WHERE goods_code = #{prtno}
         AND release_no = #{releaseNo}
         AND is_deleted = 0
         AND used = 1
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
index 05dc392b..b05e2054 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGoodsServiceImpl.java
@@ -72,31 +72,31 @@ public class StGoodsServiceImpl extends BaseServiceImpl<StGoodsMapper, StGoods>
 		if (pdmPartInfo != null) {
 			for (StPdmPartDTO dto : pdmPartInfo) {
 				//保存物料信息
-				goods = this.queryByCodeAndVersion(dto.getPrtno(), dto.getReleaseNo());
+				goods = this.queryByCodeAndVersion(dto.getPrtno(), dto.getReleaseno());
 				if (goods == null) {
 					goods = new StGoods();
-					// goods.setDept();
+//					goods.setDeptId(dto.getPartid());
 					goods.setDrawingNo(dto.getDrwpartno());
 					goods.setGoodsCode(dto.getPrtno());
 					goods.setGoodsName(dto.getPrtdesc());
-					goods.setDensity(dto.getDensity());
-					goods.setPrtType(dto.getPrtType());
+					goods.setDensity(dto.getMtlsgrt());
+					goods.setPrtType(dto.getPrttype());
 					goods.setSourceByStr(dto.getSource());
 					goods.setSpecifications(dto.getMtlspcf());
-					goods.setUnitName(dto.getPrtum());
-					goods.setCavityNo(dto.getCavityNo());
-					goods.setProductCategory(dto.getProductCategory());
-					goods.setEcnNo(dto.getEcnNo());
-					goods.setEndItem(dto.getEndItem());
-					goods.setMaterialModel(dto.getMaterialModel());
+					goods.setPdmUnit(dto.getPrtum());
+					goods.setCavityNo(dto.getCavityno());
+					goods.setProductCategory(dto.getCplb());
+					goods.setEcnNo(dto.getEcnno());
+					goods.setEndItem(dto.getEnditem());
+					goods.setMaterialModel(dto.getMtltmrk());
 					goods.setPartLink(dto.getPartLink());
 					goods.setPriority(dto.getPriority());
-					goods.setPartRevisionStatus(dto.getPartRevisionStatus());
-					goods.setProductTechSpec(dto.getProductTechSpec());
-					goods.setWeight(dto.getWeight());
-					goods.setReleaseNo(dto.getReleaseNo());
+					goods.setPartRevisionStatus(dto.getPrtrevedit());
+					goods.setProductTechSpec(dto.getPrtstd());
+					goods.setWeight(dto.getPrtwt());
+					goods.setReleaseNo(dto.getReleaseno());
 					goods.setRemark(dto.getRemark());
-					goods.setTradeMark(dto.getTradeMark());
+					goods.setTradeMark(dto.getTrademark());
 					goods.setUsed(Boolean.TRUE);
 					goods.setIsDeleted(0);
 					goods.setCreateTime(new Date());