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

opt:优化

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2025-04-22 12:34:41 +08:00
parent 52e9a273f5
commit a39f704e36
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
View File

@@ -202,6 +202,7 @@
p.parent_container_name, p.parent_container_name,
p.split_group, p.split_group,
p.up_or_down, p.up_or_down,
p.manufacture_sort,
p.qzz_size, p.qzz_size,
p.qzz_generation, p.qzz_generation,
MIN(p.start_time) AS start_time MIN(p.start_time) AS start_time
@@ -221,7 +222,11 @@
p.parent_container_name, p.parent_container_name,
p.split_group, p.split_group,
p.up_or_down, p.up_or_down,
p.manufacture_sort,
p.qzz_size, p.qzz_size,
p.qzz_generation p.qzz_generation
order by p.qzz_size,
p.manufacture_sort desc,
p.start_time
</select> </select>
</mapper> </mapper>

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

@@ -139,13 +139,13 @@ public class AutoCallAirShaftTask {
Integer integer = Integer.valueOf(ObjectUtil.isEmpty(tzDay.getValue()) ? "0" : tzDay.getValue()); Integer integer = Integer.valueOf(ObjectUtil.isEmpty(tzDay.getValue()) ? "0" : tzDay.getValue());
// 2、获取分切计划数据 校验代数 todo： 顺序可能需要考虑 // 2、获取分切计划数据 校验代数 todo： 顺序可能需要考虑
// List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan(integer); // List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan(integer);
List<SlitterPlanDistinctDto> planAllNoSort = slittingproductionplanService.getAllCutPlan2(integer); List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan2(integer);
// 排序 // 排序
List<SlitterPlanDistinctDto> planAll = planAllNoSort.stream() /* List<SlitterPlanDistinctDto> planAll = planAllNoSort.stream()
.sorted(Comparator.comparing( .sorted(Comparator.comparing(
dto -> LocalDateTime.parse(dto.getStart_time(), TIME_FORMATTER) dto -> LocalDateTime.parse(dto.getStart_time(), TIME_FORMATTER)
)) ))
.collect(Collectors.toList()); .collect(Collectors.toList());*/
// 过滤 // 过滤
String value = paramObj.getValue(); String value = paramObj.getValue();
List<String> prefixList = Arrays.asList(value.split("[，,]")); List<String> prefixList = Arrays.asList(value.split("[，,]"));

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/SlitterPlanDistinctDto.java
View File

@@ -33,6 +33,10 @@ public class SlitterPlanDistinctDto {
* 气胀轴尺寸 * 气胀轴尺寸
*/ */
private String qzz_size; private String qzz_size;
/**
* 生产顺序
*/
private String manufacture_sort;
/** /**
* 气胀轴代数 * 气胀轴代数
*/ */

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

@@ -2215,9 +2215,15 @@ public class SlitterServiceImpl implements SlitterService {
res.put("message", "加急失败,当前计划正在套轴!"); res.put("message", "加急失败,当前计划正在套轴!");
return res; return res;
} }
if(!"P1".equals(plan.getManufacture_sort())){
res.put("status", HttpStatus.HTTP_OK);
res.put("message", "加急失败,当前计划已加急过一次!");
return res;
}
//更新套轴计划开始时间为当前时间 //更新套轴计划开始时间为当前时间
LambdaUpdateWrapper<PdmBiSlittingproductionplan> updateWrapper = new LambdaUpdateWrapper<PdmBiSlittingproductionplan>(); LambdaUpdateWrapper<PdmBiSlittingproductionplan> updateWrapper = new LambdaUpdateWrapper<PdmBiSlittingproductionplan>();
updateWrapper.set(PdmBiSlittingproductionplan::getStart_time, DateUtil.now()) updateWrapper.set(PdmBiSlittingproductionplan::getStart_time, DateUtil.now())
.set(PdmBiSlittingproductionplan::getManufacture_sort, "P2")
.eq(PdmBiSlittingproductionplan::getWorkorder_id, workorder_id) .eq(PdmBiSlittingproductionplan::getWorkorder_id, workorder_id)
.eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO); .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO);
//判断更新是否成功 //判断更新是否成功