Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

yuan

4 天以前 0bc2c552b180afa16e4aae3c8c12746b15ba6fc8

 src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java

@@ -137,7 +137,7 @@
                    //调用提交合格的接口
                    String customer = "长治市轴承制造有限公司";
                    stockUtils.addStock(qualityInspect.getProductModelId(), unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId(),
                            orders.getBatchNo(), customer
                            orders.getBatchNo(), customer,null
                    );
                    break;
                case "返工":
@@ -155,7 +155,7 @@
                case "让步放行":
                    //调用提交合格的接口
                    String customer = "长治市轴承制造有限公司";
                    stockUtils.addStock(modelId, unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId(), orders.getBatchNo(), customer);
                    stockUtils.addStock(modelId, unqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), unqualified.getId(), orders.getBatchNo(), customer,null);
                    break;
                default:
                    break;
@@ -182,6 +182,10 @@
            Map<String, Object> data = new HashMap<>();
            data.put("productName", info.getProductName());
            data.put("model", info.getModel());
            data.put("batchNo", info.getBatchNo());
            data.put("productionDate", info.getProductionDate());
            data.put("defectivePhenomena", info.getDefectivePhenomena());
            data.put("quantity", info.getQuantity());

            // 加载模板
            inputStream = getClass().getResourceAsStream("/static/return-record.docx");