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

feat: 改造-分切下卷/上轴

Browse Source
This commit is contained in:
zhouz
2026-06-29 16:37:22 +08:00
parent da470164b4
commit eceed4c538
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/SlitterDownNewTrussTask.java
View File

@@ -85,6 +85,7 @@ public class SlitterDownNewTrussTask extends AbstractAcsTask {
.agv_system_type(agv_system_type)
.priority(task.getPriority())
.remark(task.getRemark())
.interaction_json(JSONObject.parseObject(task.getRequest_param()))
.product_area(task.getProduct_area())
.build();
resultList.add(dto);
@@ -112,6 +113,7 @@ public class SlitterDownNewTrussTask extends AbstractAcsTask {
.agv_system_type(agv_system_type)
.priority(task.getPriority())
.remark(task.getRemark())
.interaction_json(JSONObject.parseObject(task.getRequest_param()))
.product_area(task.getProduct_area())
.build();
resultList.add(dto);

18
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSplitTrussTask.java
View File

@@ -18,6 +18,8 @@ import org.nl.b_lms.sch.tasks.slitter.UpShaftTrussTask;
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum;
import org.nl.b_lms.sch.tasks.slitter.mapper.SlitterMapper;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.dao.Param;
import org.nl.wms.pdm.ivt.deliverycache.service.IDeliverycachepointivtService;
import org.nl.wms.pdm.ivt.deliverycache.service.dao.Deliverycachepointivt;
import org.nl.wms.pdm.ivt.deliverycache.service.dto.AreaBCachePointDto;
@@ -50,6 +52,11 @@ public class AutoSplitTrussTask {
@Autowired
private IPdmBiSlittingproductionplanService slittingproductionplanService;
@Autowired
private ISysParamService paramService;
public final static String IS_COMBINED_ORDER = "IS_COMBINED_ORDER";
/**
* 运行任务，主要负责校验分切机是否有未处理的任务，如果有则跳过；如果没有，会尝试为分切机创建新的任务。
* 该过程包括：查找没有气涨轴的分切机点位，校验是否存在相关任务，寻找备好轴的对接点位，获取下一组分切计划，
@@ -57,6 +64,15 @@ public class AutoSplitTrussTask {
*/
public void run() {
log.info("自动创建拆单桁架任务开始执行...");
Param codParam = paramService.findByCode(IS_COMBINED_ORDER);
// 不允许拼单(未开启拼单逻辑)
if (ObjectUtil.isEmpty(codParam) || !"1".equals(codParam.getValue())) {
log.info("不允许拼单，拼单参数为：" + codParam);
return;
}
//查询可以拆单的分切缓存点位
List<BstIvtCutpointivt> cutPoints = bcutpointivtService.getAreaNotTaskPointByStatus("5", "2", null, "0");
for (BstIvtCutpointivt cutPoint : cutPoints) {
@@ -137,12 +153,14 @@ public class AutoSplitTrussTask {
trussTaskParam.put("point_code2", d1.getPoint_code());
trussTaskParam.put("truss_type", "8");
trussTaskParam.put("task_type", SlitterEnum.TASK_TYPE.code("拆单桁架任务"));
trussTaskParam.put("vehicle_code1", cutPoint.getQzz_no1());
trussTaskParam.put("product_area", cutPoint.getProduct_area());
trussTaskParam.put("to_Task1_Axis_Type", plan.getQzz_size());
trussDisassemblyCacheTask.createTask(trussTaskParam);
}
}
trussDisassemblyCacheTask.immediateNotifyAcs(null);
}
}

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

@@ -466,7 +466,7 @@ public class SlitterServiceImpl implements SlitterService {
// 3. 更新分切计划重量
BigDecimal weight1 = param.getBigDecimal("weight1");
BigDecimal weight2 = param.getBigDecimal("weight2");
String msg = updatePlanWeights(plans, weight1, weight2);
msg = updatePlanWeights(plans, weight1, weight2);
// 4. 生成气胀轴编码并完成套轴
PdmBiSlittingproductionplan demoPlan = plans.get(0);
@@ -484,7 +484,7 @@ public class SlitterServiceImpl implements SlitterService {
// 7. 正常业务流程（不拼单）
handleNormalProcess(demoPlan, startPoint, qzzNo, containerNames, deviceCode, stepTipLogs);
}
JSONObject res = new JSONObject();
res = new JSONObject();
res.put("status", HttpStatus.HTTP_OK);
res.put("message", "请求成功");
res.put("msg", msg);
@@ -4161,7 +4161,7 @@ public class SlitterServiceImpl implements SlitterService {
/**
* 创建拼单任务
*
* @param cutPoint 分切点位
* @param endPoint 分切点位
* @param startPoint 穿拔轴点位
* @param demoPlan 分切计划
* @param qzzNo 气胀轴编码