diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java index ab1b874..1c79de9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java @@ -149,7 +149,7 @@ public class MdWorkstationController extends BaseController } mdWorkstation.setWarehouseId(warehouse.getWarehouseId()); mdWorkstation.setWarehouseCode(warehouse.getWarehouseCode()); - mdWorkstation.setWorkstationName(warehouse.getWarehouseName()); + mdWorkstation.setWarehouseName(warehouse.getWarehouseName()); mdWorkstation.setLocationId(location.getLocationId()); mdWorkstation.setLocationCode(location.getLocationCode()); mdWorkstation.setLocationName(location.getLocationName()); @@ -202,7 +202,7 @@ public class MdWorkstationController extends BaseController area = wmStorageAreaService.selectWmStorageAreaByAreaCode(UserConstants.VIRTUAL_WA); } mdWorkstation.setWarehouseCode(warehouse.getWarehouseCode()); - mdWorkstation.setWorkstationName(warehouse.getWarehouseName()); + mdWorkstation.setWarehouseName(warehouse.getWarehouseName()); mdWorkstation.setLocationCode(location.getLocationCode()); mdWorkstation.setLocationName(location.getLocationName()); mdWorkstation.setAreaCode(area.getAreaCode()); diff --git a/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml index 75f6e91..d3a6fe9 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"