product-inventory-management-after.git

			@@ -7,8 +7,9 @@
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
			import com.ruoyi.common.enums.StockUnQualifiedRecordTypeEnum;
			import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
			import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
			import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
			import com.ruoyi.common.utils.bean.BeanUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.ruoyi.procurementrecord.utils.StockUtils;
			@@ -63,7 +64,7 @@
			public int deal(QualityUnqualified qualityUnqualified) {
			QualityUnqualified unqualified = qualityUnqualifiedMapper.selectById(qualityUnqualified.getId());
			QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
			if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType()!=0) {
			if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) {
			switch (qualityUnqualified.getDealResult()) {
			case "返修":
			case "返工":
			@@ -98,11 +99,7 @@
			int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
			if (insert > 0) {
			// 查询今日已存在的最大工单号
			QueryWrapper<ProductWorkOrder> queryWrapper = new QueryWrapper<>();
			queryWrapper.likeRight("work_order_no", datePrefix)
			.orderByDesc("work_order_no")
			.last("LIMIT 1");
			ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectOne(queryWrapper);
			ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectMax(datePrefix);
			int sequenceNumber = 1; // 默认序号
			if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
			String lastNo = lastWorkOrder.getWorkOrderNo().toString();
			@@ -116,7 +113,7 @@
			}
			}
			// 生成完整的工单号
			String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
			String workOrderNoStr = "FG" + String.format("%s%03d", datePrefix, sequenceNumber);
			ProductWorkOrder productWorkOrder = new ProductWorkOrder();
			productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
			productWorkOrder.setProductOrderId(order.getId());
			@@ -130,19 +127,38 @@
			break;
			case "报废":
			//调用不合格库存接口入不合格库
			stockUtils.addUnStock(qualityInspect.getProductModelId(), unqualified.getQuantity(), StockUnQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
			stockUtils.addUnStock(qualityInspect.getProductModelId(), unqualified.getQuantity(), StockInUnQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
			break;
			case "让步放行":
			//调用提交合格的接口
			stockUtils.addStock(qualityInspect.getProductModelId(), unqualified.getQuantity(), StockQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId());
			qualityInspect.setCheckResult("合格");
			qualityInspectService.submit(qualityInspect);
			stockUtils.addStock(qualityInspect.getProductModelId(), unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId());
			break;
			default:
			break;
			}
			} else {
			//查询对应的规格型号id
			Long modelId = qualityUnqualifiedMapper.getModelId(qualityUnqualified.getProductName(), qualityUnqualified.getModel());
			switch (qualityUnqualified.getDealResult()) {
			case "报废":
			//调用不合格库存接口入不合格库
			stockUtils.addUnStock(modelId, unqualified.getQuantity(), StockInUnQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId());
			break;
			case "让步放行":
			//调用提交合格的接口
			stockUtils.addStock(modelId, unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId());
			break;
			default:
			break;
			}

			}
			qualityUnqualified.setInspectState(1);//已处理
			return qualityUnqualifiedMapper.updateById(qualityUnqualified);
			}

			@Override
			public QualityUnqualified getUnqualified(Integer id) {
			return qualityUnqualifiedMapper.getUnqualified(id);
			}
			}