生产管理修改

liweidong
李涛 2 days ago
parent fe223024ef
commit 7ebb475534
  1. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java
  2. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorFileSlotVO.java
  3. 17
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java

@ -43,7 +43,7 @@ public class MesRbFilePreserveSlotEntity extends BaseEntity {
* 槽号序号
*/
@Schema(description = "槽号序号")
private String slotIndex;
private Double slotIndex;
/**
* 插入序号
*/

@ -22,7 +22,7 @@ public class ProduceMonitorFileSlotVO {
private String insertIndex;
@Schema(description = "槽号序号")
private String slotIndex;
private Double slotIndex;
@Schema(description = "槽位/工步")
private String slotName;

@ -83,8 +83,9 @@ import java.util.stream.Collectors;
* [检验任务] 控制器
* 工序级的检验任务
* mes v1: rb_pr_work_check PrWorkCheck
*
* <p>
* ppsName:烧结包装防护 才有子件列表
*
* @author Tom Shuo
* @since 2025-11-14
*/
@ -121,6 +122,7 @@ public class InspectionTaskController extends BladeController {
private IWorkPlanItemService workPlanItemService;
@Resource
private IPlatingService platingService;
/**
* [检验任务] 详情
*/
@ -145,6 +147,7 @@ public class InspectionTaskController extends BladeController {
service.setDetailVOValue(detailDetailVO);
return R.data(detailDetailVO);
}
@PostMapping("/getPlateMsg")
public R getPlateMsg(@RequestBody InspectionTaskListVO detailDetail) {
String prodIdent = detailDetail.getProdIdent();
@ -332,8 +335,6 @@ public class InspectionTaskController extends BladeController {
}
@GetMapping("/getItems")
@ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入inspectionTask")
@ -388,8 +389,6 @@ public class InspectionTaskController extends BladeController {
}
/**
* [检验任务] 分页
*/
@ -547,9 +546,7 @@ public class InspectionTaskController extends BladeController {
dsRbFilePreserveSlot.setChildrenList(childrenListNew);
}
}
preserveSlotList.sort(Comparator.comparing(
e -> Integer.parseInt(e.getSlotIndex())
));
preserveSlotList.sort(Comparator.comparing(MesRbFilePreserveSlotEntity::getSlotIndex));
obj.put("preserveSlotList", preserveSlotList);
obj.put("insertIndex", insertIndex);
return R.data(obj);
@ -604,7 +601,6 @@ public class InspectionTaskController extends BladeController {
}
BladeUser curUserInfo = AuthUtil.getUser();
// PfUserInfo curUserInfo = (PfUserInfo) ControllerUtils.getCurUserInfo(request);
// Long rfpId = data.getLong("rfpId");
@ -615,7 +611,6 @@ public class InspectionTaskController extends BladeController {
}
/**
* [检验任务] 自定义分页
*/
@ -841,8 +836,6 @@ public class InspectionTaskController extends BladeController {
}
@GetMapping("/toQaRecord")
@ApiOperationSupport(order = 101)
@Operation(summary = "跳转-质量记录", description = "传入inspectionTask id")

Loading…
Cancel
Save