From 9bea4d9d6c073a0204997c29f8270d39a39912be Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 10 Oct 2023 11:17:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- op-auth/src/main/resources/bootstrap.yml | 11 ++++++----- .../java/com/op/common/core/utils/DateUtils.java | 2 +- op-gateway/src/main/resources/bootstrap.yml | 12 ++++++------ .../op-device/src/main/resources/bootstrap.yml | 12 +++++------- .../op-energy/src/main/resources/bootstrap.yml | 12 +++++------- op-modules/op-file/src/main/resources/bootstrap.yml | 8 ++++---- op-modules/op-gen/src/main/resources/bootstrap.yml | 10 +++++----- op-modules/op-job/src/main/resources/bootstrap.yml | 12 +++++------- op-modules/op-mes/src/main/resources/bootstrap.yml | 12 +++++------- .../java/com/op/plan/mapper/ProWhiteOrderMapper.java | 1 + .../plan/service/impl/ProWhiteOrderServiceImpl.java | 10 ++++++++-- op-modules/op-plan/src/main/resources/bootstrap.yml | 12 +++++------- .../resources/mapper/plan/ProWhiteOrderMapper.xml | 6 +++++- .../op-quality/src/main/resources/bootstrap.yml | 12 +++++------- op-modules/op-sap/src/main/resources/bootstrap.yml | 12 +++++------- .../op-security/src/main/resources/bootstrap.yml | 12 +++++------- .../op-system/src/main/resources/bootstrap.yml | 12 +++++------- .../op-technology/src/main/resources/bootstrap.yml | 12 +++++------- op-modules/op-wms/src/main/resources/bootstrap.yml | 12 +++++------- 19 files changed, 91 insertions(+), 101 deletions(-) diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index 6351f46a2..068f4b57c 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.yml @@ -17,14 +17,15 @@ spring: # 服务注册地址 #--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj namespace: lanju-op - group: prod-new - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 config: #命名空间 namespace: lanju-op - group: prod-new - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java index 8c0eb5c59..fd0b60f3a 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java @@ -23,7 +23,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { public static String YYYY_MM_DD = "yyyy-MM-dd"; - public static String YYYYMMDD="yyMMdd"; + public static String YYYYMMDD="yyyyMMdd"; public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; public static String YYYYMMDDHHMMSSsss = "yyyyMMddHHmmssSSS"; diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index d4d43645d..bd1f68ead 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.yml @@ -17,15 +17,15 @@ spring: # password: sfnacos2023 # namespace: lanju-op namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: #命名空间 namespace: lanju-op - group: prod-new - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -41,7 +41,7 @@ spring: datasource: ds1: nacos: - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 dataId: sentinel-op-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml index 6bba74e3b..b166ed595 100644 --- a/op-modules/op-device/src/main/resources/bootstrap.yml +++ b/op-modules/op-device/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-energy/src/main/resources/bootstrap.yml b/op-modules/op-energy/src/main/resources/bootstrap.yml index ed4d7271e..57f1f21a1 100644 --- a/op-modules/op-energy/src/main/resources/bootstrap.yml +++ b/op-modules/op-energy/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-file/src/main/resources/bootstrap.yml b/op-modules/op-file/src/main/resources/bootstrap.yml index 369a28988..3cc00fca8 100644 --- a/op-modules/op-file/src/main/resources/bootstrap.yml +++ b/op-modules/op-file/src/main/resources/bootstrap.yml @@ -15,15 +15,15 @@ spring: discovery: # 服务注册地址 namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: # 配置中心地址 namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-gen/src/main/resources/bootstrap.yml b/op-modules/op-gen/src/main/resources/bootstrap.yml index 4f13e72eb..8bbf1fa73 100644 --- a/op-modules/op-gen/src/main/resources/bootstrap.yml +++ b/op-modules/op-gen/src/main/resources/bootstrap.yml @@ -14,15 +14,15 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: #命名空间 namespace: lanju-op - group: prod-new - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml index 0ed33d8ef..6c487c9e7 100644 --- a/op-modules/op-job/src/main/resources/bootstrap.yml +++ b/op-modules/op-job/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index 3ef1b48c0..014cd085c 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java index b79188939..fb6055a12 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java @@ -82,4 +82,5 @@ public interface ProWhiteOrderMapper { */ List selectProShift(); + Integer getTodayMaxNum(); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java index 491772c3c..276bb86ad 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java @@ -97,7 +97,10 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService { proOrder.setStatus("o0"); proOrder.setQuantitySplit(0L); proOrder.setOrderType(proOrder.getProdType()); - proOrder.setOrderCode("DD" + DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSSsss, DateUtils.getNowDate())); + String bpDD = "DD" + DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); + int liushuiNum = proWhiteOrderMapper.getTodayMaxNum(); + String liushuiStr = String.format("%04d", liushuiNum); + proOrder.setOrderCode(bpDD+liushuiStr); proOrder.setCreateBy(SecurityContextHolder.getUserName()); proOrder.setCreateTime(DateUtils.getNowDate()); proOrder.setUpdateBy(SecurityContextHolder.getUserName()); @@ -342,5 +345,8 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService { proOrderWorkorder.setChildren(childWorkorders); // 设置子工单列表 } } - + public static void main(String args[]){ + String formatted = String.format("%04d", 7); + System.out.println(formatted); + } } diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml index 9c9530ab0..3f029c5d0 100644 --- a/op-modules/op-plan/src/main/resources/bootstrap.yml +++ b/op-modules/op-plan/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml index 6e922013c..10f0338d6 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml @@ -88,7 +88,11 @@ SELECT bst.Shift_Id shiftId,bst.Shift_Desc_Global shiftDesc FROM base_shifts_t bst - + insert into pro_order diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml index 0792027ab..d9eea330a 100644 --- a/op-modules/op-quality/src/main/resources/bootstrap.yml +++ b/op-modules/op-quality/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index bb47aca54..f42680617 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-security/src/main/resources/bootstrap.yml b/op-modules/op-security/src/main/resources/bootstrap.yml index 081415640..dee981d37 100644 --- a/op-modules/op-security/src/main/resources/bootstrap.yml +++ b/op-modules/op-security/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml index f053da000..f1c89ab14 100644 --- a/op-modules/op-system/src/main/resources/bootstrap.yml +++ b/op-modules/op-system/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml index 6c3ec90ae..44f898758 100644 --- a/op-modules/op-technology/src/main/resources/bootstrap.yml +++ b/op-modules/op-technology/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-wms/src/main/resources/bootstrap.yml b/op-modules/op-wms/src/main/resources/bootstrap.yml index 2ef866d14..1b5bbe0b8 100644 --- a/op-modules/op-wms/src/main/resources/bootstrap.yml +++ b/op-modules/op-wms/src/main/resources/bootstrap.yml @@ -14,16 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: prod-new + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: prod-new - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + group: zxl + # 服务注册地址 + server-addr: 140.249.53.142:8848 # 配置文件格式 file-extension: yml # 共享配置