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-03-25 20:21:01 +08:00
parent 18b78f6dc6 e9e7d7d61f
commit 58c30e0d2c
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java
View File

@@ -76,7 +76,7 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
* @param location 位置：上半部分还是下半部分
* @return
*/
List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String pointCode, String location);
List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String specification ,String pointCode, String location);
/**
* 获取没任务的气涨轴缓存位

2
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.java
View File

@@ -14,7 +14,7 @@ public interface BstIvtShafttubeivtMapper extends BaseMapper<BstIvtShafttubeivt>
List<BstIvtShafttubeivt> getAllShaftPointsByConditions(String type, String location, String have);
List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String pointCode, String location);
List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String specification ,String pointCode, String location);
/**
* 获取含有气胀轴的气胀轴暂存位

3
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
View File

@@ -18,6 +18,9 @@
FROM `bst_ivt_shafttubeivt` bsf
WHERE bsf.is_used = '1'
AND bsf.qzz_size = #{qzzSize}
<if test="qzzSize != 6">
AND bsf.qzz_generation = #{specification}
</if>
AND bsf.point_type = '1'
AND bsf.point_location = #{location}
AND bsf.parent_code = #{pointCode}

4
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
View File

@@ -118,8 +118,8 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
}
@Override
public List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String pointCode, String location) {
return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, pointCode, location);
public List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String specification ,String pointCode, String location) {
return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, specification,pointCode, location);
}
@Override

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

@@ -226,13 +226,15 @@ public class AutoCallAirShaftTask {
// 获取其中一条
PdmBiSlittingproductionplan needPlan = needPlans.get(0);
String qzzSize = needPlan.getQzz_size();
String qzz_generation = needPlan.getQzz_generation();
// 从套轴对接位获取相同气涨轴大小
// update: 不需要(同标箔或者锂电分开)
// todo: 需要校验区域0/1
List<BstIvtCutpointivt> qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification);
if (qzzPoint.size() == 0) {
// 调用ACS滚条气涨轴下来
if (!toAcsOutShaft(qzzSize, location, empty)) {
if (!toAcsOutShaft(qzzSize, qzz_generation,location, empty)) {
log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
return;
}
@@ -248,7 +250,7 @@ public class AutoCallAirShaftTask {
saveCutPlanMessage(empty, needPlans, qzzSize);
// 如果不存在，则发起信号滚气涨轴
// 调用ACS滚条气涨轴下来
if (!toAcsOutShaft(qzzSize, location, empty)) {
if (!toAcsOutShaft(qzzSize,qzz_generation, location, empty)) {
log.error("穿拔轴{}不进行套轴，跳过！", empty.getPoint_code());
return;
}
@@ -435,9 +437,9 @@ public class AutoCallAirShaftTask {
* @param location 位置：上半部分还是下半部分
* @param empty 套拔轴点位
*/
private Boolean toAcsOutShaft(String qzzSize, String location, BstIvtShafttubeivt empty) {
private Boolean toAcsOutShaft(String qzzSize, String specification, String location, BstIvtShafttubeivt empty) {
// 需要区分上下
List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize, empty.getPoint_code(), location);
List<BstIvtShafttubeivt> shafttubeivts = bstIvtShafttubeivtService.getByQzzSize(qzzSize, specification ,empty.getPoint_code(), location);
if (shafttubeivts.size() == 0) {
log.error("气胀轴库找不到[" + qzzSize + "]规格的气涨轴位");
return false;