root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 分切下料去除B1

Browse Source
This commit is contained in:
liyongde
2024-07-09 15:21:10 +08:00
parent c660472ae9
commit d9cff93a11
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
View File

@@ -27,6 +27,7 @@
FROM `bst_ivt_cutpointivt` bct FROM `bst_ivt_cutpointivt` bct
WHERE bct.point_type = '3' WHERE bct.point_type = '3'
AND bct.point_status = '3' AND bct.point_status = '3'
AND bct.product_area = 'B2'
AND bct.is_used = '1' AND bct.is_used = '1'
AND 0 = (SELECT COUNT(*) AND 0 = (SELECT COUNT(*)
FROM sch_base_task t FROM sch_base_task t

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -445,7 +445,7 @@ public class SlitterServiceImpl implements SlitterService {
public JSONObject mesSlittingMachineSendMaterial(JSONObject param) { public JSONObject mesSlittingMachineSendMaterial(JSONObject param) {
log.info("分切机下料的输入参数为：{}", param); log.info("分切机下料的输入参数为：{}", param);
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();
// todo: 获取子卷号数组 // 获取子卷号数组
JSONArray containers = param.getJSONArray("container"); JSONArray containers = param.getJSONArray("container");
List<String> containerList = containers.toJavaList(String.class); List<String> containerList = containers.toJavaList(String.class);
if (containerList.size() == 0) { if (containerList.size() == 0) {
@@ -955,7 +955,7 @@ public class SlitterServiceImpl implements SlitterService {
try { try {
openLock = open.tryLock(0, TimeUnit.SECONDS); openLock = open.tryLock(0, TimeUnit.SECONDS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new BadRequestException("获取锁异常");
} }
try { try {
if (openLock) { if (openLock) {
@@ -975,7 +975,7 @@ public class SlitterServiceImpl implements SlitterService {
try { try {
tryLock = lock.tryLock(0, TimeUnit.SECONDS); tryLock = lock.tryLock(0, TimeUnit.SECONDS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new BadRequestException("获取锁异常");
} }
try { try {
if (tryLock) { if (tryLock) {