Merge branch 'dev-ty1.2' into dev-bms-260826

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java

@@ -199,8 +199,10 @@ public class StockInOrderApi extends BaseController {
      */
     @ApiOperation("oms下发单保存")
     @PostMapping(value = "/omsInOrderAdd")
-    public void omsInOrderAdd(@RequestBody StockInOrder stockInOrder) {
+    public AjaxResult omsInOrderAdd(@RequestBody StockInOrder stockInOrder) {
+        //返回执行结果而非void：OMS侧需感知保存失败（此前Feign降级被静默吞掉，OMS显示下发成功但WMS无数据，流程阻断）
         stockInOrderApplicationService.omsOrderAdd(stockInOrder);
+        return AjaxResult.success();
     }
 
     /**
@@ -311,8 +313,20 @@ public class StockInOrderApi extends BaseController {
      */
     @ApiOperation("oms下发单明细保存")
     @PostMapping(value = "/omsInOrderAddDetail")
-    public void omsInOrderAddDetail(@RequestBody List<InMaterialDetail> inMaterialDetails) {
+    public AjaxResult omsInOrderAddDetail(@RequestBody List<InMaterialDetail> inMaterialDetails) {
+        //返回执行结果而非void：明细保存含自动审核链路，失败必须让OMS感知并回滚下发标记
         stockInOrderApplicationService.omsOrderAddDetail(inMaterialDetails);
+        return AjaxResult.success();
+    }
+
+    /**
+     * oms取消下发入库执行单：清理WMS侧下发生成的入库单及下游收货链路数据（逻辑删除）
+     */
+    @ApiOperation("oms取消下发入库单清理")
+    @PostMapping(value = "/omsCancelInOrder")
+    public AjaxResult omsCancelInOrder(@RequestBody StockInOrder stockInOrder) {
+        stockInOrderApplicationService.omsCancelInOrder(stockInOrder);
+        return AjaxResult.success();
     }
 
     @ApiOperation("查询入库信息（通过入库单号）")