From c9c144abc8a44afff818111ccd790924813beec6 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 22 Jul 2024 11:13:17 +0800
Subject: [PATCH] 7/22

---
 .../goodsbrandinfo/GoodsBrandInfoMapper.xml   |  2 +-
 .../GoodsManufacturerMapper.xml               |  2 +-
 .../yxt/goods/biz/goodsspu/GoodsSpuMapper.xml |  2 +-
 .../goods/biz/goodstype/GoodsTypeMapper.xml   |  2 +-
 .../goods/biz/goodstype/GoodsTypeService.java | 19 +++++++++++++++++++
 .../yxt/goods/biz/goodstype/GoodsTypeVo.java  |  1 +
 .../goods/biz/goodsunit/GoodsUnitMapper.xml   |  2 +-
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
index ea42284..a7b5e90 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
@@ -19,7 +19,7 @@
         from goods_brand_info a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">
diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
index 25a64fd..37e3576 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
@@ -19,7 +19,7 @@
         from goods_manufacturer a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable='1'
         </where>
     </select>
     <select id="getAllTypeByUseOrgSid" resultType="com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerVo">
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
index 2725329..6eb1f2f 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
@@ -22,7 +22,7 @@
         from goods_spu a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable='1'
         </where>
     </select>
     <select id="initialization" resultType="com.yxt.goods.biz.goodsspu.GoodsSpuVo">
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
index 6cbf192..9882d2c 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
@@ -19,7 +19,7 @@
         from goods_type a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
index 99db72a..3c8ad06 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
@@ -83,6 +83,15 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
                 }
                 record.setSids(record.getPSid());
             }
+            if(record.getOutStockRule().equals("0")){
+                record.setOutStockRuleVaule("先进先出");
+            }
+            else if(record.getOutStockRule().equals("1")){
+                record.setOutStockRuleVaule("先进后出");
+            }
+            else if(record.getOutStockRule().equals("2")){
+                record.setOutStockRuleVaule("保质期优先");
+            }
         }
         return rb.success().setData(p);
     }
@@ -152,7 +161,17 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
                 GoodsType wmsGoodsType1 = fetchBySid(wmsGoodsType.getPSid());
                 vo.setPName(wmsGoodsType1.getGoodsTypeName());
             }
+            //先进先出0、先进后出1、保质期优先2
             vo.setSids(wmsGoodsType.getPSid());
+            if(vo.getOutStockRule().equals("0")){
+                vo.setOutStockRuleVaule("先进先出");
+            }
+            else if(vo.getOutStockRule().equals("1")){
+                vo.setOutStockRuleVaule("先进后出");
+            }
+            else if(vo.getOutStockRule().equals("2")){
+                vo.setOutStockRuleVaule("保质期优先");
+            }
         }
         return rb.success().setData(vo);
     }
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java
index 392fb2d..898fb0b 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java
@@ -36,6 +36,7 @@ public class GoodsTypeVo implements Vo {
     private String createOrgSid;//创建组织sid
     private String sids;//创建组织sid
     private String outStockRule;//出库规则
+    private String outStockRuleVaule;//出库规则
     private String userSid;
     private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
index b40fbd8..8454725 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
@@ -19,7 +19,7 @@
         from goods_unit a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">