From f8db88e5b0dc80a453e762d4b02826f63f547043 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Sat, 11 May 2024 17:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/base/basegoodstype/BaseGoodsTypeService.java     | 9 +++++++++
 .../yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java | 1 +
 2 files changed, 10 insertions(+)

diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
index 0d93c2cd67..4d331a3ef8 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeService.java
@@ -110,6 +110,15 @@ public class BaseGoodsTypeService extends MybatisBaseService<BaseGoodsTypeMapper
                 vo.setPName(wmsGoodsType1.getGoodsTypeName());
             }
             vo.setSids(wmsGoodsType.getPSid());
+            if(StringUtils.isNotBlank(wmsGoodsType.getOutStockRule())){
+                if(wmsGoodsType.getOutStockRule().equals("0")){
+                    vo.setOutStockRuleValue("先进先出");
+                } else if (wmsGoodsType.getOutStockRule().equals("1")) {
+                    vo.setOutStockRuleValue("先进后出");
+                }else if(wmsGoodsType.getOutStockRule().equals("2")){
+                    vo.setOutStockRuleValue("保质期优先");
+                }
+            }
         }
         return rb.success().setData(vo);
     }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
index 4414fd8080..6b40535d85 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodstype/BaseGoodsTypeVo.java
@@ -36,4 +36,5 @@ public class BaseGoodsTypeVo implements Vo {
     private String createOrgSid;//创建组织sid
     private String outStockRule;//出库规则
     private String sids;//创建组织sid
+    private String outStockRuleValue;//出库规则
 }