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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
zhangzq
2025-04-19 20:21:47 +08:00
parent aae615a68b 926984b133
commit ff576b36bb
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ public class AutoCallAirShaftTask {
for (BstIvtShafttubeivt empty : emptyPoints) {
stepStr = "";
doCallShaft(empty, isOnlyPulling, tzDay, paramObj);
redisUtils.set(empty.getPoint_code(), stepStr);
redisUtils.set("INFO" + empty.getPoint_code(), stepStr);
}
}
@@ -323,6 +323,10 @@ public class AutoCallAirShaftTask {
param.put("qzz_size", needPlan.getQzz_size());
// 所需的纸管规格
SlitterTaskUtil.putNeedPaperSpec(param, needPlans);
if (!toCallAgvMovePaperTube(needPlans, location, empty)) {
log.error("呼叫AGV失败-穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
return;
}
// 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划
saveCutPlanMessage(empty, needPlans, qzzSize);
// 设置是否套轴：1：正常套轴，2：待定（到后面还会申请套轴）
@@ -340,10 +344,7 @@ public class AutoCallAirShaftTask {
// 拔管数量
param.put("pullCount", oldPlans.size());
param.put("containers", oldPlans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()));
if (!toCallAgvMovePaperTube(needPlans, location, empty)) {
log.error("呼叫AGV失败-穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
return;
}
stepStr += ",36";
trussCallAirShaftTask.createTask(param);
stepStr += ",37";

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

@@ -45,6 +45,6 @@ public class SlitterController {
@Log("套轴BCP透明链路")
@SaIgnore
public ResponseEntity<Object> tzInfo(@RequestBody JSONObject entity){
return new ResponseEntity<>(redisUtils.get(entity.getString("device_code")), HttpStatus.CREATED);
return new ResponseEntity<>(redisUtils.get("INFO" + entity.getString("device_code")), HttpStatus.CREATED);
}
}

8
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -1670,9 +1670,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
String end_device_code = "";
if("1".equals(flag)){
IsEndCode2(json);
end_device_code = IsEndCode2(json);
}else{
IsEndCode(json);
end_device_code = IsEndCode(json);
}
// 过滤此仓位的分配明细
@@ -1815,9 +1815,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
String end_device_code = "";
if("1".equals(flag)){
IsEndCode2(json);
end_device_code = IsEndCode2(json);
}else{
IsEndCode(json);
end_device_code = IsEndCode(json);
}