From 3fbef8c9533fea45f5ece7f8384fc8172d3fd4e2 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 17:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/java/com/zy/asrs/controller/SiteController.java | 2 ++
src/main/webapp/views/pipeline.html | 4 ++++
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 3 +++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 2ef5e89..c0ca6d7 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -88,6 +88,8 @@
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "灏�" : "澶�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getLocType1$());
+ vo.setAutoIn(staProtocol.isEmptyInPalletRequire()?"Y":"N");
+ vo.setAutoIn(staProtocol.isEmptyOutPalletRequire()?"Y":"N");
// vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
return R.ok().add(list);
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index 42b7bc9..35c4d70 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -37,4 +37,7 @@
//楂樹綆搴撲綅
private String locType1 = "-";
+
+ private String autoIn = "-";
+ private String autoOut = "-";
}
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index b73dbf2..804c3fd 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -91,6 +91,8 @@
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
<th>楂樹綆搴撲綅</th>
+ <th>鑷姩鍑�</th>
+ <th>鑷姩鍏�</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -279,6 +281,8 @@
setVal(tr.children("td").eq(7), table[i-1].emptyMk);
setVal(tr.children("td").eq(8), table[i-1].staNo);
setVal(tr.children("td").eq(9), table[i-1].locType1);
+ setVal(tr.children("td").eq(10), table[i-1].autoOut);
+ setVal(tr.children("td").eq(10), table[i-1].autoIn);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1