| | |
|---|
| | | productionProductMain.setProductProcessRouteItemId(dto.getProductProcessRouteItemId()); |
|---|
| | | productionProductMain.setWorkOrderId(dto.getWorkOrderId()); |
|---|
| | | productionProductMain.setStatus(0); |
|---|
| | | productionProductMain.setDeviceId(dto.getDeviceId()); |
|---|
| | | productionProductMainMapper.insert(productionProductMain); |
|---|
| | | /*新增报工投入表*/ |
|---|
| | | List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId()); |
|---|
| | |
|---|
| | | productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId()); |
|---|
| | | productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO); |
|---|
| | | productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO); |
|---|
| | | productionProductOutput.setOtherData(dto.getOtherData() != null ? dto.getOtherData() : ""); |
|---|
| | | productionProductOutputMapper.insert(productionProductOutput); |
|---|
| | | //合格数量=报工数量 |
|---|
| | | BigDecimal productQty = productionProductOutput.getQuantity(); |
|---|
| | |
|---|
| | | 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()); |
|---|
| | |
|---|
| | | 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) { |
|---|
