From a1475485412044cc043223d2e5473e73fabdffa1 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 8 Jul 2026 17:50:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=9C=80=E6=B1=82=E5=8D=95=E9=A6=96?=
 =?UTF-8?q?=E5=AD=97=E6=AF=8D=E5=A4=A7=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demand/service/dto/PmDemandParam.java     | 26 +++++++++----------
 nladmin-ui/src/views/login.vue                |  4 +--
 .../src/views/system/notice/NoticeIcon.vue    |  2 +-
 .../src/views/wms/basedata/class/index.vue    |  6 ++---
 .../views/wms/basedata/group/AddDialog.vue    |  2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandParam.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandParam.java
index e8d5983..ea6b11a 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandParam.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/dto/PmDemandParam.java
@@ -34,50 +34,48 @@ public class PmDemandParam {
     @JsonProperty(value = "Priority")
     private Integer priority;
 
-    @JsonProperty(value = "status")
+    @JsonProperty(value = "Status")
     private String status;
 
     @NotBlank(message = "工单编号不能为空")
-    @JsonProperty(value = "workOrder")
+    @JsonProperty(value = "WorkOrder")
     private String workOrder;
 
     @NotBlank(message = "物料编码不能为空")
-    @JsonProperty(value = "skuCode")
+    @JsonProperty(value = "SkuCode")
     private String skuCode;
 
     @NotBlank(message = "物料名称不能为空")
-    @JsonProperty(value = "skuName")
+    @JsonProperty(value = "SkuName")
     private String skuName;
 
     @NotNull(message = "数量不能为空")
     @DecimalMin(value = "0", inclusive = false, message = "数量必须大于0")
-    @JsonProperty(value = "qty")
+    @JsonProperty(value = "Qty")
     private BigDecimal qty;
 
-    @DecimalMin(value = "0", inclusive = false, message = "数量必须大于0")
-    @JsonProperty(value = "qssignQty")
-    private BigDecimal qssignQty;
+    private BigDecimal ssignQty;
 
     @NotBlank(message = "单位不能为空")
-    @JsonProperty(value = "unit")
+    @JsonProperty(value = "Unit")
     private String unit;
 
     @NotBlank(message = "目标库存地点不能为空")
-    @JsonProperty(value = "targetArea")
+    @JsonProperty(value = "TargetArea")
     private String targetArea;
 
     @NotBlank(message = "产线不能为空")
-    @JsonProperty(value = "productionLine")
+    @JsonProperty(value = "ProductionLine")
     private String productionLine;
     @NotBlank(message = "目标库存地点不能为空")
-    @JsonProperty(value = "targetHouseCode")
+    @JsonProperty(value = "TargetHouseCode")
     private String targetHouseCode;
 
     @NotBlank(message = "产线不能为空")
-    @JsonProperty(value = "carrierType")
+    @JsonProperty(value = "CarrierType")
     private String carrierType;
 
-    @JsonProperty(value = "sn")
+    @JsonProperty(value = "Sn")
     private String sn;
 }
 
diff --git a/nladmin-ui/src/views/login.vue b/nladmin-ui/src/views/login.vue
index d723e61..2a41ecc 100644
--- a/nladmin-ui/src/views/login.vue
+++ b/nladmin-ui/src/views/login.vue
@@ -125,8 +125,8 @@ export default {
     },
     getCode() {
       getCodeImg().then(res => {
-        this.codeUrl = res.img
-        this.loginForm.uuid = res.uuid
+        this.codeUrl = res.data.img
+        this.loginForm.uuid = res.data.uuid
       })
     },
     getCookie() {
diff --git a/nladmin-ui/src/views/system/notice/NoticeIcon.vue b/nladmin-ui/src/views/system/notice/NoticeIcon.vue
index 1a0365b..2380988 100644
--- a/nladmin-ui/src/views/system/notice/NoticeIcon.vue
+++ b/nladmin-ui/src/views/system/notice/NoticeIcon.vue
@@ -91,7 +91,7 @@ export default {
     receivedCount() {
       // 查询当前用户的未读消息数量
       crudNotice.countByReceiveNotRead().then(res => {
-        this.notReadMsgCount = res
+        this.notReadMsgCount = res.data
       })
     },
     /**
diff --git a/nladmin-ui/src/views/wms/basedata/class/index.vue b/nladmin-ui/src/views/wms/basedata/class/index.vue
index 3243eaa..551fbe1 100644
--- a/nladmin-ui/src/views/wms/basedata/class/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/class/index.vue
@@ -211,7 +211,7 @@ export default {
   methods: {
     getClassNames() {
       crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
-        this.classNames = res
+        this.classNames = res.data
       })
     },
     getClassDatas(tree, treeNode, resolve) {
@@ -273,14 +273,14 @@ export default {
     },
     getSubTypes(id) {
       crudClassstandard.getClassSuperior(id).then(res => {
-        const date = res.content
+        const date = res.data
         this.buildClass(date)
         this.classes = date
       })
     },
     getClass() {
       crudClassstandard.getClass({ enabled: true }).then(res => {
-        this.classes = res.content.map(function(obj) {
+        this.classes = res.data.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null
           }
diff --git a/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue b/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue
index fe2b68b..44a7774 100644
--- a/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue
+++ b/nladmin-ui/src/views/wms/basedata/group/AddDialog.vue
@@ -189,7 +189,7 @@ export default {
   methods: {
     open() {
       crudBsrealstorattr.getStor().then(res => {
-        this.storlist = res
+        this.storlist = res.data
       })
     },
     close() {