From 087174b6f67c64a3180390f8ec814db7fc721bef Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Sat, 16 Sep 2023 10:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7+=E5=B7=A5=E8=89=BAbom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/technology/ProProcessMapper.xml    | 23 +++++++++----------
 .../wms/controller/SysCustomerController.java |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
index 5faa10555..a9d1f56f1 100644
--- a/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
+++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml
@@ -68,7 +68,7 @@
     <resultMap type="BomComponent" id="BomComponentResult">
         <result property="handle"	column="handle"	/>
         <result property="bomCode"	column="bom_code"	/>
-        <result property="bomName"	column="product_desc_zh"	/>
+        <result property="productDescZh"	column="product_desc_zh"	/>
         <result property="site"	column="site"	/>
         <result property="productCode"	column="product_code"	/>
         <result property="cumc"	column="cumc"	/>
@@ -305,17 +305,16 @@
     </select>
 
     <select id="selectBaseBomComponentList" parameterType="BomComponent" resultMap="BomComponentResult">
-        --         select bbc.bom_code,bpc1.product_desc_zh
-        --         from base_bom_component bbc,base_product_copy1 bpc1
-        --         left join base_product_copy1 bpc1 on bbc.product_code = (right(bpc1.product_code,11))
-        --         Where
-        <!--            <if test="bomCode != null  and bomCode != ''"> and bom_code = #{bomCode}</if>-->
-        --          bbc.product_code = right(bpc1.product_code,11)
-        select distinct bbc.bom_code,bp.product_desc_zh,right(bp.product_code,11) as pc,bbc.product_code
-        from base_bom_component bbc,base_product bp
-        Where
-        bbc.product_code = right(bp.product_code,11)
-        <if test="bomCode != null  and bomCode != ''"> and bom_code = #{bomCode}</if>
+        <!--select distinct bbc.bom_code,bp.product_desc_zh,right(bp.product_code,11) as pc,bbc.product_code-->
+        select bbc.bom_code,b1.product_desc_zh,bbc.product_code,bbc.component,bp.product_desc_zh as componentName
+        from base_bom_component bbc
+        left join base_product b1 on right(b1.product_code,11) = bbc.product_code
+        left join base_product bp on right(bp.product_code,11) = bbc.component
+        <where>
+            <if test="bomCode != null  and bomCode != ''"> and bom_code like concat('%', #{bomCode}, '%')</if>
+            <if test="productDescZh != null  and productDescZh != ''"> and b1.product_desc_zh like concat('%', #{productDescZh}, '%')</if>
+<!--            <if test="component != null  and component != ''"> and component like concat('%', #{component}, '%')</if>-->
+        </where>
     </select>
 
     <select id="getWorkCenterList" parameterType="SysFactory" resultMap="SysFactoryResult">
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysCustomerController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysCustomerController.java
index 7c4158ae2..410cd0d85 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysCustomerController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysCustomerController.java
@@ -80,9 +80,9 @@ public class SysCustomerController extends BaseController {
 		sysCustomer.setCreateBy(SecurityUtils.getUsername());
 		sysCustomer.setCreateTime(DateUtils.getNowDate());
 		if (sysCustomerService.checkClientCodeUnique(sysCustomer)) {
-			return AjaxResult.error("组织编码已存在！");
+			return AjaxResult.error("客户编码已存在！");
 		}else if(sysCustomerService.checkClientNameUnique(sysCustomer)){
-			return AjaxResult.error("组织名称已存在！");
+			return AjaxResult.error("客户已存在！");
 		}else{
 			return toAjax(sysCustomerService.insertSysCustomer(sysCustomer));
 		}