Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
highway
wws 12 months ago
parent e81e645667 d3d8ca47bd
commit f2fea045e5
26 changed files with 110 additions and 194 deletions
Show Stats Download Patch File Download Diff File

11
op-auth/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

2
op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java
Unescape Escape View File

@ -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";

12
op-gateway/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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

12
op-modules/op-device/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

12
op-modules/op-energy/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

8
op-modules/op-file/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

10
op-modules/op-gen/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

12
op-modules/op-job/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

12
op-modules/op-mes/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

1
op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java
Unescape Escape View File

@ -82,4 +82,5 @@ public interface ProWhiteOrderMapper {
*/
List<ProShift> selectProShift();
Integer getTodayMaxNum();
}

8
op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
Unescape Escape View File

@ -366,11 +366,11 @@ public class ProOrderServiceImpl implements IProOrderService {
}
Map<String,CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
Set<String> 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查询批次号

19
op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
Unescape Escape View File

@ -94,10 +94,15 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
}
Map<String, CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
Set<String> 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<String> 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<String, CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
Set<String> 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查询批次号

17
op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java
Unescape Escape View File

@ -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<String, CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
Set<String> 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);
}
}

12
op-modules/op-plan/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

6
op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml
Unescape Escape View File

@ -88,7 +88,11 @@
SELECT bst.Shift_Id shiftId,bst.Shift_Desc_Global shiftDesc
FROM base_shifts_t bst
</select>
<select id="getTodayMaxNum" resultType="java.lang.Integer">
select count(0)+1
from pro_order
where order_type = 'white' and plan_pro_date = CONVERT(varchar(10),GETDATE(), 120)
</select>
<insert id="insertProOrder" parameterType="ProOrder">
insert into pro_order
<trim prefix="(" suffix=")" suffixOverrides=",">

12
op-modules/op-quality/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

BIN
op-modules/op-sap/libsapjco3.so
View File

Binary file not shown.

BIN
op-modules/op-sap/sapjco3.dll
View File

Binary file not shown.

BIN
op-modules/op-sap/sapjco3.jar
View File

Binary file not shown.

12
op-modules/op-sap/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

12
op-modules/op-security/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

12
op-modules/op-system/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

12
op-modules/op-technology/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

12
op-modules/op-wms/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -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
# 共享配置

39
op-visual/op-visual.iml
Unescape Escape View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.7" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
</component>
</module>

39
open-platform.iml
Unescape Escape View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.7" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.7.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.11.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
</component>
</module>
Write Preview
Loading…
Cancel
Save