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/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index b507da8a7..c0b52c9b6 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -366,11 +366,11 @@ public class ProOrderServiceImpl implements IProOrderService { } Map equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典 - Set keys = equipMap.keySet(); - for (String key : keys) { - prodLineName.append(equipMap.get(key).getLabel()); - prodLineName.append(","); + for (int c = 0; c < codeArray.size(); c++) { + String equipCode = codeArray.getJSONArray(c).getString(1); + prodLineName.append(equipMap.get(equipCode).getLabel() + ","); } + proOrderWorkorder.setProdLineCode(prodLineName.toString()); // 通过工单id查询批次号 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 78b9c4505..df1720218 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -94,10 +94,15 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } Map equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典 - Set keys = equipMap.keySet(); - for (String key : keys) { - prodLineName += equipMap.get(key).getLabel() + ","; + for (int c = 0; c < codeArray.size(); c++) { + String equipCode = codeArray.getJSONArray(c).getString(1); + prodLineName += equipMap.get(equipCode).getLabel() + ","; } +// Set keys = equipMap.keySet(); +// for (String key : keys) { +// prodLineName += equipMap.get(key).getLabel() + ","; +// } + workorder.setProdLineName(prodLineName); // // 通过设备code查询出机型名称 // workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode())); @@ -946,11 +951,11 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } Map equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典 - Set keys = equipMap.keySet(); - for (String key : keys) { - prodLineName.append(equipMap.get(key).getLabel()); - prodLineName.append(","); + for (int c = 0; c < codeArray.size(); c++) { + String equipCode = codeArray.getJSONArray(c).getString(1); + prodLineName.append(equipMap.get(equipCode).getLabel() + ","); } + proOrderWorkorder.setProdLineCode(prodLineName.toString()); // 通过工单id查询批次号 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..2da0476b7 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()); @@ -314,10 +317,9 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService { } Map equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典 - Set keys = equipMap.keySet(); - for (String key : keys) { - prodLineName.append(equipMap.get(key).getLabel()); - prodLineName.append(","); + for (int c = 0; c < codeArray.size(); c++) { + String equipCode = codeArray.getJSONArray(c).getString(1); + prodLineName.append(equipMap.get(equipCode).getLabel() + ","); } proOrderWorkorder.setProdLineCode(prodLineName.toString()); @@ -342,5 +344,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/libsapjco3.so b/op-modules/op-sap/libsapjco3.so index de193bd07..e88d57e74 100644 Binary files a/op-modules/op-sap/libsapjco3.so and b/op-modules/op-sap/libsapjco3.so differ diff --git a/op-modules/op-sap/sapjco3.dll b/op-modules/op-sap/sapjco3.dll new file mode 100644 index 000000000..38ebfaad0 Binary files /dev/null and b/op-modules/op-sap/sapjco3.dll differ diff --git a/op-modules/op-sap/sapjco3.jar b/op-modules/op-sap/sapjco3.jar index 8f123918d..a8bf6c4c6 100644 Binary files a/op-modules/op-sap/sapjco3.jar and b/op-modules/op-sap/sapjco3.jar differ 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 # 共享配置 diff --git a/op-visual/op-visual.iml b/op-visual/op-visual.iml deleted file mode 100644 index e27a22bf9..000000000 --- a/op-visual/op-visual.iml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/open-platform.iml b/open-platform.iml deleted file mode 100644 index e27a22bf9..000000000 --- a/open-platform.iml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file