Merge branch 'dev-ty1.2' into dev

2026-09-05 13:53:01 +08:00
parent b46483263b be8ba45067
commit c0065074d3
10 changed files with 436 additions and 30 deletions
@@ -544,10 +544,21 @@ public class StockOutOrderApi extends BaseController {
        stockOutOrderApplicationService.omsOrderAddDetail(outMaterialDetails);
    }

+    /**
+     * oms下发前库存校验：不足时返回错误，OMS据此拦截下发，避免单据落库后分配失败残留垃圾单
+     */
+    @ApiOperation("oms下发前库存校验")
+    @PostMapping(value = "/checkOmsAssignInventory")
+    public AjaxResult checkOmsAssignInventory(@RequestBody List<OutMaterialDetail> outMaterialDetails) {
+        stockOutOrderApplicationService.checkOmsAssignInventory(outMaterialDetails);
+        return AjaxResult.success("库存校验通过");
+    }
+
    @ApiOperation("oms下发单保存")
    @PostMapping(value = "/cancelExecutionOrder")
-    public void omsCancelExecutionOrder(@RequestBody StockOutOrder stockOutOrder) {
+    public AjaxResult omsCancelExecutionOrder(@RequestBody StockOutOrder stockOutOrder) {
        stockOutOrderApplicationService.cancelExecutionOrder(stockOutOrder);
+        return AjaxResult.success();
    }

    /**