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 @@
project_no = #{projectNo},
serial_number = #{serialNumber},
remark = #{remark},
+ bind_barcode = #{bindBarcode},
bind_status = #{bindStatus},
bind_by = #{bindBy},
bind_time = #{bindTime},