From d8abb2c50adb12eee2c3274415ee8ef653591c15 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 8 Jul 2026 17:33:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=9C=80=E6=B1=82=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext_manage/controller/MesToWmsController.java  | 14 +++++++++++++-
 .../work_order/impl/WorkOrderServiceImpl.java      |  1 +
 nladmin-ui/src/views/system/role/index.vue         |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java
index 6a93038..6644bc7 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java
@@ -7,6 +7,8 @@ import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.ext_manage.service.MesToWmsService;
 import org.nl.wms.ext_manage.service.dto.MesTaskParams;
+import org.nl.wms.pm_manage.demand.service.IPmDemandService;
+import org.nl.wms.pm_manage.demand.service.dto.PmDemandParam;
 import org.nl.wms.pm_manage.pmreturn.service.IPmReturnService;
 import org.nl.wms.pm_manage.pmreturn.service.dao.PmReturn;
 import org.nl.wms.pm_manage.pmreturn.service.dto.PmReturnParam;
@@ -38,6 +40,9 @@ public class MesToWmsController {
     @Autowired
     private IPmReturnService iPmReturnService;
 
+    @Autowired
+    private IPmDemandService iPmDemandService;
+
     @PostMapping("api/mes/lineLackMat")
     @SaIgnore
     public ResponseEntity task(@Valid @RequestBody MesTaskParams mesTaskParams){
@@ -50,7 +55,7 @@ public class MesToWmsController {
      * @param dtos
      * @return
      */
-    @PostMapping("app/restful/api/v3/wms/mesRequisitionSync")
+    @PostMapping("api/mes/subWorkOrder")
     @SaIgnore
     public ResponseEntity subWorkOrder(@RequestBody List<WorkOrderDto.WorkOrderDataDto> dtos){
         for (WorkOrderDto.WorkOrderDataDto dto : dtos) {
@@ -59,6 +64,13 @@ public class MesToWmsController {
         return ResponseData.build();
     }
 
+    @PostMapping("app/restful/api/v3/wms/mesRequisitionSync")
+    @SaIgnore
+    public ResponseEntity mesRequisitionSync(@RequestBody List<PmDemandParam> params) {
+        iPmDemandService.batchCreate(params);
+        return ResponseData.build();
+    }
+
 
     /**
      * 退料单同步
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java
index 8affba7..987dac4 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/impl/WorkOrderServiceImpl.java
@@ -13,6 +13,7 @@ import org.nl.wms.welding_manage.service.work_order.dto.WorkOrderDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
diff --git a/nladmin-ui/src/views/system/role/index.vue b/nladmin-ui/src/views/system/role/index.vue
index 30dc6c8..cfbdc53 100644
--- a/nladmin-ui/src/views/system/role/index.vue
+++ b/nladmin-ui/src/views/system/role/index.vue
@@ -181,7 +181,7 @@ export default {
     getMenuDatas(node, resolve) {
       setTimeout(() => {
         getMenusTree(node.data.menu_id ? node.data.menu_id : 0).then(res => {
-          resolve(res)
+          resolve(res.data)
         })
       }, 100)
     },