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

1.添加进口产品代理商字段

Browse Source 
2.新增查询用户关联单据类型接口
zhairh
x_z 3 years ago
parent 3b294ba821
commit 37c9d2d6aa
12 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,6 +1,7 @@
package com.glxp.sale.admin.controller.inventory;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
@ -9,6 +10,7 @@ import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest;
import com.glxp.sale.admin.req.inventory.UpdateRelBusRequset;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService;
import com.glxp.sale.admin.service.inventory.InvBusUserService;
import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
@ -26,6 +28,7 @@ import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@RestController
public class InvBusUserController {
@ -57,6 +60,25 @@ public class InvBusUserController {
return ResultVOUtils.success(warehouseBussinessTypeEntities);
}
/**
* 查询用户关联的单据类型
*
* @param filterInvBusUserRequest
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("spms/bus/user/filterUserBusList")
public BaseResponse filterUserBusList(FilterInvBusUserRequest filterInvBusUserRequest) {
List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
PageInfo<InvBusUserEntity> pageInfo = new PageInfo<>(responses);
List<String> actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList());
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions);
PageSimpleResponse<WarehouseBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(warehouseBussinessTypeEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/spms/bus/user/warehouse/update")
public BaseResponse updateRes(@RequestBody UpdateRelBusRequset relBusRequset) {

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

@ -2,7 +2,6 @@ package com.glxp.sale.admin.dao.inout;
import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest;
import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -39,4 +38,12 @@ public interface WarehouseBussinessTypeDao {
List<WarehouseBussinessTypeEntity> filterList(FilterInvBusTypeRequest filterInvUserRequest);
void deleteByCode(@Param("code") String code);
/**
* 根据单据类型编码查询单据类型列表
*
* @param actions
* @return
*/
List<WarehouseBussinessTypeEntity> selectByActions(@Param("subInvCode") String subInvCode, @Param("actions") List<String> actions);
}

3
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java
Unescape Escape View File

@ -67,6 +67,9 @@ public class UdiInfoEntity {
private String price;
//产品代理商
private String cpdls;
public Integer getId() {
return id;
}

3
api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java
Unescape Escape View File

@ -72,4 +72,7 @@ public class CompanyProductRelevanceResponse {
private String price;
//产品代理商
private String cpdls;
}

3
api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -74,6 +74,9 @@ public class UdiRelevanceResponse {
private String price;
//产品代理商
private String cpdls;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
return 1;

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

@ -38,4 +38,12 @@ public interface WarehouseBussinessTypeService {
List<WarehouseBussinessTypeEntity> getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest);
/**
* 根据单据类型编码查询单据类型列表
*
* @param actions
* @return
*/
List<WarehouseBussinessTypeEntity> selectByActions(String subInvCode, List<String> actions);
}

5
api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java
Unescape Escape View File

@ -86,4 +86,9 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
}
return warehouseBussinessTypeDao.selectListByCode(filterInvLinkDataRequest.getCode());
}
@Override
public List<WarehouseBussinessTypeEntity> selectByActions(String subInvCode, List<String> actions) {
return warehouseBussinessTypeDao.selectByActions(subInvCode, actions);
}
}

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

@ -1,6 +1,7 @@
package com.glxp.sale.admin.service.inventory.impl;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.inventory.InvBusUserDao;
import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest;
@ -19,10 +20,13 @@ public class InvBusUserServiceImpl implements InvBusUserService {
@Override
public List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) {
if (filterInvBusUserRequest == null) {
return Collections.emptyList();
}
if (filterInvBusUserRequest.getPage() != null) {
int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit();
PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit());
}
return invBusUserDao.filterInvBusUser(filterInvBusUserRequest);
}

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

@ -271,6 +271,7 @@
<if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
<if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
<if test="spmc != null">spmc=#{spmc},</if>
<if test="cpdls != null">cpdls=#{cpdls},</if>
</trim>
WHERE nameCode = #{nameCode}
</update>

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

@ -27,6 +27,7 @@
basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
FROM basic_udirel
inner JOIN basic_products
@ -114,6 +115,7 @@
basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,
customer_info.companyName,basic_products.originUuid
FROM basic_udirel
@ -204,6 +206,7 @@
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc
FROM basic_products
right JOIN basic_udirel

1
api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml
Unescape Escape View File

@ -51,6 +51,7 @@
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price,basic_products.spmc
FROM company_product_relevance
inner JOIN basic_udirel

6
api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml
Unescape Escape View File

@ -272,6 +272,12 @@
where code = #{code}
</select>
<select id="selectByActions" resultType="com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity">
select * from inv_warehouse_bussiness_type where code = #{subInvCode} and action in
<foreach collection="actions" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</select>
<delete id="deleteByCode">
delete

Write Preview
Loading…
Cancel
Save