diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java
index 452bbc2..04e3cb0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkshopController.java
@@ -77,7 +77,11 @@ public class MesMdWorkshopController {
     @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')")
     public CommonResult<MesMdWorkshopRespVO> getWorkshop(@RequestParam("id") Long id) {
         MesMdWorkshopDO workshop = workshopService.getWorkshop(id);
-        return success(BeanUtils.toBean(workshop, MesMdWorkshopRespVO.class));
+        if (workshop == null) {
+            return success(null);
+        }
+        List<MesMdWorkshopRespVO> voList = buildWorkshopRespVOList(Collections.singletonList(workshop));
+        return success(voList.get(0));
     }
 
     @GetMapping("/page")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/unitmeasure/MesMdUnitMeasureMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/unitmeasure/MesMdUnitMeasureMapper.java
index cb9a2bf..7b9fda7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/unitmeasure/MesMdUnitMeasureMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/unitmeasure/MesMdUnitMeasureMapper.java
@@ -33,4 +33,8 @@ public interface MesMdUnitMeasureMapper extends BaseMapperX<MesMdUnitMeasureDO> 
         return selectList(MesMdUnitMeasureDO::getStatus, status);
     }
 
+    default Long selectCountByPrimaryId(Long primaryId) {
+        return selectCount(MesMdUnitMeasureDO::getPrimaryId, primaryId);
+    }
+
 }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index 1bf2792..09dbc76 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -24,6 +24,7 @@ public interface ErrorCodeConstants {
     ErrorCode MD_UNIT_MEASURE_NOT_EXISTS = new ErrorCode(1_040_101_000, "计量单位不存在");
     ErrorCode MD_UNIT_MEASURE_CODE_DUPLICATE = new ErrorCode(1_040_101_001, "计量单位编码已存在");
     ErrorCode MD_UNIT_MEASURE_HAS_ITEM = new ErrorCode(1_040_101_002, "该计量单位下存在物料，无法删除");
+    ErrorCode MD_UNIT_MEASURE_HAS_SECONDARY = new ErrorCode(1_040_101_003, "该主单位下存在辅单位，无法删除");
 
     // ========== MES 基础数据-物料（1-040-102-000） ==========
     ErrorCode MD_ITEM_NOT_EXISTS = new ErrorCode(1_040_102_000, "物料不存在");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
index 1b7b9bb..1acb33c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
@@ -17,6 +17,7 @@ public enum MesMdAutoCodeRuleCodeEnum {
     MD_VENDOR_CODE("MD_VENDOR_CODE", "供应商编码"),
     MD_CLIENT_CODE("MD_CLIENT_CODE", "客户编码"),
     MD_WORKSTATION_CODE("MD_WORKSTATION_CODE", "工作站编码"),
+    MD_WORKSHOP_CODE("MD_WORKSHOP_CODE", "车间编码"),
     TM_TOOL_TYPE_CODE("TM_TOOL_TYPE_CODE", "工具类型编码"),
     WM_ARRIVAL_NOTICE_CODE("WM_ARRIVAL_NOTICE_CODE", "到货通知单编码"),
     WM_ITEM_RECEIPT_CODE("WM_ITEM_RECEIPT_CODE", "采购入库单编码"),
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java
index 852e8d0..bdc996b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/unitmeasure/MesMdUnitMeasureServiceImpl.java
@@ -62,10 +62,15 @@ public class MesMdUnitMeasureServiceImpl implements MesMdUnitMeasureService {
     public void deleteUnitMeasure(Long id) {
         // 校验存在
         validateUnitMeasureExists(id);
+        // 校验是否存在以此为主单位的辅单位
+        if (unitMeasureMapper.selectCountByPrimaryId(id) > 0) {
+            throw exception(MD_UNIT_MEASURE_HAS_SECONDARY);
+        }
         // 校验是否被物料引用
         if (itemService.getItemCountByUnitMeasureId(id) > 0) {
             throw exception(MD_UNIT_MEASURE_HAS_ITEM);
         }
+
         // 删除
         unitMeasureMapper.deleteById(id);
     }