root/longdianningxing
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:
zhouz
2024-07-09 12:49:51 +08:00
parent 3c443bc438 42d280edd7
commit c660472ae9
3 changed files with 11 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/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
View File

@@ -106,7 +106,7 @@
LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bc.qzz_no1 OR p.qzzno = bc.qzz_no2
WHERE bc.point_type IN ('1', '3') AND bc.point_status = '2'
AND (IFNULL(bc.qzz_no1,'') <![CDATA[ <> ]]> '' OR IFNULL(bc.qzz_no2,'') <![CDATA[ <> ]]> '')
AND p.resource_name = #{resource_name}
AND p.resource_name = #{resource_name} AND IFNULL(p.qzzno, '') <![CDATA[ <> ]]> ''
</select>
<select id="getAreaNotTaskPointByStatusNotCheckPickUpCompleted"

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

@@ -92,7 +92,7 @@ public class AutoCallAirShaftTask {
*/
@Transactional(rollbackFor = Exception.class)
public void run() {
log.info(this.getClass().getName() + "开始执行...");
log.info("自动呼叫套轴开始执行...");
// 1、获取空的插拔轴位(无任务)
List<BstIvtShafttubeivt> emptyPoints = bstIvtShafttubeivtService.getAllShaftPointsByConditions("2",
"0", "0");
@@ -494,6 +494,7 @@ public class AutoCallAirShaftTask {
if (tasks.size() == 0) {
return true;
}
log.info("存在任务，不允许套轴{}", dto);
return false;
}
@@ -516,6 +517,7 @@ public class AutoCallAirShaftTask {
return true;
}
}
log.info("检查是否有同母卷不允许套轴：{}", dto);
// 有就返回true
return false;
}

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

@@ -1108,6 +1108,7 @@ public class SlitterServiceImpl implements SlitterService {
public JSONObject toSubvolumeBinding(JSONObject param) {
// param : container_name, point_code
String containerName = param.getString("container_name");
String pointCode1 = param.getString("point_code");
if (ObjectUtil.isEmpty(containerName)) {
throw new BadRequestException("子卷号不能为空!");
}
@@ -1116,7 +1117,7 @@ public class SlitterServiceImpl implements SlitterService {
if (plans.size() == 0) {
throw new BadRequestException("子卷号：[" + containerName + "] 的分切计划没找到，检查是否推送或者子卷号是否正确！");
}
BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(param.getString("point_code"), false);
BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(pointCode1, false);
PdmBiSlittingproductionplan demoPlan = plans.get(0);
String resourceName = demoPlan.getResource_name();
// 创建新的气胀轴编码
@@ -1128,12 +1129,12 @@ public class SlitterServiceImpl implements SlitterService {
plans.forEach(p -> {
p.setQzzno(qzzNo);
TaskUtils.updateOptMessageBySlitterPlan(p);
if ("1".equals(p.getUp_or_down())) {
pointCode.setQzz_no1(qzzNo);
} else {
pointCode.setQzz_no2(qzzNo);
}
});
if (pointCode1.endsWith("A")) {
pointCode.setQzz_no1(qzzNo);
} else {
pointCode.setQzz_no2(qzzNo);
}
pointCode.setPoint_status("3");
slittingproductionplanService.updateBatchById(plans);
bcutpointivtService.updateById(pointCode);