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 c4cfca0..b8a5da0 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 @@ -1312,30 +1312,30 @@ public class WareHouseController { if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson)) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - List bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class); - FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); - filterInvBusUserRequest.setSubInvCode(code); - List invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest); - Map filteBusTypes = new HashMap<>(); - for (InvBusUserResponse invBusUserEntity : invBusUserEntities) { - boolean isExit = false; - for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) { - if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) { - isExit = true; - continue; - } - } - if (!isExit) { - filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity); - } - } - if (filteBusTypes.size() > 0) { - String data = ""; - for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) { - data = data + invBusUserResponse.getBillTypeName() + ","; - } - return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！"); - } +// List bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class); +// FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); +// filterInvBusUserRequest.setSubInvCode(code); +// List invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest); +// Map filteBusTypes = new HashMap<>(); +// for (InvBusUserResponse invBusUserEntity : invBusUserEntities) { +// boolean isExit = false; +// for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) { +// if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) { +// isExit = true; +// continue; +// } +// } +// if (!isExit) { +// filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity); +// } +// } +// if (filteBusTypes.size() > 0) { +// String data = ""; +// for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) { +// data = data + invBusUserResponse.getBillTypeName() + ","; +// } +// return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！"); +// } warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class)); InvSubWarehouseEntity invSubWarehouseEntity = diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 85bb4ed..62a3c8a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -89,10 +89,15 @@ public class InvSubWarehouseController { // 查询总库信息 InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); //查询仓库信息 - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); - filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode()); - filterInvWarehouseRequest.setCode(null); + if(invSubWarehouseEntity!=null){ + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); + filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); + filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode()); + filterInvWarehouseRequest.setCode(null); + }else { + return ResultVOUtils.error(999,"分库编号为空！"); + } + } else { //允许调拨 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java index e2420a7..c4bb460 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java @@ -55,6 +55,14 @@ public class SupCertSetController { if (supCertSetEntity == null) { supCertSetEntity = new SupCertSetEntity(); } + //判断名字存在就返回 + FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); + filterCertSetsRequest.setType(supCertSetEntity.getType()); + filterCertSetsRequest.setName(supCertSetEntity.getName()); + List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); + if(supCertEntityList.size()>0){ + return ResultVOUtils.error(999,"该证书名称已存在！"); + } supCertSetEntity.setUpdateTime(new Date()); if (supCertSetEntity.getType() == 3) { @@ -76,6 +84,15 @@ public class SupCertSetController { String flbm = supCertSetEntity.getFlbmList().stream().collect(Collectors.joining(",")); supCertSetEntity.setFlbm(flbm); } + //判断名字存在就返回 + FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); + filterCertSetsRequest.setType(supCertSetEntity.getType()); + filterCertSetsRequest.setName(supCertSetEntity.getName()); + List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); + if(supCertEntityList.size()>0){ + return ResultVOUtils.error(999,"该证书名称已存在！"); + } + boolean b = supCertSetService.updateCertSet(supCertSetEntity); return ResultVOUtils.success("修改成功"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java index 35a4542..0959b52 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java @@ -222,12 +222,12 @@ public class SupProductController { while (iterable.hasNext()) { SupCertSetEntity supCertSetEntity = iterable.next(); - if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 + if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx())) || (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb())) - || (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode()))) + || supCertSetEntity.getFlbm()!=null && (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode()))) ) { for (SupCertEntity supCertEntity : supCertEntityList) { if (supCertEntity.getName().equals(supCertSetEntity.getName())) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java index 1ff252f..f8326a3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java @@ -100,5 +100,8 @@ public class PurApplyRequest extends ListPageRequest { private String targetSubInv; private String targetBillType; + private String startDate; + private String endDate; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurPlanRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurPlanRequest.java index 238f8af..5c77c85 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurPlanRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurPlanRequest.java @@ -92,5 +92,9 @@ public class PurPlanRequest extends ListPageRequest { */ private Date createTime; + private String startDate; + private String endDate; + + } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index f75247b..23bc0f7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -77,11 +77,7 @@ AND basic_bustype_local.spUse =#{spUse} - - - auditStatus = #{auditStatus,jdbcType=VARCHAR} - - + group by basic_bussiness_type.action diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 1a6101b..fcb5b36 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -16,7 +16,12 @@ AND billNo = #{billNo} - + + = #{startDate}]]> + + + + and pur_apply.status = #{status} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index db3ea80..f7d5405 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -17,7 +17,12 @@ AND billNo = #{billNo} - + + = #{startDate}]]> + + + + and pur_plan.status = #{status}