From efcef69d4db6900f5dd236e10db5b4e123d4ee59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 27 Nov 2024 08:40:17 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=E6=A0=B9=E6=8D=AE=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?ID=E3=80=81=E6=96=99=E5=8F=B7=E6=9F=A5=E8=AF=A2=E8=AF=A6?= =?UTF-8?q?=E6=83=85mapper=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E5=8D=95=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93service=E6=96=B9=E6=B3=95=E5=92=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=BC=95=E8=B5=B7=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseStorageOrderServiceImpl.java | 80 +++++++++---------- .../WarehouseStorageOrderDetailMapper.xml | 8 +- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index cae26259..510ef76f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -646,13 +646,11 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS if (updateWarehouseStorageOrderDetailResult <= 0){ throw new BusinessException("更新仓库入库单详情失败，未影响任何行"); } -// else{ -// WarehouseStorageOrderDetail storageOrderDetail = storageOrderDetailMapper.selectWarehouseStorageOrderDetailById(warehouseStorageOrderDetail.getWarehouseStorageDetailId()); -// int inventoryInquiryResult = createWarehouseInventoryInquiry(storageOrderDetail); -// if (inventoryInquiryResult <= 0){ -// throw new BusinessException("更新/新增库存查询失败，未影响任何行"); -// } -// } + WarehouseStorageOrderDetail storageOrderDetail = storageOrderDetailMapper.selectWarehouseStorageOrderDetailById(warehouseStorageOrderDetail.getWarehouseStorageDetailId()); + int inventoryInquiryResult = createWarehouseInventoryInquiry(storageOrderDetail); + if (inventoryInquiryResult <= 0){ + throw new BusinessException("更新/新增库存查询失败，未影响任何行"); + } } //更新生产单数据 @@ -702,21 +700,25 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS public int createWarehouseInventoryInquiry(WarehouseStorageOrderDetail warehouseStorageOrderDetail){ String materialNo = warehouseStorageOrderDetail.getMaterialNo(); String correlationCode = warehouseStorageOrderDetail.getRelatedOrderCode(); - String warehouseStorageType = warehouseStorageOrderDetail.getWarehouseStorageType(); + String storageCode = warehouseStorageOrderDetail.getWarehouseStorageCode(); + WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderMapper.selectWarehouseStorageOrderByCode(storageCode); + String warehouseStorageType = warehouseStorageOrder.getWarehouseStorageType(); if(warehouseStorageType.equals("0")) { // 新增采购入库库存历史记录 - List purchaseOrderChild = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(warehouseStorageOrderDetail.getRelatedOrderCode()); + +// PurchaseOrder purchaseOrder = purchaseOrderMapper.selectPurchaseOrderByOrderCode() + List purchaseOrderChild = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode); for (PurchaseOrderChild child : purchaseOrderChild) { -// if(child.getMaterialCode().equals(materialNo)){ -// int storageNum = warehouseStorageOrderDetail.getStorageNum(); -// WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); -// inquiryDetail = generateInquiryDetailByPurchaseChild(child,storageNum); -// inquiryDetail.setInventoryHistoricalType("0"); -//// if (correlationCode.startsWith("QG")) { -////// 有无归属分类 -//// } -// inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); -// } + if(child.getMaterialNo().equals(materialNo)){ + int storageNum = warehouseStorageOrderDetail.getStorageNum(); + WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); + inquiryDetail = generateInquiryDetailByPurchaseChild(child,storageNum); + inquiryDetail.setInventoryHistoricalType("0"); +// if (correlationCode.startsWith("QG")) { +//// 有无归属分类 +// } + inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail); + } } }else if(warehouseStorageType.equals("2")){//新增委内入库库存历史记录 WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail(); @@ -749,7 +751,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS inventoryInquiry.setAvailableStockNum(avaliableStorage); inventoryInquiry.setReportDamageNum(scrapSum); // 设置历史总数 - if(warehouseStorageOrderDetail.getWarehouseStorageType().equals("0")){ + if(warehouseStorageType.equals("0")){ BigDecimal historicalNum = getHistoricalTotalFromQualityOrder(warehouseStorageOrderDetail); BigDecimal historicalTotal = inventoryInquiry.getHistoricalTotal(); historicalTotal = historicalTotal.add(historicalNum); @@ -776,7 +778,7 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS Integer storage = warehouseStorageOrderDetail.getStorageNum(); BigDecimal storagenum = BigDecimal.valueOf(storage); // 设置历史总数 - if(warehouseStorageOrderDetail.getWarehouseStorageType().equals("0")){ + if(warehouseStorageType.equals("0")){ BigDecimal historicalNum = getHistoricalTotalFromQualityOrder(warehouseStorageOrderDetail); inventoryInquiry.setHistoricalTotal(historicalNum); }else{ @@ -806,10 +808,10 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS inquiryDetail.setMaterialType(child.getMaterialType()); inquiryDetail.setMaterialUnit(child.getMaterialUnit()); // inquiryDetail.setInventoryAttributionCode(child.getPurchasePlanCorrelationCode()); -// inquiryDetail.setSupplierCode(child.getSupplierCode()); +// inquiryDetail.setSupplierCode(child.()); // inquiryDetail.setSupplierName(child.getSupplierName()); - inquiryDetail.setPurchaseOrderCode(child.getPurchaseOrderCode()); +// inquiryDetail.setPurchaseOrderCode(child.getPurchaseOrderCode()); // 库存归属单号 BigDecimal realStorageNum = BigDecimal.valueOf(storageNum); inquiryDetail.setAvailableStockNum(realStorageNum); @@ -955,28 +957,26 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS if (updateWarehouseStorageOrderDetailResult <= 0){ throw new BusinessException("更新仓库入库单详情失败，未影响任何行"); } -// else{ -// WarehouseStorageOrderDetail storageOrderDetail = storageOrderDetailMapper.selectWarehouseStorageOrderDetailById(warehouseStorageOrderDetail.getWarehouseStorageDetailId()); -// int inventoryInquiryResult = createWarehouseInventoryInquiry(storageOrderDetail); -// if (inventoryInquiryResult <= 0){ -// throw new BusinessException("更新/新增库存查询失败，未影响任何行"); -// } -// } + WarehouseStorageOrderDetail storageOrderDetail = storageOrderDetailMapper.selectWarehouseStorageOrderDetailById(warehouseStorageOrderDetail.getWarehouseStorageDetailId()); + int inventoryInquiryResult = createWarehouseInventoryInquiry(storageOrderDetail); + if (inventoryInquiryResult <= 0){ + throw new BusinessException("更新/新增库存查询失败，未影响任何行"); + } } //更新生产单数据 - int updateMakeOrderResult = sysMakeOrderService.updateSysMakeOrderByWarehouseStorageOrder(warehouseStorageOrder,oldWarehouseStorageOrder, warehouseStorageOrderDetailList); - if (updateMakeOrderResult <= 0){ - throw new BusinessException("更新生产订单失败，未影响任何行"); - } +// int updateMakeOrderResult = sysMakeOrderService.updateSysMakeOrderByWarehouseStorageOrder(warehouseStorageOrder,oldWarehouseStorageOrder, warehouseStorageOrderDetailList); +// if (updateMakeOrderResult <= 0){ +// throw new BusinessException("更新生产订单失败，未影响任何行"); +// } //更新开发修改单数据 - String relatedOrderCode = warehouseStorageOrder.getRelatedOrderCode(); - ErpDevelopModifyorder erpDevelopModifyorder = developModifyorderMapper.selectErpDevelopModifyorderByCode(relatedOrderCode); - if (erpDevelopModifyorder != null){ - erpDevelopModifyorder.setPurchaseStorageStatus("8"); - developModifyorderMapper.updateErpDevelopModifyorder(erpDevelopModifyorder); - } +// String relatedOrderCode = warehouseStorageOrder.getRelatedOrderCode(); +// ErpDevelopModifyorder erpDevelopModifyorder = developModifyorderMapper.selectErpDevelopModifyorderByCode(relatedOrderCode); +// if (erpDevelopModifyorder != null){ +// erpDevelopModifyorder.setPurchaseStorageStatus("8"); +// developModifyorderMapper.updateErpDevelopModifyorder(erpDevelopModifyorder); +// } if (warehouseStorageOrder.getStorageNum().equals(oldWarehouseStorageOrder.getTemporaryQualifiedNum())){ diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml index 8eac3266..ec833b25 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml @@ -147,9 +147,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"