product-inventory-management-after.git

			@@ -141,7 +141,7 @@
			productionProductMainMapper.insert(productionProductMain);
			/新增报工投入表/
			List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId());
			if (productStructureDtos.size() == 0) {
			if (productStructureDtos.isEmpty()) {
			//如果该工序没有产品结构的投入品,那这个投入品和产出品是同一个
			ProductStructureDto productStructureDto = new ProductStructureDto();
			productStructureDto.setProductModelId(productProcessRouteItem.getProductModelId());
			@@ -155,8 +155,6 @@
			productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity()));
			productionProductInput.setProductMainId(productionProductMain.getId());
			productionProductInputMapper.insert(productionProductInput);
			stockUtils.substractStock(productStructureDto.getProductModelId(), productionProductInput.getQuantity(), StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(), productionProductMain.getId());

			}
			/新增报工产出表/
			ProductionProductOutput productionProductOutput = new ProductionProductOutput();
			@@ -165,8 +163,8 @@
			productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
			productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO);
			productionProductOutputMapper.insert(productionProductOutput);
			//合格数量=报工数量-报废数量
			BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty());
			//合格数量=报工数量
			BigDecimal productQty = productionProductOutput.getQuantity();
			//只有合格数量>0才能增加相应数据
			if (productQty.compareTo(BigDecimal.ZERO) > 0) {
			/新增质检/
			@@ -180,6 +178,13 @@
			inspectType = 2;
			process = null;
			}
			ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
			ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
			if (productOrder == null) {
			throw new RuntimeException("生产订单不存在");
			}


			Product product = productMapper.selectById(productModel.getProductId());
			QualityInspect qualityInspect = new QualityInspect();
			qualityInspect.setProductId(product.getId());
			@@ -192,6 +197,9 @@
			qualityInspect.setInspectType(inspectType);
			qualityInspect.setProductMainId(productionProductMain.getId());
			qualityInspect.setProductModelId(productModel.getId());
			qualityInspect.setBatchNo(productOrder.getBatchNo());
			qualityInspect.setInspectedQuantity(dto.getInspectedQuantity());
			qualityInspect.setManufacturingTeam(productOrder.getManufacturingTeam());
			qualityInspectMapper.insert(qualityInspect);
			List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
			if (qualityTestStandard.size() > 0) {
			@@ -220,6 +228,7 @@
			if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) == 0) {
			productWorkOrder.setActualEndTime(LocalDate.now());//实际结束时间
			}
			productWorkOrder.setTotalInvestment(dto.getTotalInvestment());
			productWorkOrderMapper.updateById(productWorkOrder);
			//生产订单
			ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
			@@ -234,13 +243,17 @@
			}
			}
			productOrderMapper.updateById(productOrder);
			/添加生产核算/
			/添加生产核算区分工序是计件还是计时/
			BigDecimal workHours = (productProcess.getType() == 1)
			? productProcess.getSalaryQuota().multiply(productQty)
			: productProcess.getSalaryQuota();

			SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
			.productMainId(productionProductMain.getId())
			.schedulingUserId(user.getUserId())
			.schedulingUserName(user.getNickName())
			.finishedNum(productQty)
			.workHours(productProcess.getSalaryQuota())
			.workHours(workHours)
			.process(productProcess.getName())
			.schedulingDate(LocalDate.now())
			.tenantId(dto.getTenantId())