Merge branch 'dev' into dev-ty1.2

# Conflicts:
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml

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

@@ -1,11 +1,13 @@
 package com.mhd.wms.interfaces.facadeApi.stockInOrder;
 
+import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.utils.bean.BeanUtils;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.StringUtils;
+import com.mhd.system.api.XxlJobServiceFeign;
 import com.mhd.wms.application.service.stockInOrder.StockInOrderApplicationService;
 import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
@@ -20,6 +22,8 @@ import com.mhd.wms.interfaces.assember.stockOutOrder.StockOutOrderAssembler;
 import com.mhd.wms.interfaces.dto.inMaterialDetail.InMaterialDetailDTO;
 import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
 import com.mhd.wms.interfaces.dto.stockOutOrder.StockOutOrderDTO;
+import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +53,8 @@ public class StockInOrderApi extends BaseController {
     private StockInOrderAssembler stockInOrderAssembler;
     @Resource
     private StockOutOrderAssembler stockOutOrderAssembler;
+    @Autowired
+    private XxlJobServiceFeign xxlJobServiceFeign;
 
     /**
      * 分页查询入库单列表
@@ -347,4 +353,32 @@ public class StockInOrderApi extends BaseController {
         return stockInOrderApplicationService.batchSignature(dto);
     }
 
+    @GetMapping("/xxlopenfeign")
+    public AjaxResult xxlopenfeign(@RequestParam String param) {
+        R<Map<String, Object>> mapR = xxlJobServiceFeign.openFeignTest(param);
+        return AjaxResult.success(mapR);
+    }
+
+    /**
+     * 1. 简单任务示例（Bean模式）
+     * 这里的 demoJobHandler 必须和调度中心配置一致
+     */
+    @XxlJob("demoJobHandler")
+    public void demoJobHandler() {
+        // 获取任务参数
+        String param = XxlJobHelper.getJobParam();
+        logger.info("XXL-JOB 开始执行，参数：{}", param);
+
+        try {
+            // ========== 你的业务逻辑 ==========
+            logger.info("执行若依微服务定时任务...");
+
+            // 设置任务执行结果
+            XxlJobHelper.handleSuccess("执行成功");
+        } catch (Exception e) {
+            logger.error("XXL-JOB 执行失败", e);
+            XxlJobHelper.handleFail("执行失败：" + e.getMessage());
+        }
+    }
+
 }