purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决分配仓库不展示的bug

Browse Source
This commit is contained in:
季圣华
2021-05-16 21:36:20 +08:00
parent 68d49f628d
commit 9151341173
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java
View File

@@ -116,6 +116,8 @@ public class DepotService {
Depot depot = JSONObject.parseObject(obj.toJSONString(), Depot.class); Depot depot = JSONObject.parseObject(obj.toJSONString(), Depot.class);
int result=0; int result=0;
try{ try{
depot.setType(0);
depot.setIsDefault(false);
result=depotMapper.insertSelective(depot); result=depotMapper.insertSelective(depot);
logService.insertLog("仓库", logService.insertLog("仓库",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(depot.getName()).toString(), request); new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(depot.getName()).toString(), request);

2
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -132,7 +132,7 @@
</select> </select>
<select id="findMaterialsListByHeaderId" resultType="java.lang.String"> <select id="findMaterialsListByHeaderId" resultType="java.lang.String">
select group_concat(concat(jsh_material.name,' ',jsh_material.standard,' ',jsh_material.model)) as mName select group_concat(concat(jsh_material.name,' ',ifnull(jsh_material.standard,''),' ',ifnull(jsh_material.model,''))) as mName
from jsh_depot_item from jsh_depot_item
inner join jsh_material on jsh_depot_item.material_id = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1' inner join jsh_material on jsh_depot_item.material_id = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1'
where jsh_depot_item.header_id = ${id} where jsh_depot_item.header_id = ${id}