| | |
|---|
| | | //合格数量=报工数量-报废数量 |
|---|
| | | BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty()); |
|---|
| | | //只有合格数量>0才能增加相应数据 |
|---|
| | | if (productQty.compareTo(BigDecimal.ZERO)>0) { |
|---|
| | | if (productQty.compareTo(BigDecimal.ZERO) > 0) { |
|---|
| | | /*新增质检*/ |
|---|
| | | //对应的过程检或者出厂检 |
|---|
| | | List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId())); |
|---|
| | |
|---|
| | | qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId()); |
|---|
| | | qualityInspectMapper.updateById(qualityInspect); |
|---|
| | | qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery() |
|---|
| | | .eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.get(0).getId()))//默认获取最新的 |
|---|
| | | .eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.get(0).getId()))//默认获取最新的 |
|---|
| | | .forEach(qualityTestStandardParam -> { |
|---|
| | | QualityInspectParam param = new QualityInspectParam(); |
|---|
| | | BeanUtils.copyProperties(qualityTestStandardParam, param); |
|---|
| | |
|---|
| | | salesLedgerProductionAccountingMapper.insert(salesLedgerProductionAccounting); |
|---|
| | | } |
|---|
| | | //如果报废数量>0,需要进入报废的库存 |
|---|
| | | if (dto.getScrapQty().compareTo(BigDecimal.ZERO) > 0) { |
|---|
| | | stockUtils.addUnStock(productModel.getId(), dto.getScrapQty(), StockUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode(), productionProductMain.getId()); |
|---|
| | | if (ObjectUtils.isNotEmpty(dto.getScrapQty())) { |
|---|
| | | if (BigDecimal.ZERO.compareTo(dto.getScrapQty()) > 0) { |
|---|
| | | stockUtils.addUnStock(productModel.getId(), dto.getScrapQty(), StockUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode(), productionProductMain.getId()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | |
|---|
| | | productWorkOrderMapper.updateById(productWorkOrder); |
|---|
| | | //判断是否是最后一道工序 |
|---|
| | | List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId())); |
|---|
| | | if (productProcessRouteItem.getDragSort() == productProcessRouteItems.size()){ |
|---|
| | | if (productProcessRouteItem.getDragSort() == productProcessRouteItems.size()) { |
|---|
| | | ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId()); |
|---|
| | | productOrder.setCompleteQuantity(productOrder.getCompleteQuantity().subtract(productionProductOutput.getQuantity())); |
|---|
| | | productOrder.setEndTime(null); |
|---|
