From 6e5dbbf19de06b0307ac7841bb326d2d88e8d357 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 17 十月 2024 13:36:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/SiteController.java | 2 +-
src/main/java/com/zy/asrs/entity/BasRgv.java | 6 +++---
src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | 2 +-
src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java | 2 +-
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 2 +-
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 ++++++++++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
8 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index efb6049..9652c90 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -173,7 +173,7 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlUpdate(@RequestParam Integer siteId,
- @RequestParam Integer workNo,
+ @RequestParam Long workNo,
@RequestParam Integer staNo,
@RequestParam String pakMk){
for (DevpSlave devp : slaveProperties.getDevp()) {
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
index 68b61ac..bed32b6 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
@@ -13,7 +13,7 @@
private Integer siteId;
// 宸ヤ綔鍙�
- private Integer workNo;
+ private Long workNo;
// 宸ヤ綔鐘舵��
private String wrkSts = "";
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
index ce27481..b734a24 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
@@ -14,7 +14,7 @@
private String siteId;
// 宸ヤ綔鍙�
- private Integer workNo;
+ private Long workNo;
// 绔欑偣鐘舵��
private SiteStatusType siteStatus;
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 5987ff5..c35fe73 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -12,7 +12,7 @@
private Integer devNo;
// 宸ヤ綔鍙�
- private Integer workNo = 0;
+ private Long workNo = 0L;
// 鑷姩
private String autoing = "-";
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
index e74c792..ea4858c 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -60,14 +60,14 @@
*/
@ApiModelProperty(value= "浠诲姟鍙�")
@TableField("wrk_no1")
- private Integer wrkNo1;
+ private Long wrkNo1;
/**
* 鍫嗗灈鏈哄彿
*/
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
@TableField("wrk_no2")
- private Integer wrkNo2;
+ private Long wrkNo2;
/**
* 閿欒鐮�
@@ -133,7 +133,7 @@
public BasRgv() {}
- public BasRgv(Integer rgvNo,String inEnable,String outEnable,Integer rgvSts,Integer wrkNo1,Integer wrkNo2,Long rgvErr,String pakMk,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public BasRgv(Integer rgvNo,String inEnable,String outEnable,Integer rgvSts,Long wrkNo1,Long wrkNo2,Long rgvErr,String pakMk,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.rgvNo = rgvNo;
this.inEnable = inEnable;
this.outEnable = outEnable;
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 3c9d90a..12e0bb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,10 +1,14 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.WcsTaskDistributionParam;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -17,6 +21,9 @@
@Service
public class OpenServiceImpl implements OpenService {
+ @Autowired
+ private WrkMastService wrkMastService;
+
@Override
@Transactional
public List<String> queryStock() {
@@ -26,12 +33,17 @@
@Override
@Transactional
public R wcsTaskDistribution(WcsTaskDistributionParam param) {
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrkNo", param.getTaskNo()));
+ if (!Cools.isEmpty(wrkMast1)){
+ return R.error().add("宸ヤ綔鍙峰凡瀛樺湪锛宼askNo="+param.getTaskNo());
+ }
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(param.getTaskNo());
wrkMast.setSourceStaNo(param.getStartSta$());
wrkMast.setStaNo(param.getEndSta$());
wrkMast.setWrkSts(1L);
wrkMast.setIoType(1);
+ wrkMastService.insert(wrkMast);
return R.ok();
}
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 977a8e8..d3aee88 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -185,7 +185,7 @@
if (alarm!=null) {
basRgv.setRgvErr(alarm.longValue());
}
- basRgv.setWrkNo1(taskNo1.intValue());
+ basRgv.setWrkNo1(taskNo1.longValue());
return basRgv;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6c5fd45..a07b72a 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -158,7 +158,7 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransUInt32(result.Content, i*8)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransUInt32(result.Content, i*4)); // 宸ヤ綔鍙�
}
}
--
Gitblit v1.9.1