From b407ae4e205186b2c93f05a526acf1e95223de3e Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Tue, 27 Sep 2022 11:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=B7=A5=E5=BA=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEBUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ktg/mes/md/controller/MdWorkstationController.java    | 4 ++--
 .../main/resources/mapper/pro/ProRouteProductBomMapper.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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"
 
     <select id="checkUnique" parameterType="ProRouteProductBom" resultMap="ProRouteProductBomResult">
         <include refid="selectProRouteProductBomVo"/>
-        where route_id = #{routeId}
+        where item_id = #{itemId}
         and process_id = #{processId}
         and product_id = #{productId}
     </select>