lt/FT576WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

监控屏蔽

Browse Source
This commit is contained in:
1009473166@qq.com
2026-08-06 17:12:26 +08:00
parent ca32a48223
commit 890a06bc0f
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/monit/MonitoringThread.java
View File

@@ -373,18 +373,18 @@ public class MonitoringThread implements Runnable, Stoppable {
Convert.toInt(msgDdj.getPort()),
msgDdj.getPlcDbReadAddress(),
Convert.toInt(msgDdj.getCzfs()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getSbzt()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getRwh()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getHczt()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getJdbz()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getYph()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getYlh()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getYch()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getMbph()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getMblh()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getMbch()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getYxxf()==null?0:msgDdj.getCzfs()),
Convert.toInt(msgDdj.getXtxh()==null?0:msgDdj.getCzfs())
Convert.toInt(msgDdj.getSbzt()==null?0:msgDdj.getSbzt()),
Convert.toInt(msgDdj.getRwh()==null?0:msgDdj.getRwh()),
Convert.toInt(msgDdj.getHczt()==null?0:msgDdj.getHczt()),
Convert.toInt(msgDdj.getJdbz()==null?0:msgDdj.getJdbz()),
Convert.toInt(msgDdj.getYph()==null?0:msgDdj.getYph()),
Convert.toInt(msgDdj.getYlh()==null?0:msgDdj.getYlh()),
Convert.toInt(msgDdj.getYch()==null?0:msgDdj.getYch()),
Convert.toInt(msgDdj.getMbph()==null?0:msgDdj.getMbph()),
Convert.toInt(msgDdj.getMblh()==null?0:msgDdj.getMblh()),
Convert.toInt(msgDdj.getMbch()==null?0:msgDdj.getMbch()),
Convert.toInt(msgDdj.getYxxf()==null?0:msgDdj.getYxxf()),
Convert.toInt(msgDdj.getXtxh()==null?0:msgDdj.getXtxh())
);
}

8
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/BaseSsjThread.java
View File

@@ -142,7 +142,7 @@ public class BaseSsjThread implements Runnable, Stoppable {
if (mydoJob != null) {
writeToSsj(ssjDetail.getSendDb(), mydoJob.getTaskNo(), 1, 1);
} else {
writeToSsj(ssjDetail.getSendDb(), mydoJob.getTaskNo(), 2, 1);
writeToSsj(ssjDetail.getSendDb(), "99", 2, 1);
}
}
// 9 自动出库口：到位后完成出库
@@ -210,11 +210,13 @@ public class BaseSsjThread implements Runnable, Stoppable {
mydoJob.setCreateTime(new Date());
mydoJob.setLineId(0);//任务生成标识，机械手码垛完毕后，更新成1 ，给输送机下发
List<MaterialLineDetail> materialLineDetails = facadeService.selectByMaterDetail(materialLine.getLineId());
int a=0;
for (int i = 0; i < materialLineDetails.size(); i++) {
a=+1;
InStockInDetail inStockInDetail = facadeService.selectInStockInDetail(materialLineDetails.get(i).getBarCode());
MydoJobDetail mydoJobDetail = new MydoJobDetail();
mydoJobDetail.setJobId(rk);
mydoJobDetail.setJobDetailId(rk + "-" + (++i));
mydoJobDetail.setJobDetailId(rk + "-" + a);
mydoJobDetail.setProductId(inStockInDetail.getProductId()); // 物料编码
mydoJobDetail.setLotNo(inStockInDetail.getLotNo()); // 批号
mydoJobDetail.setInQuantity(BigDecimal.valueOf(1)); // 入库数量
@@ -290,7 +292,7 @@ public class BaseSsjThread implements Runnable, Stoppable {
private void allotSpace(int rwh) {
MydoJob mydoJob = facadeService.selectJobByTaskNo(rwh);
if (mydoJob.getRoadwayId() == null) {
if (mydoJob.getRoadwayId() != null) {
String cargoSpaceId = null;
cargoSpaceId = facadeService.selectPrimaryCargoSpace(mydoJob.getRoadwayId());
if (cargoSpaceId == null) {