From a77530a0e917f8d2dca1bae55a3730471c8e10a2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 09:22:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 1
src/main/java/com/zy/asrs/controller/SiteController.java | 101 +++++++++++++++++++++++++++++++--
src/main/webapp/views/deviceOperate/devpOperate.html | 28 ++++++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 ++++
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 3 +
src/main/java/com/zy/core/DevpThread.java | 1
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 16 +++++
7 files changed, 148 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index b2e0413..ada482c 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -105,18 +105,21 @@
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing()?"鑷姩":"闈炶嚜鍔�"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable()?"鍙叆":"涓嶅彲鍏�"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable()?"鍙嚭":"涓嶅彲鍑�"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()? "鏈攣瀹�":"宸查攣瀹�"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk()?"绌烘澘":"闈炵┖鏉�"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
- vo.setWeight(staProtocol.getGrossWt().toString());
+ vo.setWeight(staProtocol.getGrossWt().toString()+"kg");
vo.setBarcode(staProtocol.getBarcodeNow());
vo.setErrorDev(staProtocol.getErrorDev$());
+ vo.setPakMkRun(staProtocol.isPakMkRun()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
+ vo.setPakMkTask(staProtocol.isPakMkTask()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
+ vo.setPakMkWalk(staProtocol.isPakMkWalk()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
}
return R.ok().add(list);
}
@@ -236,6 +239,90 @@
}
return R.error("鏇存柊澶辫触");
}
+
+ @PostMapping("/detl/pakMk")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMk(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMk(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkRun")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkRun(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMkRun(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkTask")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkTask(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMkTask(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkWalk")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkWalk(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpThread.setPakMkWalk(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
@PostMapping("/detl/out")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlout(@RequestParam Integer devNo,
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 0bb7467..2e2d712 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -41,4 +41,7 @@
private String barcode = "-";
private String errorDev = "-";
private String car = "-";
+ private String pakMkRun = "-";
+ private String pakMkTask = "-";
+ private String pakMkWalk = "-";
}
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 e20adc7..c58511a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1884,6 +1884,11 @@
return null;
}
// 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
+ if (!staProtocol.isPakMkTask()) {
+ devpThread.setErrorDev(staProtocol.getSiteId(), "浠诲姟宸蹭笅鍙戠瓑寰呭皬杞﹀彇");
+ return null;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
if (staProtocol.isAutoing()
// && staProtocol.isLoading()
// && staProtocol.isStaOk()
@@ -1892,7 +1897,6 @@
if (taskWrk != null) {
Integer stano = staProtocol.getStaNo();
if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
- // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
if (!staProtocol.isPakMkRun()) {
devpThread.setErrorDev(staProtocol.getSiteId(), "寮傚父鍥為��鏍囪锛岄渶瑕佸洖閫�");
return null;
@@ -1982,6 +1986,7 @@
staProtocol.setStaNo(staProtocol.getStaNo()+1);
devpThread.setPakMk(staProtocol.getSiteId(), false);
devpThread.setPakMkRun(staProtocol.getSiteId(), false);
+ devpThread.setPakMkTask(staProtocol.getSiteId(), false);
devpThread.setErrorDev(staProtocol.getSiteId(), errMsg);
MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
try{
@@ -2449,6 +2454,7 @@
try {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
TaskProtocolCache taskProtocolCache = rgvThread.getTaskProtocolCache();
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
TaskProtocol issuedTake = new TaskProtocol();
TaskProtocol issuedPut = new TaskProtocol();
@@ -2471,6 +2477,12 @@
return false;
}
}
+ try{
+ devpThread.setPakMkTask(rgvStn.getStaNo(), false);
+ } catch (Exception e2){
+ RgvErrCache.updateRgvErr(rgvSlave.getId(),rgvStn.getStaNo()+"灏忚溅浠诲姟涓嬪彂鏍囪鏇存柊澶辫触");
+ }
+
BasDevpPosition basDevpPositionSou = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", rgvStn.getStaNo()));
BasDevpPosition basDevpPositionEnd = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", targetPointConvert));
diff --git a/src/main/java/com/zy/core/DevpThread.java b/src/main/java/com/zy/core/DevpThread.java
index 13a8e7a..e0e67f6 100644
--- a/src/main/java/com/zy/core/DevpThread.java
+++ b/src/main/java/com/zy/core/DevpThread.java
@@ -10,6 +10,7 @@
void setPakMk(Integer siteId, boolean pakMk);
void setPakMkRun(Integer siteId, boolean pakMk);
+ void setPakMkTask(Integer siteId, boolean pakMk);
void setPakMkWalk(Integer siteId, boolean pakMkWalk);
void setGrossWt(Integer siteId, Double grossWt);
void setErrorDev(Integer siteId, String msgErr);
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index df9f887..9b1e805 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -53,6 +53,7 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
private boolean pakMkRun = true;
+ private boolean pakMkTask = true;
private boolean pakMkWalk = true;
// 鍏ュ簱鏆傚瓨鏁�
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9075073..d56487d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -325,6 +325,10 @@
if (!staProtocol.isPakMkRun() && !staProtocol.isLoading()) {
staProtocol.setPakMkRun(true);
}
+
+ if (!staProtocol.isPakMkTask() && !staProtocol.isLoading()) {
+ staProtocol.setPakMkTask(true);
+ }
}
}
int[] staW = new int[]{1004,1014,1020};
@@ -625,6 +629,18 @@
* 璁剧疆鍏ュ簱鏍囪
*/
@Override
+ public void setPakMkTask(Integer siteId, boolean pakMk) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setPakMkTask(pakMk);
+ }
+ }
+
+
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ @Override
public void setPakMkRun(Integer siteId, boolean pakMk) {
StaProtocol staProtocol = station.get(siteId);
if (null != staProtocol) {
diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index 8ce2a8d..f3f888f 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -20,11 +20,17 @@
</el-table-column>
<el-table-column property="workNo" label="宸ヤ綔鍙�">
</el-table-column>
- <el-table-column property="locType1" label="楂樹綆搴撲綅">
- </el-table-column>
+<!-- <el-table-column property="locType1" label="楂樹綆搴撲綅">-->
+<!-- </el-table-column>-->
<el-table-column property="pakMk" label="鍏ュ簱鏍囪">
</el-table-column>
+ <el-table-column property="pakMkRun" label="閫�鍥炴爣璁�">
+ </el-table-column>
+ <el-table-column property="pakMkTask" label="灏忚溅浠诲姟涓嬪彂鏍囪">
+ </el-table-column>
<el-table-column property="weight" label="绉伴噸">
+ </el-table-column>
+ <el-table-column property="barcode" label="鏉＄爜">
</el-table-column>
<el-table-column property="errorDev" label="寮傚父鎻愮ず">
</el-table-column>
@@ -45,9 +51,6 @@
<el-form-item label="鐩爣绔�">
<el-input v-model="formParam.staNo" placeholder="鐩爣绔�"></el-input>
</el-form-item>
- <el-form-item label="鍏ュ簱鏍囪">
- <el-input v-model="formParam.pakMk" placeholder="鍏ュ簱鏍囪"></el-input>
- </el-form-item>
</el-form>
<el-form label-position="top" :inline="true" class="demo-form-inline">
<el-form-item label="">
@@ -59,7 +62,10 @@
</el-form>
<div>
<el-button @click="requestOperate('update')" type="primary">鏇存柊</el-button>
-<!-- <el-button @click="requestOperate('out')" type="warning">鍙栬揣瀹屾垚</el-button>-->
+ <el-button @click="requestOperate('pakMk')" type="warning">鍏ュ簱鏍囪澶嶄綅</el-button>
+ <el-button @click="requestOperate('pakMkRun')" type="warning">閫�搴撴爣璁板浣�</el-button>
+ <el-button @click="requestOperate('pakMkTask')" type="warning">灏忚溅浠诲姟涓嬪彂鏍囪澶嶄綅</el-button>
+ <el-button @click="requestOperate('pakMkWalk')" type="warning">WMS浠诲姟涓嬪彂鏍囪澶嶄綅</el-button>
<!-- <el-button @click="requestOperate('in')" type="warning">鏀捐揣瀹屾垚</el-button>-->
</div>
</div>
@@ -89,8 +95,6 @@
</el-descriptions-item>
<el-descriptions-item label="鍙嚭">{{ tableData[currentIndex].outEnable }}
</el-descriptions-item>
- <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
- </el-descriptions-item>
<el-descriptions-item label="绌烘澘淇″彿">{{ tableData[currentIndex].emptyMk }}
</el-descriptions-item>
<el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
@@ -101,6 +105,14 @@
</el-descriptions-item>
<el-descriptions-item label="鏉＄爜">{{ tableData[currentIndex].barcode }}
</el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鍥為��鏍囪">{{ tableData[currentIndex].pakMkRun }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱灏忚溅浠诲姟涓嬪彂鏍囪">{{ tableData[currentIndex].pakMkTask }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱wms浠诲姟涓嬪彂鏍囪">{{ tableData[currentIndex].pakMkWalk }}
+ </el-descriptions-item>
<el-descriptions-item label="寮傚父鎻愮ず">{{ tableData[currentIndex].errorDev }}
</el-descriptions-item>
</el-descriptions>
--
Gitblit v1.9.1