From aa492470e4cb713ff42a1847add19e738e67c36a Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期五, 15 八月 2025 15:12:13 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 13 +++++++++++++
src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java | 8 ++++++++
src/main/java/com/zy/asrs/controller/CrnController.java | 28 ++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 26e6aa5..dd358b1 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -35,6 +35,8 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -68,6 +70,8 @@
private MainServiceImpl mainService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private ConfigService configService;
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@@ -138,6 +142,16 @@
@PostMapping("/table/crn/msg")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
public R crnMsgTable(){
+ Config crnSearchDetectTaskCountConfig = configService.selectOne(new EntityWrapper<Config>()
+ .eq("code", "crnSearchDetectTaskCount")
+ );
+ int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
+
+ Config applyInTaskTotalCountConfig = configService.selectOne(new EntityWrapper<Config>()
+ .eq("code", "applyInTaskTotalCount")
+ );
+ int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
+
List<CrnMsgTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
for (BasCrnp basCrnp : crnps) {
@@ -175,6 +189,20 @@
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
+ vo.setCrnSearchDetectTaskCount(crnSearchDetectTaskCount);
+ vo.setApplyInTaskTotalCount(applyInTaskTotalCount);
+
+ List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("crn_no", basCrnp.getCrnNo())
+ .in("io_type", 1, 10, 53, 57)
+ );
+ vo.setCurrentInTask(inWrkMasts.size());
+
+ List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("crn_no", basCrnp.getCrnNo())
+ .in("io_type", 1, 10, 53, 57, 101, 103, 107, 110)
+ );
+ vo.setCurrentTotalTask(wrkMastsList.size());
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
index ef124a3..0ebc5fd 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
@@ -60,6 +60,14 @@
// 鍗囬檷鏃堕暱(H)
private Float yduration = 0.0F;
+ private Integer crnSearchDetectTaskCount;
+
+ private Integer applyInTaskTotalCount;
+
+ private Integer currentInTask;
+
+ private Integer currentTotalTask;
+
public void setXspeed(Float xspeed) {
this.xspeed = Utils.scale(xspeed);
}
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index a7bc7bd..9f426f5 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -132,6 +132,10 @@
<th>鍗囬檷璺濈(Km)</th>
<th>璧拌鏃堕暱(H)</th>
<th>鍗囬檷鏃堕暱(H)</th>
+ <th>鍏ュ簱浠诲姟涓婇檺</th>
+ <th>褰撳墠鍏ュ簱浠诲姟</th>
+ <th>鎬讳换鍔℃暟閲忎笂闄�</th>
+ <th>褰撳墠鎬讳换鍔℃暟閲�</th>
</tr>
</thead>
<tbody>
@@ -352,6 +356,7 @@
crnMsgTableFullRows = table.length;
}
for (var i=1;i<=table.length;i++){
+ console.log(table[i-1])
var tr = tableEl.find("tr").eq(i);
setVal(tr.children("td").eq(0), table[i-1].crnNo);
setVal(tr.children("td").eq(1), table[i-1].workNo);
@@ -367,6 +372,10 @@
setVal(tr.children("td").eq(11), table[i-1].ydistance);
setVal(tr.children("td").eq(12), table[i-1].xduration);
setVal(tr.children("td").eq(13), table[i-1].yduration);
+ setVal(tr.children("td").eq(14), table[i-1].crnSearchDetectTaskCount);
+ setVal(tr.children("td").eq(15), table[i-1].currentInTask);
+ setVal(tr.children("td").eq(16), table[i-1].applyInTaskTotalCount);
+ setVal(tr.children("td").eq(17), table[i-1].currentTotalTask);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -569,6 +578,10 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
" </tr>\n";
}
$('#crn-msg-table tbody').after(html);
--
Gitblit v1.9.1