From 6d4ae730f093c9bcbb28fd97d8e3ce8867b9d693 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 01 一月 2025 17:42:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/DevpSlave.java | 12 ++
src/main/java/com/zy/asrs/controller/RgvController.java | 59 ++++-------
src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java | 19 +++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 82 ++++++++++++++--
src/main/webapp/views/rgv.html | 64 ++++++------
src/main/java/com/zy/asrs/entity/BasJarMast.java | 5
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java | 4
src/main/resources/application.yml | 24 ++++
9 files changed, 185 insertions(+), 86 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index c33b833..f864314 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.Arith;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
@@ -14,8 +13,7 @@
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
-import com.zy.asrs.utils.VersionUtils;
-import com.zy.core.Slave;
+import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -26,12 +24,11 @@
import com.zy.core.model.Task;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
+import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.RgvThread;
-import com.zy.core.thread.ScaleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -67,37 +64,29 @@
@ManagerAuth(memo = "RGV淇℃伅琛�")
public R rgvStateTable(){
List<RgvStateTableVo> list = new ArrayList<>();
- List<BasRgv> rgvs = basRgvService.selectList(new EntityWrapper<BasRgv>().orderBy("rgv_no"));
- for (BasRgv basRgv : rgvs) {
- // 琛ㄦ牸琛�
- RgvStateTableVo vo = new RgvStateTableVo();
- vo.setRgvNo(basRgv.getRgvNo()); // RGV鍙�
- list.add(vo);
- // 鑾峰彇RGV淇℃伅
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basRgv.getRgvNo());
- if (rgvThread == null) {
- continue;
- }
- RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
- if (rgvProtocol == null) {
- continue;
- }
- vo.setStatusType(rgvProtocol.modeType.desc); // 妯″紡鐘舵��
- vo.setStatus(rgvProtocol.getStatusType().desc); // 鐘舵��
- vo.setWorkNo1(rgvProtocol.getTaskNo1()); // 宸ヤ綅1浠诲姟鍙�
- vo.setStatus1(rgvProtocol.getStatusType1().desc); // 宸ヤ綅1鐘舵��
- vo.setLoading1(rgvProtocol.getLoaded1()==1?"鏈夌墿":"鏃犵墿"); // 宸ヤ綅1鏈夌墿
- vo.setRgvPos(rgvProtocol.getRgvPos());
- vo.setWalkPos(rgvProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
- vo.setWorkNo2(rgvProtocol.getTaskNo2()); // 宸ヤ綅2浠诲姟鍙�
- vo.setStatus2(rgvProtocol.getStatusType2().desc); // 宸ヤ綅2鐘舵��
- vo.setLoading2(rgvProtocol.getLoaded2()==0?"鏃犵墿":"鏈夌墿"); // 宸ヤ綅2鏈夌墿
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+ Map<Integer, StaProtocol> station = devpThread.getStation();
+ int[] basRgvList =new int[]{623,624,625,626};
- vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
- if (rgvProtocol.getAlarm() > 0) {
- BasRgvErr rgvErr = basRgvErrMapper.selectById(rgvProtocol.getAlarm());
- vo.setAlarm(rgvErr==null?"鏈煡寮傚父":rgvErr.getErrName());
- }
+ for (int rgvNo : basRgvList) {
+ RgvStateTableVo vo = new RgvStateTableVo();
+ vo.setRgvNo(rgvNo); // 绔欑偣缂栧彿
+ list.add(vo);
+ StaProtocol staProtocol = station.get(rgvNo);
+ if (null == staProtocol) { continue; }
+ vo.setWorkNo1(staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
+ vo.setStatusType(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
+ vo.setStatus(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setEndRow(staProtocol.getEndRow()); // 灏忚溅鐩爣浣�
+ vo.setNowRow(staProtocol.getNowRow()); // 灏忚溅褰撳墠浣� //宸︼細1 涓細 2 鍙筹細3 锛堥潰鏈濆叆鏂欏彛锛�
+ vo.setStatus11(staProtocol.isRGV1()?"Y":"N"); // 宸ヤ綔鍙�
+ vo.setStatus12(staProtocol.isRGV2()?"Y":"N"); // 宸ヤ綔鍙�
+ vo.setStatus13(staProtocol.isRGV3()?"Y":"N"); // 宸ヤ綔鍙�
+ vo.setStatus14(staProtocol.isRGV4()?"Y":"N"); // 宸ヤ綔鍙�
+ vo.setStatus15(staProtocol.isRGV5()?"Y":"N"); // 宸ヤ綔鍙�
+ vo.setStatus16(staProtocol.isRGV6()?"Y":"N"); // 宸ヤ綔鍙�
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+// vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
index 6329714..648e56d 100644
--- a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
@@ -19,9 +19,15 @@
// 浠诲姟鍙�
private Short workNo1 = 0;
-
+ private short endRow;//灏忚溅鐩爣浣�
+ private short nowRow;//灏忚溅褰撳墠浣� //宸︼細1 涓細 2 鍙筹細3 锛堥潰鏈濆叆鏂欏彛锛�
// 鐘舵��
- private String status1 = "-";
+ private String status11 = "-";
+ private String status12 = "-";
+ private String status13 = "-";
+ private String status14 = "-";
+ private String status15 = "-";
+ private String status16 = "-";
// 鏈夌墿
private String loading1 = "-";
@@ -35,8 +41,13 @@
// 浠诲姟鍙�
private Short workNo2 = 0;
- // 鐘舵��
- private String status2 = "-";
+// // 鐘舵��
+// private String status21 = "-";
+// private String status22 = "-";
+// private String status23 = "-";
+// private String status24 = "-";
+// private String status25 = "-";
+// private String status26 = "-";
// 鏈夌墿
private String loading2 = "-";
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index 432037d..1c5a082 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -341,7 +341,10 @@
case 5:
return 4;
case 6:
- return 10;
+ if (this.status == 11) {
+ return 10;
+ }
+ return 11;
case 9:
return 17;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index b874b5a..dd57260 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5367,8 +5367,8 @@
case 3:
case 4:
signExecute = jarWrkMastExecuteGenerateJar(signExecute,sign);//纭寲缃愪换鍔�
- case 5:
- signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//鍐峰嵈妲藉彇杈撻�佺嚎
+// case 5:
+// signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//鍐峰嵈妲藉幓杈撻�佺嚎
default:
jarWrkMastExecuteGenerateSte(signExecute,sign);//灏忚溅绉诲姩
// signExecute = jarWrkMastExecuteGenerateBurial(signExecute, sign);//鍐峰嵈妲藉彇杈撻�佺嚎
@@ -6462,12 +6462,12 @@
if (jarWrkMastExecuteActionExecute5Three(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
case 6:
if (jarWrkMastExecuteActionExecute6Three(wrkMastExecute,sign)){
break;
}
- return;
+ continue;
}
}
} catch (Exception e){
@@ -7202,7 +7202,7 @@
return false;
}
//璋冭溅 == > 鍙栬揣
- if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT25.id,SteTaskModeType.STE_WFFH_13,false,SteAndJarUtil.getBJarNo(wrkMastExecute.getJarId()))){
+ if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_WFFH_13,false,SteAndJarUtil.getBJarNo(wrkMastExecute.getJarId()))){
log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSONString(wrkMastExecute), JSON.toJSONString(jarProtocol),sign);
}
@@ -7927,29 +7927,91 @@
switch (sign){
case 1:
if (jarWrkMastExecuteGenerateSteComplete(sign)){
- break;
+ return;
}
case 2:
if (jarWrkMastExecuteGenerateJarComplete(sign)){
- break;
+ return;
}
case 3:
if (jarWrkMastExecuteGenerateRgvComplete1(sign)){
- break;
+ return;
}
case 4:
if (jarWrkMastExecuteGenerateRgvComplete2(sign)){
- break;
+ return;
}
default:
- return;
+ break;
}
+ jarWrkMastExecuteGenerateDevComplete(sign);
}catch (Exception e){
log.error("JarWrkMastExecute浠诲姟瀹屾垚鎶ラ敊锛�"+e);
}
}
/**
+ * JarWrkMastExecute浠诲姟瀹屾垚 ===>Devp //瀹屾垚
+ */
+ public synchronized boolean jarWrkMastExecuteGenerateDevComplete(Integer sign) {
+ try{
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getOutJarInSta()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鏉′欢
+ if (staProtocol.isAutoing()
+ && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && staProtocol.getWorkNo() == 0
+ && staProtocol.isPakMk()) {
+ for (DevpSlave.Jar jar : inSta.getJarList()) {
+ // 鍒ゆ柇閲嶅宸ヤ綔妗�
+ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListB(jar.getBurial(), new ArrayList<Integer>() {{
+ add(9);
+ add(11);
+ }});
+ if (basJarMastList.isEmpty()){
+ continue;
+ }
+ BasJarMast jarMastByWrkNo = basJarMastList.get(0);
+ jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete(6));
+
+
+ StaProtocol staProtocolNew = new StaProtocol();
+ staProtocolNew.setSiteId(staProtocol.getSiteId());
+ staProtocolNew.setWorkNo(basJarMastList.get(0).getWrkNo().intValue());
+ staProtocolNew.setStaNo(jar.getEndStaNo());
+ devpThread.setPakMk(staProtocolNew.getSiteId(), false,7989);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolNew));
+ if (!result) {
+ LedErrorThreadUtil.ledErrorThread("鏇存柊plc绔欑偣淇℃伅澶辫触!绔欑偣鍙凤細"+inSta.getStaNo(),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
+ if (!basJarMastService.updateById(jarMastByWrkNo)){
+ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,BasJarMast={},寮傚父淇℃伅={}",JSON.toJSONString(jarMastByWrkNo),"鏇存柊basJarMast澶辫触");
+ throw new CoolException("鏇存柊basJarMast澶辫触");
+ }
+ break;
+ }
+ }
+ }
+ }
+ return true;
+ }catch (Exception e){
+ log.error("JarWrkMastExecute浠诲姟瀹屾垚 ===>Ste鎶ラ敊锛�"+e);
+ }
+ return false;
+ }
+
+ /**
* JarWrkMastExecute浠诲姟瀹屾垚 ===>Ste //瀹屾垚
*/
public synchronized boolean jarWrkMastExecuteGenerateSteComplete(Integer sign) {
diff --git a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
index 0ac9f54..7be25f1 100644
--- a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
@@ -24,7 +24,7 @@
int[] jarList =new int[]{1,2,3,4,5,6};
for (int jarNo : jarList){
try{
- ReturnT<String> result = jarBurialEscalationHandler.start(jarNo,10,11);
+ ReturnT<String> result = jarBurialEscalationHandler.start(jarNo,10,17);
if (result.getCode()==200){
break;
}
@@ -34,7 +34,7 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){//涓婁紶寮�寮忓喎鍗翠俊鍙�
int[] jarList =new int[]{1,2,3,4,5,6};
for (int jarNo : jarList){
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index bc52a25..d573f14 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -40,7 +40,7 @@
i++; if (i>5) i=0;
j++; if (j>5) j=0;
k++;
- if (k>6) {
+ if (k>5) {
k=0;
l++;
if (l>=3) l=0;
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 7da74bf..2f40936 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -21,6 +21,7 @@
private List<Sta> inSta = new ArrayList<>();
private List<Sta> inSta464 = new ArrayList<>();
+ private List<Sta> outJarInSta = new ArrayList<>();
private List<Sta> driveSta = new ArrayList<>();
private List<Sta> inWmsSta = new ArrayList<>();
private List<Sta> inSingleSta = new ArrayList<>();
@@ -54,6 +55,8 @@
private Integer led;
+ private List<Jar> JarList = new ArrayList<>();//纭寲缃�
+
}
@Data
@@ -86,4 +89,13 @@
}
+ @Data
+ public static class Jar {
+
+ private Integer jarNo;//jar缂栧彿
+ private Integer endStaNo;//jar缂栧彿
+ private Integer burial;//jar缂栧彿
+
+ }
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d42c5c3..7afd2ba 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -386,6 +386,30 @@
staNo: 628
row: 1
+ # 澶ф枡绠� 纭寲瀹屾垚 鍏ュ簱鍙�1
+ outJarInSta[0]:
+ staNo: 627
+ led: ${wcs-slave.led[1].id}
+ JarList[0]:
+ jarNo: 1
+ endStaNo: 518
+ burial: 5
+ JarList[1]:
+ jarNo: 2
+ endStaNo: 518
+ burial: 5
+ # 澶ф枡绠� 纭寲瀹屾垚 鍏ュ簱鍙�2
+ outJarInSta[1]:
+ staNo: 628
+ led: ${wcs-slave.led[1].id}
+ JarList[0]:
+ jarNo: 3
+ endStaNo: 518
+ burial: 6
+ JarList[1]:
+ jarNo: 4
+ endStaNo: 518
+ burial: 6
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index fc468d9..749a255 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -90,18 +90,17 @@
<thead>
<tr>
<th>RGV</th>
- <th>妯″紡</th>
- <th>鐘舵��</th>
- <th>浠诲姟鍙�1</th>
+ <th>鑷姩</th>
+ <th>鏈夌墿</th>
+ <th>灏忚溅鐩爣浣�</th>
+ <th>灏忚溅褰撳墠浣�</th>
+ <th>浠诲姟鍙�</th>
<th>鐘舵��1</th>
- <th>鏈夌墿1</th>
- <th>RGV浣嶇疆</th>
- <th>璧拌瀹氫綅</th>
- <th>浠诲姟鍙�2</th>
<th>鐘舵��2</th>
- <th>鏈夌墿2</th>
- <th>鏁呴殰浠ｇ爜</th>
- <th>鏁呴殰鎻忚堪</th>
+ <th>鐘舵��3</th>
+ <th>鐘舵��4</th>
+ <th>鐘舵��5</th>
+ <th>鐘舵��6</th>
</tr>
</thead>
<tbody>
@@ -114,13 +113,13 @@
<table id="rgv-msg-table">
<thead>
<tr>
- <th>RGV</th>
- <th>宸ヤ綔鍙�</th>
- <th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
+<!-- <th>RGV</th>-->
+<!-- <th>宸ヤ綔鍙�</th>-->
+<!-- <th>鐘舵��</th>-->
+<!-- <th>婧愮珯</th>-->
+<!-- <th>鐩爣绔�</th>-->
+<!-- <th>婧愬簱浣�</th>-->
+<!-- <th>鐩爣搴撲綅</th>-->
<!-- <th>璧拌閫熷害锛坢/min)</th>-->
<!-- <th>鍗囬檷閫熷害锛坢/min)</th>-->
<!-- <th>鍙夌墮閫熷害锛坢/min)</th>-->
@@ -205,18 +204,18 @@
<fieldset>
<legend>鎵嬪姩鎿嶄綔</legend>
<div class="button-group">
- <button class="item" onclick="put()">鍙栨斁璐�</button>
- <button class="item" onclick="take()">鍙栬揣</button>
- <button class="item" onclick="stockMove()">鏀捐揣</button>
+<!-- <button class="item" onclick="put()">鍙栨斁璐�</button>-->
+<!-- <button class="item" onclick="take()">鍙栬揣</button>-->
+<!-- <button class="item" onclick="stockMove()">鏀捐揣</button>-->
<!-- <button class="item" onclick="siteMove()">绔欏埌绔�</button>-->
<!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+<!-- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>-->
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
- <button class="item" onclick="handleReset()">澶嶄綅</button>
+<!-- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
+<!-- <button class="item" onclick="handleReset()">澶嶄綅</button>-->
</div>
</fieldset>
</div>
@@ -312,16 +311,15 @@
setVal(tr.children("td").eq(0), table[i-1].rgvNo);
setVal(tr.children("td").eq(1), table[i-1].statusType);
setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].workNo1);
- setVal(tr.children("td").eq(4), table[i-1].status1);
- setVal(tr.children("td").eq(5), table[i-1].loading1);
- setVal(tr.children("td").eq(6), table[i-1].rgvPos);
- setVal(tr.children("td").eq(7), table[i-1].walkPos);
- setVal(tr.children("td").eq(8), table[i-1].workNo2);
- setVal(tr.children("td").eq(9), table[i-1].status2);
- setVal(tr.children("td").eq(10), table[i-1].loading2);
- setVal(tr.children("td").eq(11), table[i-1].warnCode);
- setVal(tr.children("td").eq(12), table[i-1].alarm);
+ setVal(tr.children("td").eq(3), table[i-1].endRow);
+ setVal(tr.children("td").eq(4), table[i-1].nowRow);
+ setVal(tr.children("td").eq(5), table[i-1].workNo1);
+ setVal(tr.children("td").eq(6), table[i-1].status11);
+ setVal(tr.children("td").eq(7), table[i-1].status12);
+ setVal(tr.children("td").eq(8), table[i-1].status13);
+ setVal(tr.children("td").eq(9), table[i-1].status14);
+ setVal(tr.children("td").eq(10), table[i-1].status15);
+ setVal(tr.children("td").eq(11), table[i-1].status16);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1