From 9fdfa88160920e20a72abd2f5c98d051d9a5ff8b Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sun, 15 Dec 2024 12:45:56 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=BA=93=E5=AD=98=E5=87=BA=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form_data/service/impl/PmFormDataServiceImpl.java       | 6 ++++++
 .../struct/controller/StIvtStructattrController.java        | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
index c629cc21..e3e9d62b 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
@@ -236,6 +236,12 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
                 child.setSto_qty(new BigDecimal(0));
                 child.setPcsn("");
             }else {
+                for (StructAssignQty assignQty : maps) {
+                    if (child.getPcsn().equals(assignQty.getPcsn())){
+                        child.setSto_qty(assignQty.getSto_qty());
+                        child.setPcsn(assignQty.getPcsn());
+                    }
+                }
                 child.setSto_qty(BigDecimal.valueOf(maps.stream().mapToInt(a->a.getSto_qty().intValue()).sum()));
                 child.setPcsn("");
             }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
index da57b138..a74424b1 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.stor_manage.struct.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -44,6 +45,7 @@ public class StIvtStructattrController {
 
     @GetMapping
     @Log("仓位查询")
+    @SaIgnore
     public ResponseEntity<Object> query(StructattrQuery query, PageQuery page) {
         return new ResponseEntity<>(structattrService.pageQuery(query,page), HttpStatus.OK);
     }