fix:修改添加生产计划-已完工状态

ck
HuangHuiKang 3 weeks ago
parent c465299f08
commit b19632ab32

@ -308,6 +308,9 @@ public class PlanController {
planDO.setStatus(PlanStatusEnum..getValue()); planDO.setStatus(PlanStatusEnum..getValue());
planService.createPlanStockIn(statusUpdateVO, planDO); planService.createPlanStockIn(statusUpdateVO, planDO);
} }
else if ("commence".equals(statusUpdateVO.getCode())) {
planDO.setStatus(PlanStatusEnum..getValue());
}
planMapper.updateById(planDO); planMapper.updateById(planDO);
return success(true); return success(true);
} }
@ -387,7 +390,14 @@ public class PlanController {
List<PlanDO> proList = planService.getPlanByStatus(statusList); List<PlanDO> proList = planService.getPlanByStatus(statusList);
List<PlanRespVO> planRespVOList = planService.buildVOList(proList); List<PlanRespVO> planRespVOList = planService.buildVOList(proList);
return success(planRespVOList); return success(planRespVOList);
} else { }else if(status ==8){
List<Integer> statusList = new ArrayList<>();
statusList.add(PlanStatusEnum..getValue());
List<PlanDO> proList = planService.getPlanByStatus(statusList);
List<PlanRespVO> planRespVOList = planService.buildVOList(proList);
return success(planRespVOList);
}
else {
return success(Collections.emptyList()); return success(Collections.emptyList());
} }
} }

@ -14,7 +14,8 @@ public enum PlanStatusEnum {
(4), (4),
(5), (5),
(6), (6),
(7); (7),
(8);
private final int value; private final int value;

@ -99,4 +99,9 @@ public class ZjTaskRespVO {
@ExcelProperty("取消原因") @ExcelProperty("取消原因")
private String cancelReason; private String cancelReason;
@Schema(description = "工单类型1-生产过程 2-产品入库")
private Integer ticketType;
} }

@ -68,4 +68,7 @@ public class ZjTaskSaveReqVO {
@Schema(description = "取消原因") @Schema(description = "取消原因")
private String cancelReason; private String cancelReason;
@Schema(description = "工单类型 1-生产过程 2-产品入库")
private Integer ticketType;
} }

@ -96,5 +96,10 @@ public class ZjTaskDO extends BaseDO {
* *
*/ */
private String cancelReason; private String cancelReason;
/**
*
*/
private Integer ticketType;
} }
Loading…
Cancel
Save