root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志fix

Browse Source
This commit is contained in:
psh
2024-06-07 11:26:01 +08:00
parent 5eecffd5cb
commit 7ceb84b3e0
34 changed files with 944 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/nlsso-server/pom.xml
View File

@@ -458,6 +458,12 @@
<artifactId>lucene-queryparser</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>com.yomahub</groupId>
<artifactId>tlog-core</artifactId>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockpitController.java
View File

@@ -70,7 +70,7 @@ public class CockpitController {
}
@PostMapping("/getTbxInfo")
@Log("获取固化室信息")
@Log("获取涂板线信息")
@ApiOperation("获取涂板线信息")
public ResponseEntity<Object> getTbxInfo() {
return new ResponseEntity<>(cockpitService.getTbxInfo(), HttpStatus.OK);

22
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
View File

@@ -15,7 +15,8 @@
pw.operator,
pw.create_name,
pw.plan_qty,
pw.real_qty
pw.real_qty,
pw.point_name
FROM
`pdm_bd_workorder` pw
LEFT JOIN md_base_material mm ON mm.material_id = pw.material_id
@@ -90,17 +91,18 @@
<select id="getGhsPointList" resultType="org.nl.wms.pda.service.dao.vo.GhsPointVo">
SELECT
p.point_code,
v.group_id,
m.material_name,
v.material_qty
p.point_code,
v.group_id,
m.material_name,
v.material_qty
FROM
sch_base_point p,
sch_base_vehiclematerialgroup v,
md_base_material m
sch_base_point p
LEFT JOIN sch_base_vehiclematerialgroup v ON p.vehicle_code = v.vehicle_code
LEFT JOIN md_base_material m ON m.material_id = v.material_id
WHERE
p.region_code = 'GH'
AND p.vehicle_code = v.vehicle_code
p.region_code = 'GH'
AND p.vehicle_code IS NOT NULL
AND p.vehicle_code <![CDATA[<>]]> ""
</select>
<update id="changePointQty">

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/GhsPointVo.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class GhsPointVo {
private String point_code;
private String vehicle_name;
private String material_name;
private String group_id;
private String material_qty;
}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/ManualWorkOrderVo.java
View File

@@ -17,4 +17,5 @@ public class ManualWorkOrderVo {
private String create_name;
private String plan_qty;
private String real_qty;
private String point_name;
}

3
lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -6,7 +6,7 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:tn_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:123456}
@@ -55,6 +55,7 @@ spring:
redis:
#数据库索引
database: ${REDIS_DB:2}
# host: ${REDIS_HOST:10.44.101.112}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:}