open_platform/ss-common-goods
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
fanzongzhe
2024-07-22 11:14:16 +08:00
parent 9745aad2ed c9c144abc8
commit d42b904940
7 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
View File

@@ -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">

2
src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
View File

@@ -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">

2
src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
View File

@@ -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">

2
src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
View File

@@ -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">

19
src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
View File

@@ -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);
}

1
src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java
View File

@@ -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;
}

2
src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
View File

@@ -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">