diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index 3321dd4..e302c67 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -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("添加成功"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 0148cf2..1a9c92e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -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 warehouseUserEntities = warehouseUserService.getListByCode(filterInvLinkDataRequest); PageInfo 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 warehouseBussniessTypeList = warehouseBussinessTypeService.getWarehouseBussniessTypeList(filterInvLinkDataRequest); PageInfo pageInfo = new PageInfo<>(warehouseBussniessTypeList); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java index 16098c8..495cd3c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java @@ -18,5 +18,6 @@ public class BasicEntrustRecRequest extends ListPageRequest { private String lastUpdateTime; private String entrustSubInv; private String invWarehouseCode; + private String name; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java index 7919e31..e205e7b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvLinkDataRequest.java @@ -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; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java index bf75a6a..7104aee 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvProductServiceImpl.java @@ -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 data = invProductDao.stockStatistics(filterInvProductRequest); if (CollUtil.isNotEmpty(data)) { //默认根据产品id分组 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml index e95e8ed..757abca 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicExportDao.xml @@ -19,9 +19,12 @@ and idDatas = #{idDatas} - + and scheduleType = #{scheduleType} + + and #{syncTime} BETWEEN startTime and endTime + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index 0416f35..67b934f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -166,6 +166,7 @@ UPDATE basic_corp thirdId=#{thirdId}, + thirdId=null, erpId=#{erpId}, `name`=#{name}, spell=#{spell}, @@ -179,6 +180,10 @@ thirdId2=#{thirdId2}, thirdId3=#{thirdId3}, thirdId4=#{thirdId4}, + thirdId1=null, + thirdId2=null, + thirdId3=null, + thirdId4=null, thirdName=#{thirdName}, thirdName1=#{thirdName1}, thirdName2=#{thirdName2}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml index e55ef27..52d91f0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml @@ -62,7 +62,7 @@ basic_third_sys_detail.key = 'orderQueryUrl' and basic_third_sys_detail.enabled=1 - AND basic_bustype_origin.name LIKE concat(#{name},'%') + AND basic_bustype_origin.name LIKE concat('%', #{name}, '%') AND action LIKE concat(#{action},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 475fa34..9b80bab 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -100,6 +100,9 @@ and curInv = #{curInv} + + and a.name like concat('%', #{name}, '%') + group by basic_entrust_accept.id order by updateTime desc diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 22a634f..18e025b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -265,7 +265,7 @@ AND basic_products.originUuid is NULL - AND mainId is NULL and basic_products.originUuid ]]> '' + AND (mainId is NULL or mainId = '') and basic_products.originUuid ]]> '' AND thirdId1 is NULL and basic_products.originUuid ]]> '' diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index cf6d2e3..6d9120c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -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} + + + AND code = #{code} + + diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index 4ebd1f7..ba7aa6c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -105,6 +105,12 @@ WHERE id = #{id} + + update inv_warehouse_sub + set ${sysId} = #{thridWarehouseId,jdbcType=VARCHAR} + where id = #{id} + + replace into inv_warehouse_sub (id, code, `name`, parentId, remark,defaultInv)