fix: 分切下料去除B1
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
FROM `bst_ivt_cutpointivt` bct
|
||||
WHERE bct.point_type = '3'
|
||||
AND bct.point_status = '3'
|
||||
AND bct.product_area = 'B2'
|
||||
AND bct.is_used = '1'
|
||||
AND 0 = (SELECT COUNT(*)
|
||||
FROM sch_base_task t
|
||||
|
||||
@@ -445,7 +445,7 @@ public class SlitterServiceImpl implements SlitterService {
|
||||
public JSONObject mesSlittingMachineSendMaterial(JSONObject param) {
|
||||
log.info("分切机下料的输入参数为:{}", param);
|
||||
JSONObject res = new JSONObject();
|
||||
// todo: 获取子卷号数组
|
||||
// 获取子卷号数组
|
||||
JSONArray containers = param.getJSONArray("container");
|
||||
List<String> containerList = containers.toJavaList(String.class);
|
||||
if (containerList.size() == 0) {
|
||||
@@ -955,7 +955,7 @@ public class SlitterServiceImpl implements SlitterService {
|
||||
try {
|
||||
openLock = open.tryLock(0, TimeUnit.SECONDS);
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
throw new BadRequestException("获取锁异常");
|
||||
}
|
||||
try {
|
||||
if (openLock) {
|
||||
@@ -975,7 +975,7 @@ public class SlitterServiceImpl implements SlitterService {
|
||||
try {
|
||||
tryLock = lock.tryLock(0, TimeUnit.SECONDS);
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
throw new BadRequestException("获取锁异常");
|
||||
}
|
||||
try {
|
||||
if (tryLock) {
|
||||
|
||||
Reference in New Issue
Block a user