From e4a3835ee09471658592742bdafb9da8b614106d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 3 Jul 2026 17:49:31 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/basic/ContractManageMapper.xml | 2 +- .../ReconciliationApplicationService.java | 2 +- .../repository/mapper/TmsReceiptMapper.java | 4 +- .../mapper/tmsReceipt/TmsReceiptMapper.xml | 2 +- .../po/ExecutionStockInOrderPO.java | 4 +- .../todo/ExecutionStockInOrderDO.java | 4 +- .../todo/ExecutionStockInOrderDTO.java | 4 +- .../po/ExecutionStockOutOrderPO.java | 4 +- .../todo/ExecutionStockOutOrderDO.java | 4 +- .../todo/ExecutionStockOutOrderDTO.java | 4 +- .../ExecutionStockInOrderMapper.xml | 3 +- .../ExecutionStockOutOrderMapper.xml | 3 +- .../StockOutOrderApplicationService.java | 8 ++ .../service/StockOutOrderDomainService.java | 97 +++++++++++++++++++ .../MaterialInventoryApi.java | 9 -- .../stockOutOrder/StockOutOrderApi.java | 20 ++++ .../MaterialInventoryMapper.xml | 12 +-- 17 files changed, 158 insertions(+), 28 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml index 7b1b8a9db..41709be22 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml @@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT DISTINCT a.* FROM CONTRACT_MANAGE a - INNER JOIN CONTRACT_MANAGE_DETAIL b + left JOIN CONTRACT_MANAGE_DETAIL b ON a.CONTRACT_MANAGE_ID = b.CONTRACT_MANAGE_ID where a.del_flag = 1 diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java index 31cff0ef2..5c8287228 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java @@ -209,7 +209,7 @@ public class ReconciliationApplicationService { reconciliationPO.setSettlementCurrency(tmsOrder.getSettlementCurrency()); } if (reconciliationPO.getSettlementCurrency() != null){ - String s = tmsReceiptMapper.selectCnName(String.valueOf(reconciliationPO.getSettlementCurrency())); + String s = tmsReceiptMapper.selectCnName(String.valueOf(reconciliationPO.getSettlementCurrency()),reconciliationPO.getOrganizationId()); reconciliationPO.setSettlementCurrencyName(s); } } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java index b6d130ca3..a93c25473 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java @@ -20,5 +20,5 @@ public interface TmsReceiptMapper extends BaseMapper */ public List queryList(TmsReceiptDO tmsReceiptDO); - String selectCnName(@Param("settlementCount") String settlementCount); -} + String selectCnName(@Param("settlementCount") String settlementCount,@Param("organizationId") Long organizationId); +} \ No newline at end of file diff --git a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml index 1db972407..700cf4cdb 100644 --- a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml +++ b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml @@ -123,6 +123,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/po/ExecutionStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/po/ExecutionStockInOrderPO.java index c1bb6b105..626c06a69 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/po/ExecutionStockInOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/po/ExecutionStockInOrderPO.java @@ -62,7 +62,9 @@ public class ExecutionStockInOrderPO extends BaseVOEntity { @ApiModelProperty("入库单号") @Excel(name = "入库单号") private String inOrderNumber; - + @ApiModelProperty("入库业务单号") + @Excel(name = "入库业务单号") + private String businessInOrderNumber; @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") @Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDO.java index 8ca3ca25e..63062b7b0 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDO.java @@ -58,7 +58,9 @@ public class ExecutionStockInOrderDO extends BaseVOEntity { @ApiModelProperty("入库单号") @Excel(name = "入库单号") private String inOrderNumber; - + @ApiModelProperty("入库业务单号") + @Excel(name = "入库业务单号") + private String businessInOrderNumber; @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") @Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDTO.java index 767a0a245..f3b3977d4 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDTO.java @@ -61,7 +61,9 @@ public class ExecutionStockInOrderDTO extends ExecutionStockInOrderBaseDTO { @ApiModelProperty("入库单号") @Excel(name = "入库单号") private String inOrderNumber; - + @ApiModelProperty("入库业务单号") + @Excel(name = "入库业务单号") + private String businessInOrderNumber; @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") @Excel(name = "入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/po/ExecutionStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/po/ExecutionStockOutOrderPO.java index 877d6eb18..e1af403b6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/po/ExecutionStockOutOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/po/ExecutionStockOutOrderPO.java @@ -52,7 +52,9 @@ public class ExecutionStockOutOrderPO extends BaseVOEntity { @ApiModelProperty("出库单号") @Excel(name = "出库单号") private String outOrderNumber; - + @ApiModelProperty("出库单号") + @Excel(name = "出库单号") + private String businessOutOrderNumber; @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDO.java index 926cf3f5e..7b6cf96c8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDO.java @@ -51,7 +51,9 @@ public class ExecutionStockOutOrderDO extends BaseVOEntity { @ApiModelProperty("出库单号") @Excel(name = "出库单号") private String outOrderNumber; - + @ApiModelProperty("出库单号") + @Excel(name = "出库单号") + private String businessOutOrderNumber; @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") private Integer status; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDTO.java index f27a11fb9..ac7a0903a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDTO.java @@ -48,7 +48,9 @@ public class ExecutionStockOutOrderDTO extends ExecutionStockOutOrderBaseDTO { @ApiModelProperty("出库单号") @Excel(name = "出库单号") private String outOrderNumber; - + @ApiModelProperty("出库单号") + @Excel(name = "出库单号") + private String businessOutOrderNumber; @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭") private Integer status; diff --git a/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml index e7482a7c2..cab60f61c 100644 --- a/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml @@ -107,6 +107,7 @@ + @@ -135,7 +136,7 @@ - a.weight_limit, a.volume_limit, a.cancel_order, a.cancel_remark, a.cancel_by,a.PICTURE_URL, + a.weight_limit, a.volume_limit, a.cancel_order, a.cancel_remark, a.cancel_by,a.PICTURE_URL,a.business_in_order_number, a.cancel_by_name, a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.over_stock_id, a.over_stock_status, a.over_stock_type, a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER, diff --git a/mhd_oms/src/main/resources/mapper/executionStockOutOrder/ExecutionStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executionStockOutOrder/ExecutionStockOutOrderMapper.xml index fa08ade8e..c53eb17e2 100644 --- a/mhd_oms/src/main/resources/mapper/executionStockOutOrder/ExecutionStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executionStockOutOrder/ExecutionStockOutOrderMapper.xml @@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -118,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.priority_level_name, a.direct_warehouse, a.review, a.annex_url, a.material_quantity, a.quantity, a.weight_limit, a.volume_limit, a.check_quantity, a.cancel_order, a.cancel_remark, a.cancel_by, a.cancel_by_name, a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.check_status,a.BUSINESS_ORDER_NO, a.check_task_distribution, a.check_task_distribution_time, a.check_operators_by, a.check_operators_name, a.mobilize_code, - a.remark, a.create_time, a.create_by, a.create_by_name,a.business_number,a.train_no,a.amount, + a.remark, a.create_time, a.create_by, a.create_by_name,a.business_number,a.train_no,a.amount,a.business_out_order_number, a.update_time, a.update_by, a.update_by_name, a.del_flag, a.over_stock_id, a.over_stock_status, a.over_stock_type,a."TO", a.CONTACT_PERSON,a.VEHICLE_MODEL_PLATE,a.ENTRUST_NO,a.TEL,a.DRIVER_SIGN,a.FAX,a.DECLARE_CUSTOMS,a.MANUFACTURER, a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE, diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 1dcf34741..7c07f7053 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -842,6 +842,14 @@ public class StockOutOrderApplicationService { return stockOutOrderDomainService.auditState(stockOutOrderDO); } + public Boolean cancelAuditState(StockOutOrderDO stockOutOrderDO){ + return stockOutOrderDomainService.cancelAuditState(stockOutOrderDO); + } + + public Boolean cancelExecution(StockOutOrderDO stockOutOrderDO){ + return stockOutOrderDomainService.cancelExecution(stockOutOrderDO); + } + public Boolean execution(String outOrderNumber){ //Boolean execution = stockOutOrderDomainService.execution(outOrderNumber); StockOutOrderDO stockOutOrderDO = new StockOutOrderDO(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index bbf2a58b3..070410be6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -604,6 +604,103 @@ public class StockOutOrderDomainService { .in(StockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds())); } + @Transactional(rollbackFor = Exception.class) + public Boolean cancelAuditState(StockOutOrderDO stockOutOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); + return stockOutOrderService.update(null, new UpdateWrapper().lambda() + .set(StockOutOrder::getStatus, 1) + .set(StockOutOrder::getAuditStatus, 1) + .set(StockOutOrder::getAuditRemark, null) + .set(StockOutOrder::getAuditBy, null) + .set(StockOutOrder::getAuditByName, null) + .set(StockOutOrder::getAuditTime, null) + .set(StockOutOrder::getUpdateBy, loginUser.getUserid()) + .set(StockOutOrder::getUpdateByName, userRealName) + .set(StockOutOrder::getUpdateTime, new Date()) + .in(StockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds())); + } + + @Transactional(rollbackFor = Exception.class) + public Boolean cancelExecution(StockOutOrderDO stockOutOrderDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); + + List outOrderIds = stockOutOrderDO.getOutOrderIds(); + for (Long outOrderId : outOrderIds) { + StockOutOrder stockOutOrder = stockOutOrderService.getById(outOrderId); + if (stockOutOrder == null) { + throw new ServiceException("出库单不存在"); + } + String outOrderNumber = stockOutOrder.getOutOrderNumber(); + + //逻辑删除拣货单 + PickingOrder pickingOrder = pickingOrderService.getOne(new QueryWrapper().lambda() + .eq(PickingOrder::getOrderNumber, outOrderNumber) + .eq(PickingOrder::getDelFlag, 1), false); + if (pickingOrder != null) { + Integer status = pickingOrder.getStatus(); + String pickingOrderNumber = pickingOrder.getPickingOrderNumber(); + if (status!=1) { + throw new ServiceException("拣货单[" + pickingOrderNumber + "]已拣货，无法取消执行"); + } else { + List list = pickingMaterialDetailService.list(new QueryWrapper().lambda() + .eq(PickingMaterialDetail::getPickingOrderNumber, pickingOrderNumber) + .eq(PickingMaterialDetail::getDelFlag, 1)); + if (list != null && list.size() > 0) { + for (PickingMaterialDetail pickingMaterialDetail : list) { + pickingMaterialDetail.setDelFlag(2); + pickingMaterialDetailService.updateById(pickingMaterialDetail); + } + } + pickingOrder.setDelFlag(2); + pickingOrderService.updateById(pickingOrder); + } + } + + //还原分配库存 + List list = outMaterialDetailService.list(new QueryWrapper().lambda() + .eq(OutMaterialDetail::getOutOrderNumber, outOrderNumber) + .eq(OutMaterialDetail::getDelFlag, 1)); + for (OutMaterialDetail materialDetail : list) { + //还原库存 + BigDecimal allocationQuantity = materialDetail.getAllocationQuantity(); + Long materialInventoryId = materialDetail.getMaterialInventoryId(); + MaterialInventory materialInventory = materialInventoryMapper.selectById(materialInventoryId); + if (materialInventory == null) { + throw new ServiceException("库存信息不存在"); + } + materialInventory.setAllocationQuantity(materialInventory.getAllocationQuantity().add(allocationQuantity)); + materialInventory.setFreezeQuantity(materialInventory.getFreezeQuantity().subtract(allocationQuantity)); + materialInventoryMapper.updateById(materialInventory); + //逻辑删除库存调整记录 + Long uniqueId = materialDetail.getUniqueId(); + String relateNo = outOrderNumber+"#"+uniqueId; + inventoryAdjustmentRecordService.update(new InventoryAdjustmentRecord(), new LambdaUpdateWrapper() + .set(InventoryAdjustmentRecord::getDelFlag, 2) + .eq(InventoryAdjustmentRecord::getRelateNo, relateNo)); + } + } + + return stockOutOrderService.update(null, new UpdateWrapper().lambda() + .set(StockOutOrder::getStatus, 1) + .set(StockOutOrder::getAuditStatus, 1) + .set(StockOutOrder::getAuditRemark, null) + .set(StockOutOrder::getAuditBy, null) + .set(StockOutOrder::getAuditByName, null) + .set(StockOutOrder::getAuditTime, null) + .set(StockOutOrder::getUpdateBy, loginUser.getUserid()) + .set(StockOutOrder::getUpdateByName, userRealName) + .set(StockOutOrder::getUpdateTime, new Date()) + .in(StockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds())); + } + @Transactional(rollbackFor = Exception.class) public Boolean execution(String outOrderNumber) { StockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java index 031f83fce..d2e88e3b6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java @@ -96,15 +96,6 @@ public class MaterialInventoryApi extends BaseController { startPage(); // 使用带批次属性的查询方法，批次属性值从库存表中获取 List list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO); - // 按更新时间倒序排序；update_time 为空的数据放最后 - list.sort((o1, o2) -> { - Date t1 = o1.getUpdateTime(); - Date t2 = o2.getUpdateTime(); - if (t1 == null && t2 == null) return 0; - if (t1 == null) return 1; - if (t2 == null) return -1; - return t2.compareTo(t1); // desc - }); TableDataInfo tableDataInfo = getDataTable(list); // 如果查询结果为空，抛出异常提示用户该物料在库存中不存在 // if (tableDataInfo.getTotal() == 0) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java index 33ac2c412..dcf644f9c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java @@ -217,6 +217,26 @@ public class StockOutOrderApi extends BaseController { return AjaxResult.success(stockOutOrderApplicationService.auditState(stockOutOrderDO)); } + /** + * 审核出库单 + */ + @ApiOperation("审核出库单") + @PostMapping(value = "/cancelAuditState") + public AjaxResult cancelAuditState(@RequestBody StockOutOrderDTO stockOutOrderDTO) { + StockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO); + return AjaxResult.success(stockOutOrderApplicationService.cancelAuditState(stockOutOrderDO)); + } + + /** + * 审核出库单 + */ + @ApiOperation("审核出库单") + @PostMapping(value = "/cancelExecution") + public AjaxResult cancelExecution(@RequestBody StockOutOrderDTO stockOutOrderDTO) { + StockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO); + return AjaxResult.success(stockOutOrderApplicationService.cancelExecution(stockOutOrderDO)); + } + /** * 审核出库单 */ diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index f6f32760c..a7cdd0c89 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -391,7 +391,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - group by a.MATERIAL_INVENTORY_ID order by a.update_time desc + group by a.MATERIAL_INVENTORY_ID order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc @@ -484,7 +484,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY a.SHIPPER_ID, a.MATERIAL_BASE_INFO_ID, loc.warehouse_id, loc.warehouse_code, loc.warehouse_name, loc.storage_section_id, loc.storage_code, loc.storage_name, - loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by a.update_time desc + loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END, a.update_time desc