UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.查询分库增加主仓库名称字段

Browse Source 
2.修复第三方单据类型查询报错问题
fencang
x_z 3 years ago
parent 28ed79c4a1
commit f311b8c730
8 changed files with 97 additions and 9 deletions
Show Stats Download Patch File Download Diff File

20
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
Unescape Escape View File

@ -483,14 +483,22 @@ public class StockOrderDetailController {
BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
companyProductRelevanceRequest.setIsDisable(false);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
companyProductRelevanceRequest.setCustomerId(null);
companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
companyProductRelevanceRequest.setCustomerId(null);
companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
}
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
}
PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
PageSimpleResponse<CompanyProductRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();

5
api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.inventory.InvSubWarehouseResponse;
import com.glxp.sale.admin.res.inventory.InvWarehouseThirdSysResponse;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService;
@ -49,8 +50,8 @@ public class InvSubWarehouseController {
@AuthRuleAnnotation("")
@GetMapping("spms/sub/inv/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
List<InvSubWarehouseResponse> responses = invSubWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
return ResultVOUtils.success(responses);
}

9
api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.sale.admin.dao.inventory;
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.inventory.InvSubWarehouseResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -51,4 +52,12 @@ public interface InvSubWarehouseDao {
boolean updateThridId(@Param("id") String id, @Param("thridWarehouseId") String thridWarehouseId, @Param("sysId") String sysId);
/**
* 查询分仓数据
*
* @param filterInvSubWarehouseRequest
* @return
*/
List<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
}

23
api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvSubWarehouseResponse.java
Unescape Escape View File

@ -0,0 +1,23 @@
package com.glxp.sale.admin.res.inventory;
import lombok.Data;
/**
* 分仓接口响应类
*/
@Data
public class InvSubWarehouseResponse {
private String id;
//分仓编码
private String code;
//分仓编码
private String name;
//主仓库编码
private String parentId;
//主仓库名称
private String parentName;
private String remark;
private boolean defaultInv;
}

8
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.sale.admin.service.inventory;
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.inventory.InvSubWarehouseResponse;
import com.glxp.sale.admin.res.inventory.InvWarehouseThirdSysResponse;
import java.util.List;
@ -45,5 +46,12 @@ public interface InvSubWarehouseService {
boolean unbindThrWarehouse(String id, String sysId);
/**
* 查询分仓数据
*
* @param filterInvSubWarehouseRequest
* @return
*/
List<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
}

14
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest;
import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.inventory.InvSubWarehouseResponse;
import com.glxp.sale.admin.res.inventory.InvWarehouseThirdSysResponse;
import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
import org.springframework.stereotype.Service;
@ -176,4 +177,17 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
return invSubWarehouseDao.updateThridId(id, null, sysId);
}
@Override
public List<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
if (filterInvSubWarehouseRequest == null) {
return Collections.emptyList();
}
if (filterInvSubWarehouseRequest.getPage() != null) {
int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit());
}
List<InvSubWarehouseResponse> data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
return data;
}
}

2
api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
Unescape Escape View File

@ -62,7 +62,7 @@
<where>
basic_third_sys_detail.key = 'orderQueryUrl' and basic_third_sys_detail.enabled=1
<if test="name != ''and name != null">
AND name LIKE concat(#{name},'%')
AND basic_bustype_origin.name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')

25
api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml
Unescape Escape View File

@ -155,4 +155,29 @@
</if>
</where>
</select>
<select id="filterInvSubWarehouseResponse"
resultType="com.glxp.sale.admin.res.inventory.InvSubWarehouseResponse">
select a.id, a.code, a.name, a.parentId, a.remark, a.defaultInv, a.thirdId, a.thirdId1, a.thirdId2,
a.thirdId3, a.thirdId4, b.name as parentName
FROM inv_warehouse_sub a
left join inv_warehouse b on a.parentId = b.code
<where>
<if test="id != '' and id != null">
AND a.id = #{id}
</if>
<if test="code != '' and code != null">
AND a.code = #{code}
</if>
<if test="name != '' and name != null">
AND a.name like concat('%',#{name},'%')
</if>
<if test="parentId != '' and parentId != null">
AND a.parentId = #{parentId}
</if>
<if test="defaultInv != '' and defaultInv != null">
AND a.defaultInv = #{defaultInv}
</if>
</where>
</select>
</mapper>
Write Preview
Loading…
Cancel
Save