smart.git - Gitblit

			@@ -173,7 +173,7 @@
			private static final String PLAN_TYPE_CODE = "typeId";
			static final List<Integer> CHECK_STATUS_LIST = Arrays.asList(PlanStatusEnum.WAIT_MACHINE.getCode(), PlanStatusEnum.PAUSE.getCode(), PlanStatusEnum.MACH_ING.getCode());

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public boolean remove(Long id) {
			Plan plan = (Plan) getById(id);
			@@ -195,7 +195,7 @@
			return removeById(id);
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public void pause(Long planId) {
			Plan plan = (Plan) getById(planId);
			@@ -261,7 +261,7 @@
			}
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public void reboot(Long planId) {
			Plan plan = (Plan) getById(planId);
			@@ -307,7 +307,7 @@
			}
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public void append(PlanAppendVO planAppendVO) {
			Long planId = planAppendVO.getPlanId();
			@@ -423,7 +423,7 @@
			return process.getCode() + "-" + process.getSort();
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public BladeFile planImport(Long templateId, MultipartFile file) {
			try {
			@@ -844,7 +844,7 @@
			return craftRoutingDTO;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public BladeFile planExport(PlanQueryVO planQueryVO) {
			Long planTypeId = planQueryVO.getTypeId();
			List<CustomTemplateFieldColumnVO> columns = this.customTemplateFieldService.getColumns(planTypeId, ConfigTypeEnum.VIEW_PAGE.getCode());
			@@ -951,12 +951,12 @@
			return this.ossBuilder.systemTemplate().putFile("计划数据.xlsx", is);
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public BladeFile planTemplate(Long templateId) {
			return this.templateService.getTemplate(BusinessTypeEnums.PLAN_ORDER.getCode());
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public void create(PlanSubmitVO planVO) {
			checkPlanIsCreate(planVO);
			@@ -1019,7 +1019,7 @@
			return code;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public Boolean finish(Long planId) {
			Plan plan = checkFinishConditionBefore(planId);
			@@ -1112,7 +1112,7 @@
			return orderReportRecord;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public Boolean close(Long planId) {
			checkPlanIsClose(planId);
			@@ -1131,7 +1131,7 @@
			}
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public Boolean editWorkstation(OrderEditWorkstationVO orderEditWorkstationVO) {
			Order order = (Order)this.orderService.getOne(Wrappers.<Order>lambdaQuery().eq(Order::getId, orderEditWorkstationVO.getOrderId()));
			@@ -1205,7 +1205,7 @@
			}
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public IPage<Plan> listPage(IPage<Plan> page, PlanQueryVO planQueryVO) {
			QueryWrapper<Plan> queryWrapper = new QueryWrapper<>();
			handlerSystemField(planQueryVO, queryWrapper);
			@@ -1295,7 +1295,7 @@
			return products.stream().map(Product::getId).collect(Collectors.toList());
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public Plan modify(PlanModifyVO planModifyVO) {
			Plan historyPlan = getPlan(String.valueOf(planModifyVO.getId()));
			@@ -1319,7 +1319,7 @@
			return plan;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public Plan getPlan(String id) {
			if (Func.isEmpty(id)) {
			throw new ServiceException(MessageUtils.message("plan.not.found", new Object[0]));
			@@ -1331,7 +1331,7 @@
			return plan;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public List<PlanStatusCountVO> statusCount(String templateId) {
			List<PlanStatusCountVO> result = new ArrayList<>();
			List<Plan> list = list(Wrappers.<Plan>lambdaQuery().select(Plan::getPlanStatus).eq(Plan::getTypeId, templateId));
			@@ -1348,7 +1348,7 @@
			return result;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public void updatePlanByStart(Plan plan, Date startTime) {
			if (PlanStatusEnum.WAIT_MACHINE.getCode().equals(plan.getPlanStatus())) {
			plan.setPlanStatus(PlanStatusEnum.MACH_ING.getCode());
			@@ -1359,7 +1359,7 @@
			}
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public Boolean checkPlanStatus(Long planId) {
			boolean result = false;
			Plan plan = (Plan) getById(planId);
			@@ -1373,7 +1373,7 @@
			return Boolean.valueOf(result);
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public List<PlanCraftVO> listCraft() {
			List<PlanCraftDTO> planCrafts = this.planMapper.getListCraft();
			if (Func.isEmpty(planCrafts)) {
			@@ -1398,7 +1398,7 @@
			return result;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public List<PlanBomVO> listBom(Long id) {
			if (Func.isEmpty(id)) {
			return new ArrayList<>();
			@@ -1408,7 +1408,7 @@
			return PlanConvert.INSTANCE.convertBom(list);
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public CraftRoutingDetailVO getCraftPlan(Long id) {
			if (Func.isEmpty(id)) {
			return new CraftRoutingDetailVO();
			@@ -1454,7 +1454,7 @@
			this.handlerFieldSqlParse.handlerFieldSaveOrUpdateCheck(exJson, BusinessTypeEnums.PLAN_ORDER.getCode());
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public void reportPlan(Plan plan, Integer orderQualifyNum, Integer orderScrappedNum, Boolean isDel) {
			Long planId = plan.getId();
			@@ -1517,7 +1517,7 @@
			}
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			@Transactional(rollbackFor = {Exception.class})
			public Plan reportCurrentPlan(List<OrderProcessReportWorkDTO> reportWorkDTOList, Plan plan, Integer orderQualityNum) {
			List<OrderProcessReportWorkDTO> reportRecords = (List) reportWorkDTOList.stream().filter(s -> {
			@@ -1561,7 +1561,7 @@
			return plan;
			}

			@Override // org.springblade.modules.coproduction.service.IPlanService

			public Plan delReportRecordCurrentPlan(List<OrderProcessReportWorkDTO> reportWorkDTOList, Plan plan, Order order, List<Long> removeRecordIds) {
			List<OrderProcessReportWorkDTO> reportRecords = (List) reportWorkDTOList.stream().filter(s -> {
			return Func.isEmpty(s.getMainSequenceId());