From 203cc6e1bcbd8a6ef2e8c890d66c2813de09ec67 Mon Sep 17 00:00:00 2001 From: zxy Date: Tue, 26 May 2026 17:16:36 +0800 Subject: [PATCH] =?UTF-8?q?refactor(biz):=20=E9=87=8D=E6=9E=84=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E9=80=80=E6=96=99=E5=92=8C=E9=94=80=E5=94=AE=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/handler/GlobalExceptionHandler.java | 1 + .../vo/PurReceiptDetailRespVO.java | 4 + .../dataobject/rawstorage/RawStorageDO.java | 2 +- .../mysql/rawstorage/RawStorageMapper.java | 2 +- .../RawStorageInventoryMapper.java | 10 --- .../purreturn/PurReturnServiceImpl.java | 5 +- .../rawstorage/RawStorageServiceImpl.java | 4 +- .../views/biz/purreceipt/PurReceiptForm.vue | 10 ++- .../biz/purreturn/PurReceiptSelectDialog.vue | 5 +- .../src/views/biz/purreturn/PurReturnForm.vue | 23 +++++- .../biz/saledelivery/SaleDeliveryForm.vue | 73 ++++--------------- 11 files changed, 54 insertions(+), 85 deletions(-) diff --git a/mes-framework/mes-spring-boot-starter-web/src/main/java/com/ningxia/yunxi/chemmes/framework/web/core/handler/GlobalExceptionHandler.java b/mes-framework/mes-spring-boot-starter-web/src/main/java/com/ningxia/yunxi/chemmes/framework/web/core/handler/GlobalExceptionHandler.java index c040c1c..29afe7d 100644 --- a/mes-framework/mes-spring-boot-starter-web/src/main/java/com/ningxia/yunxi/chemmes/framework/web/core/handler/GlobalExceptionHandler.java +++ b/mes-framework/mes-spring-boot-starter-web/src/main/java/com/ningxia/yunxi/chemmes/framework/web/core/handler/GlobalExceptionHandler.java @@ -230,6 +230,7 @@ public class GlobalExceptionHandler { // 处理表数据相关异常 if (ex instanceof DuplicateKeyException){ + log.error("[defaultExceptionHandler][url({}) 数据重复]", req.getRequestURL(), ex); return CommonResult.error(REPEAT_DATA); } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/purreceiptdetail/vo/PurReceiptDetailRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/purreceiptdetail/vo/PurReceiptDetailRespVO.java index fd08aa2..aa40400 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/purreceiptdetail/vo/PurReceiptDetailRespVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/purreceiptdetail/vo/PurReceiptDetailRespVO.java @@ -104,6 +104,10 @@ public class PurReceiptDetailRespVO { @ExcelProperty("已退料数量") private BigDecimal returnQty; + @Schema(description = "已退料数量") + @ExcelProperty("已退料数量") + private BigDecimal returnedQty; + @Schema(description = "发货数量") @ExcelProperty("发货数量") private BigDecimal deliveryQty; diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstorage/RawStorageDO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstorage/RawStorageDO.java index 607eb8c..2b30785 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstorage/RawStorageDO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstorage/RawStorageDO.java @@ -83,7 +83,7 @@ public class RawStorageDO extends BaseDO { /** * 单据类型(1 标准采购申请 2设备采购申请 3 标准采购退料 4设备采购退料) */ - private String billType; +// private String billType; /** * 来源单号 */ diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorage/RawStorageMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorage/RawStorageMapper.java index 40f72e6..56bc198 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorage/RawStorageMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorage/RawStorageMapper.java @@ -31,7 +31,7 @@ public interface RawStorageMapper extends BaseMapperX { .likeIfPresent(RawStorageDO::getOperatorName, reqVO.getOperatorName()) .eqIfPresent(RawStorageDO::getRelarionNo, reqVO.getRelarionNo()) .eqIfPresent(RawStorageDO::getRelarionId, reqVO.getRelarionId()) - .eqIfPresent(RawStorageDO::getBillType, reqVO.getBillType()) +// .eqIfPresent(RawStorageDO::getBillType, reqVO.getBillType()) .eqIfPresent(RawStorageDO::getSourceNo, reqVO.getSourceNo()) .eqIfPresent(RawStorageDO::getSourceId, reqVO.getSourceId()) .orderByDesc(RawStorageDO::getId)); diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorageinventory/RawStorageInventoryMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorageinventory/RawStorageInventoryMapper.java index a961c2d..3603674 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorageinventory/RawStorageInventoryMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/rawstorageinventory/RawStorageInventoryMapper.java @@ -26,17 +26,7 @@ public interface RawStorageInventoryMapper extends BaseMapperX().eq(RawStorageInventoryDO::getInventBillNo, purReturnDetailDO.getInventBillNo())); rawStorageInventory.setYardQty(rawStorageInventory.getYardQty().subtract(purReturnDetailDO.getReturnQty())); + purReturnDetailDO.setReturnedQty(purReceiptDetailDO.getReturnQty()); purReceiptDetailDO.setReturnQty(purReceiptDetailDO.getReturnQty().add(purReturnDetailDO.getReturnQty())); purreceiptDetailMapper.updateById(purReceiptDetailDO); //twm_raw_storage_log 插入 @@ -161,6 +159,7 @@ public class PurReturnServiceImpl implements PurReturnService { rawStorageLog.setInventBillNo(purReturnDetailDO.getInventBillNo()); rawStorageLogService.saveRawStorageLog(rawStorageLog); rawStorageInventoryMapper.updateById(rawStorageInventory); + purReturnDetailMapper.updateById(purReturnDetailDO); } } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java index cfafdbb..ff8433c 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java @@ -118,7 +118,7 @@ public class RawStorageServiceImpl implements RawStorageService { private void updateOrderItem(PurReceiptDetailDO detail) { //更新库存 tsc_pur_order_item PurOrderItemDO purOrderItemDO = purOrderItemMapper.selectById(detail.getPurOrdDetailId()); - purOrderItemDO.setDeliveryQty(purOrderItemDO.getDeliveryQty().add(detail.getReceiptQty())); + purOrderItemDO.setDeliveryQty(purOrderItemDO.getDeliveryQty() != null ? purOrderItemDO.getDeliveryQty().add(detail.getReceiptQty()) : detail.getReceiptQty()); // 判断出库状态 if (purOrderItemDO.getDeliveryQty().compareTo(purOrderItemDO.getPurQty()) >= 0) { purOrderItemDO.setDeliveryStatus("3"); @@ -215,7 +215,7 @@ public class RawStorageServiceImpl implements RawStorageService { rawStorageInventoryDO.setLotNo(detail.getLotNo()); rawStorageInventoryDO.setDescription(""); rawStorageInventoryDO.setYardQty(detail.getRemaimQty()); - rawStorageInventoryDO.setUseQty(detail.getReceiptQty()); +// rawStorageInventoryDO.setUseQty(detail.getReceiptQty()); // rawStorageInventoryDO.setPreQty(); // rawStorageInventoryDO.setPrice(detail.getTotalPrice()); // rawStorageInventoryDO.setPackQty(detail.getPackQty()); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/purreceipt/PurReceiptForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/purreceipt/PurReceiptForm.vue index 3f88f88..ba4bece 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/purreceipt/PurReceiptForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/purreceipt/PurReceiptForm.vue @@ -211,13 +211,13 @@