From 42dcc6cbe30aa0666ed8c5330ede0f8435946bdb Mon Sep 17 00:00:00 2001
From: xins <xins@mesnac.com>
Date: Wed, 10 Apr 2024 18:00:54 +0800
Subject: [PATCH] =?UTF-8?q?2.0.3=20=E8=BD=A6=E9=97=B4=EF=BC=9A=201?=
 =?UTF-8?q?=E3=80=81=E4=B8=80=E6=A5=BC=E6=89=AB=E6=8F=8F=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BD=BF=E7=94=A8=E3=80=81=E4=B8=80=E6=A5=BC?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=202=E3=80=81=E5=9B=9B?=
 =?UTF-8?q?=E6=A5=BC=E6=89=AB=E6=8F=8F=E7=89=A9=E6=96=99=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=92=8C=E5=9B=9B=E6=A5=BC=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=203=E3=80=81=E4=BA=94=E6=A5=BC=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=A2=86=E6=96=99=E3=80=81=E6=9F=9C=E4=BD=93=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hw/common/core/constant/MesConstants.java |  4 ++
 .../com/hw/common/log/enums/BusinessType.java |  5 +++
 .../hw-mes/src/main/resources/bootstrap.yml   | 41 +++++++++++++++++--
 .../mapper/mes/MesBaseBarcodeInfoMapper.xml   |  1 +
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java
index 92825b6b..c699160f 100644
--- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java
+++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java
@@ -78,4 +78,8 @@ public class MesConstants {
 
     /**校验类型(0不校验,1人工校验,2自动校验)*/
     public static final String MES_MATERIAL_BOM_CHECK_TYPE_MANUAL = "1";//人工校验
+
+
+    /**条码信息绑定状态*/
+    public static final String MES_BARCODE_BIND_STATUS_BINDING= "1";//绑定
 }
diff --git a/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java b/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java
index 87754a1a..5b264b67 100644
--- a/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java
+++ b/hw-common/hw-common-log/src/main/java/com/hw/common/log/enums/BusinessType.java
@@ -119,4 +119,9 @@ public enum BusinessType
      */
     INSTOCK,
 
+    /**
+     * 绑定
+     */
+    BIND,
+
 }
diff --git a/hw-modules/hw-mes/src/main/resources/bootstrap.yml b/hw-modules/hw-mes/src/main/resources/bootstrap.yml
index 389da7cf..671c63ef 100644
--- a/hw-modules/hw-mes/src/main/resources/bootstrap.yml
+++ b/hw-modules/hw-mes/src/main/resources/bootstrap.yml
@@ -15,15 +15,48 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 175.27.215.92:8848
-        namespace: jyhb
-        group: DEFAULT_GROUP
+        namespace: jyhb-test
+        group: xins
       config:
         # 配置中心地址
         server-addr: 175.27.215.92:8848
-        namespace: jyhb
-        group: DEFAULT_GROUP
+        namespace: jyhb-test
+        group: xins
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+
+
+
+## Tomcat
+#server:
+#  port: 7305
+#
+## Spring
+#spring:
+#  application:
+#    # 应用名称
+#    name: hw-mes
+#  profiles:
+#    # 环境配置
+#    active: prod
+#  cloud:
+#    nacos:
+#      discovery:
+#        # 服务注册地址
+#        server-addr: 127.0.0.1:8848
+#        namespace: jyhb
+#        group: DEFAULT_GROUP
+#      config:
+#        # 配置中心地址
+#        server-addr: 127.0.0.1:8848
+#        namespace: jyhb
+#        group: DEFAULT_GROUP
+#        # 配置文件格式
+#        file-extension: yml
+#        # 共享配置
+#        shared-configs:
+#          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml
index 57173ac9..88b1a738 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseBarcodeInfoMapper.xml
@@ -211,6 +211,7 @@
             <if test="projectNo != null">project_no = #{projectNo},</if>
             <if test="serialNumber != null">serial_number = #{serialNumber},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="bindBarcode != null">bind_barcode = #{bindBarcode},</if>
             <if test="bindStatus != null">bind_status = #{bindStatus},</if>
             <if test="bindBy != null">bind_by = #{bindBy},</if>
             <if test="bindTime != null">bind_time = #{bindTime},</if>