Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java

@@ -87,7 +87,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService<MesProdCraftRou
 
             if (!StringUtils.isEmpty(item.getPartNo())) {
                 DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-                DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(),"workCenterCode", partPackBean);
+                DdlPreparedPack.getStringEqualPack(item.getPartNo(),"partNo", partPackBean);
                 MesPart mesPart = mesPartRepository.getByProperty(partPackBean);
                 if (mesPart == null) {
                     MesException.throwMesBusiException("零件号【%s】不存在", item.getPartNo());