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

opt: 修改了部分常量

Browse Source
This commit is contained in:
liyongde
2024-09-02 17:18:59 +08:00
parent 2c7ce38ef0
commit 868899e09d
6 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilPdaServiceImpl.java
View File

@@ -102,6 +102,7 @@ public class RawFoilPdaServiceImpl implements RawFoilPdaService {
}
@Override
@Deprecated
@Transactional(rollbackFor = Exception.class)
public JSONObject needEmptyAxis(JSONObject param) {
log.info("手持生箔下料: {}", param);
@@ -191,7 +192,7 @@ public class RawFoilPdaServiceImpl implements RawFoilPdaService {
rawOrder.setStatus("01");
TaskUtils.setRawOrderCreateByDefault(rawOrder);
rawOrder.setProduct_area(sbPoint.getProduct_area());
rawOrder.setIs_baking("0");
rawOrder.setIs_baking("1");
rawOrder.setOrder_type("1");
rawOrder.setBaking_time("80");
rawOrder.setRoll_type("1");

25
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/core/constant/RegionConstant.java Normal file
View File

@@ -0,0 +1,25 @@
package org.nl.wms.sch.task_manage.core.constant;
/**
* @Author: lyd
* @Description: 区域常量
* @Date: 2024/9/2
*/
public interface RegionConstant {
/** A1成品称重暂存区 */
public final static String REGION_A1_CZZC = "A1-CZZC";
/** A1废箔区域 */
public final static String REGION_A1_FB = "A1-FB";
/** A1废箔区域 */
public final static String REGION_A1_GXK = "A1-GXK";
/** A1废箔区域 */
public final static String REGION_A1_HXZC = "A1-HXZC";
/** A1电梯区域 */
public final static String REGION_A1_LIFT_AREA = "A1-LIFT-AREA";
/** A1收卷辊库区 */
public final static String REGION_A1_SJGK = "A1-SJGK";
/** A1样品检测区域 */
public final static String REGION_A1_YPJC = "A1-YPJC";
/** A1装箱暂存区 */
public final static String REGION_A1_ZXZC = "A1-ZXZC";
}

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java
View File

@@ -41,7 +41,6 @@ import static org.nl.wms.util.TaskUtils.checkTaskOptionStatus;
@Component(value = "AutoInHotTrussTask")
public class AutoInHotTrussTask extends AbstractTask {
private final String THIS_CLASS = AutoInHotTrussTask.class.getName();
private final static String HX_REGION = "A1-HXZC";
@Autowired
private ISchBasePointService pointService;
@Autowired

6
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java
View File

@@ -30,6 +30,7 @@ import static org.nl.wms.util.TaskUtils.checkTaskOptionStatus;
import static org.nl.wms.util.TaskUtils.setUpdateByPC;
import static org.nl.wms.util.PointUtils.setUpdateByType;
import static org.nl.wms.util.PointUtils.setHxUpdateByType;
import static org.nl.wms.sch.task_manage.core.constant.RegionConstant.REGION_A1_HXZC;
/**
* @Author: lyd
@@ -40,7 +41,6 @@ import static org.nl.wms.util.PointUtils.setHxUpdateByType;
@Component(value = "InHotTrussTask")
public class InHotTrussTask extends AbstractTask {
private final String THIS_CLASS = InHotTrussTask.class.getName();
private final static String HX_REGION = "A1-HXZC";
@Autowired
private IpdmBiRawfoilworkorderService rawfoilworkorderService;
@@ -94,7 +94,7 @@ public class InHotTrussTask extends AbstractTask {
// 没有烘烤位置或者没有找到对应的点就区待烘烤区， 就去待烘烤
if (hotList.size() == 0 || ObjectUtil.isEmpty(task.getPoint_code2())) {
// 找不到就去找暂存区（待烘烤区）
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", HX_REGION,
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", REGION_A1_HXZC,
"2", "1");
if (hotDjwList.size() > 0) {
SchBasePoint point = hotDjwList.get(0);
@@ -104,7 +104,7 @@ public class InHotTrussTask extends AbstractTask {
// todo: 需要烘烤，且是小卷，但是没有位置，需要将最快结束的烘箱组锁住
} else {
// 不需要烘烤，则送到暂存区（无需烘烤区 - 任务做完需要将点位设置为待分切）
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", HX_REGION,
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", REGION_A1_HXZC,
"3", "1");
if (hotDjwList.size() > 0) {
SchBasePoint point = hotDjwList.get(0);

5
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java
View File

@@ -29,6 +29,7 @@ import static org.nl.wms.util.PointUtils.*;
import static org.nl.wms.util.TaskUtils.checkTaskOptionStatus;
import static org.nl.wms.util.TaskUtils.setUpdateByPC;
import static org.nl.wms.util.TaskUtils.setUpdateByType;
import static org.nl.wms.sch.task_manage.core.constant.RegionConstant.REGION_A1_HXZC;
/**
* @Author: lyd
@@ -55,7 +56,7 @@ public class OutHotTrussTask extends AbstractTask {
@Override
public void createCompletion(SchBaseTask task) {
TaskUtils.taskLock("A1-HXZC", () -> {
TaskUtils.taskLock(REGION_A1_HXZC, () -> {
String requestParam = task.getRequest_param();
JSONObject requestObj = JSONObject.parseObject(requestParam);
String startPoint = task.getPoint_code1();
@@ -63,7 +64,7 @@ public class OutHotTrussTask extends AbstractTask {
// 烘箱起点位置
StIvtHotpointivt hotPoint = hotpointivtService.getPointByCode(startPoint, false);
// 从烘箱暂存位找一个空位
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", "A1-HXZC",
List<SchBasePoint> hotDjwList = pointService.getHotNotTaskPoint("A1", REGION_A1_HXZC,
ObjectUtil.isNotEmpty(pointType) ? pointType : "4", "1");
if (hotDjwList.size() == 0) {
// 如果是在烘箱中的，那就不需要创建入其他未开启的烘箱

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawCallRollTrussTask.java
View File

@@ -103,6 +103,7 @@ public class RawCallRollTrussTask extends AbstractTask {
}
log.info("点位清除完毕，清除后的数据：{}", startPointObj);
if ("2".equals(flag)) {
// TODO: 此功能留给手持人工需要单独叫收卷辊出来，目前没有做手持功能
log.info("手持单独呼叫收卷辊，不创建AGV任务!");
} else {
// 2、创建AGV任务