bug修改;

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java

@@ -96,15 +96,6 @@ public class MaterialInventoryApi extends BaseController {
         startPage();
         // 使用带批次属性的查询方法，批次属性值从库存表中获取
         List<MaterialInventoryPO> 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) {

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));
+    }
+
     /**
      * 审核出库单
      */