diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index fe2abc51..32a71d9d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -141,6 +141,10 @@ public class InvSubWarehouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + boolean checkResult = invSubWarehouseService.checkDuplicateName(invSubWarehouseEntity.getParentId(), invSubWarehouseEntity.getName()); + if (checkResult) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "分库名称重复!"); + } FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest(); filterInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java index 920e1da2..b192c1e8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/InnerOrderRequest.java @@ -6,6 +6,9 @@ import lombok.Data; @Data public class InnerOrderRequest extends ListPageRequest { - private String recordKey; + + private String startDate; + + private String endDate; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java index e284ef2b..4a756742 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java @@ -76,4 +76,8 @@ public class BussinessTypResponse { private boolean secCheckCopy; private boolean checkSelect; //判断多选框是否勾选 + + private boolean checkSp; + + private boolean secCheckSp; //自助平台同步 } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 58ba333c..fc13cf7b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -327,12 +327,14 @@ checkPc=#{checkPc}, checkWebNew=#{checkWebNew}, checkChange=#{checkChange}, + checkSp=#{checkSp}, secCheckUdims=#{secCheckUdims}, secCheckPdaEd=#{secCheckPdaEd}, secCheckPdaUn=#{secCheckPdaUn}, secCheckPc=#{secCheckPc}, secCheckWebNew=#{secCheckWebNew}, secCheckChange=#{secCheckChange}, + secCheckSp=#{secCheckSp}, checkBalacne=#{checkBalacne}, secCheckBalacne=#{secCheckBalacne}, index=#{index}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml index d1bcffdc..bcf1da8b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InnerOrderDao.xml @@ -12,8 +12,11 @@ AND recordKey = #{recordKey} + + AND date_format(inv_inner_order.createTime, '%Y-%m-%d') between date_format(#{startDate}, + '%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d') + - GROUP BY #{groupType} - group by inv_prein_product.id + group by inv_prein_product.orderIdFk order by inv_prein_product.updateTime desc