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

1.修复接口查询错误等问题

Browse Source
fencang
x_z 3 years ago
parent 945956f92f
commit 902a2d1d6a
12 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File

9
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -122,14 +122,21 @@ public class UdiContrastController {
}
}
} else if (CollUtil.isNotEmpty(combineRequest.getThirdIds())) {
StringBuffer buffer = new StringBuffer();
//只添加产品
for (String thirdId : combineRequest.getThirdIds()) {
if (udiContrastService.isExit(null, thirdId)) {
return ResultVOUtils.error(500, "产品编码:" + thirdId + "已存在!");
buffer.append(thirdId).append(",");
} else {
createOnlyMainId(combineRequest, thirdId);
}
}
if (StrUtil.isNotBlank(buffer.toString())) {
String errorInfo = StrUtil.removeSuffix(buffer.toString(), ",");
return ResultVOUtils.error(500, "产品编码:" + errorInfo + "已存在!");
}
}
return ResultVOUtils.success("添加成功");
}

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

@ -1190,9 +1190,9 @@ public class WareHouseController {
*/
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/warehouseUserList")
public BaseResponse getWarehouseUserList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) {
if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
public BaseResponse getWarehouseUserList(@RequestBody FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(filterInvLinkDataRequest);
PageInfo<WarehouseUserEntity> pageInfo = new PageInfo<>(warehouseUserEntities);
@ -1214,9 +1214,9 @@ public class WareHouseController {
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/warehouseBussniessTypeList")
public BaseResponse getWarehouseBussniessTypeList(@RequestBody @Valid FilterInvLinkDataRequest filterInvLinkDataRequest) {
if (null == filterInvLinkDataRequest || StrUtil.isBlank(filterInvLinkDataRequest.getCode())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
public BaseResponse getWarehouseBussniessTypeList(@RequestBody FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<WarehouseBussinessTypeEntity> warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest);
PageInfo<WarehouseBussinessTypeEntity> pageInfo = new PageInfo<>(warehouseBussniessTypeList);

1
api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java
Unescape Escape View File

@ -18,5 +18,6 @@ public class BasicEntrustRecRequest extends ListPageRequest {
private String lastUpdateTime;
private String entrustSubInv;
private String invWarehouseCode;
private String name;
}

3
api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java
Unescape Escape View File

@ -3,8 +3,6 @@ package com.glxp.sale.admin.req.inventory;
import com.glxp.sale.admin.req.ListPageRequest;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
/**
* 查询仓库关联的数据请求参数
*/
@ -12,7 +10,6 @@ import javax.validation.constraints.NotEmpty;
public class FilterInvLinkDataRequest extends ListPageRequest {
//分仓码
@NotEmpty(message = "请选择分仓！")
private String code;

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

@ -95,6 +95,10 @@ public class InvProductServiceImpl implements InvProductService {
if (filterInvProductRequest == null) {
return Collections.emptyList();
}
if (filterInvProductRequest.getPage() != null) {
int offset = (filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit();
PageHelper.offsetPage(offset, filterInvProductRequest.getLimit());
}
List<InvProductResponse> data = invProductDao.stockStatistics(filterInvProductRequest);
if (CollUtil.isNotEmpty(data)) {
//默认根据产品id分组

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

@ -19,9 +19,12 @@
<if test="idDatas != '' and idDatas!=null">
and idDatas = #{idDatas}
</if>
<if test="scheduleType!=null">
<if test="scheduleType != null">
and scheduleType = #{scheduleType}
</if>
<if test="syncTime != null">
and #{syncTime} BETWEEN startTime and endTime
</if>
</where>
ORDER BY updateTime DESC
</select>

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

@ -166,6 +166,7 @@
UPDATE basic_corp
<trim prefix="set" suffixOverrides=",">
<if test="thirdId != null">thirdId=#{thirdId},</if>
<if test="thirdId == ''">thirdId=null,</if>
<if test="erpId != null">erpId=#{erpId},</if>
<if test="name != null">`name`=#{name},</if>
<if test="spell != null">spell=#{spell},</if>
@ -179,6 +180,10 @@
<if test="thirdId2 != null">thirdId2=#{thirdId2},</if>
<if test="thirdId3 != null">thirdId3=#{thirdId3},</if>
<if test="thirdId4 != null">thirdId4=#{thirdId4},</if>
<if test="thirdId1 == ''">thirdId1=null,</if>
<if test="thirdId2 == ''">thirdId2=null,</if>
<if test="thirdId3 == ''">thirdId3=null,</if>
<if test="thirdId4 == ''">thirdId4=null,</if>
<if test="thirdName != null">thirdName=#{thirdName},</if>
<if test="thirdName1 != null">thirdName1=#{thirdName1},</if>
<if test="thirdName2 != null">thirdName2=#{thirdName2},</if>

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 basic_bustype_origin.name LIKE concat(#{name},'%')
AND basic_bustype_origin.name LIKE concat('%', #{name}, '%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')

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

@ -100,6 +100,9 @@
<if test="curInv!=null">
and curInv = #{curInv}
</if>
<if test="name != null and name != ''">
and a.name like concat('%', #{name}, '%')
</if>
</where>
group by basic_entrust_accept.id
order by updateTime desc

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

@ -265,7 +265,7 @@
AND basic_products.originUuid is NULL
</if>
<if test="filterType != null and filterType == 3">
AND mainId is NULL and basic_products.originUuid <![CDATA[<>]]> ''
AND (mainId is NULL or mainId = '') and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND thirdId1 is NULL and basic_products.originUuid <![CDATA[<>]]> ''

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

@ -243,7 +243,11 @@
select inv_warehouse_user.*, auth_user.employeeName
from inv_warehouse_user
inner join auth_user on auth_user.id = inv_warehouse_user.userId
where code = #{code}
<where>
<if test="code != null and code != ''">
AND code = #{code}
</if>
</where>
</select>

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

@ -105,6 +105,12 @@
WHERE id = #{id}
</update>
<update id="updateThridId" parameterType="Map">
update inv_warehouse_sub
set ${sysId} = #{thridWarehouseId,jdbcType=VARCHAR}
where id = #{id}
</update>
<insert id="importInvSubWarehouse" parameterType="java.util.List">
replace into inv_warehouse_sub
(id, code, `name`, parentId, remark,defaultInv)

Write Preview
Loading…
Cancel
Save