This website works better with JavaScript.
Home
Explore
Help
Register
Sign In
CaiXiang
/
cigs4
Watch
1
Star
0
Fork
0
Code
Issues
0
Pull Requests
0
Releases
0
Wiki
Activity
Browse Source
Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
pull/27/head
闫阳
1 year ago
parent
42f4f2e741
4e02f7e03a
commit
b6e61961f7
3 changed files
with
2 additions
and
4 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-1
ym-admin/src/main/resources/mapper/SysDeptDao.xml
+1
-1
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
+0
-2
ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
+ 1
- 1
ym-admin/src/main/resources/mapper/SysDeptDao.xml
View File
@@ -23,7 +23,7 @@
</select>
<select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity">
select t1.id, t1.pid from sys_dept t1
AND
t1.valid = 1
select t1.id, t1.pid from sys_dept t1
where
t1.valid = 1
</select>
<select id="getSubDeptIdList" resultType="long">
+ 1
- 1
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
View File
@@ -205,7 +205,7 @@ public class KukaJoinThread implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
//
// kukaStep1.scheduleAtFixedRate(new Runnable() {
// @Override
// public void run() {
+ 0
- 2
ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
View File
@@ -15,8 +15,6 @@ public class PowerReportVo {
private Float totalLevelPower; //档位功率汇总
private Float totalCompensatePower; //补偿功率汇总
private Float diversePower; //差异功率汇总
private List<PowerReportDTO> powerReports;
}
Write
Preview
Loading…
Cancel
Save