From 428ed71f4e5240c0fd17149b54b830788981b3dd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 21 Jun 2023 10:19:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E5=8D=95=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=AD=89=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/constant/ConstantStatus.java | 4 +- .../auth/InvWarehouseController.java | 57 ------------------- .../purchase/IoPurChangeService.java | 2 +- .../purchase/PurApplyController.java | 2 +- .../purchase/PurOrderReceiveController.java | 2 +- .../purchase/PurPlanController.java | 2 +- 6 files changed, 6 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index d60cc74b9..713edc2b6 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -194,8 +194,8 @@ public class ConstantStatus { //往来信息类型-单据 public static final int CORP_TYPE_INPUT = 1; //客户 public static final int CORP_TYPE_OUT = 2; //供应商 - public static final int CORP_TYPE_INNOR = 3; //内部科室等 - public static final int CORP_TYPE_SPECIAL = 4; //特俗往来 + public static final int CORP_TYPE_INNOR = 3; //内部科室等 + public static final int CORP_TYPE_SPECIAL = 4; //特殊往来 public static final int CORP_TYPE_DEPT = 4; //部门 diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 8404d3fcf..295e21a6d 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -201,67 +201,10 @@ public class InvWarehouseController extends BaseController { } - @AuthRuleAnnotation("") - @GetMapping("spms/sub/inv/warehouse/findByInv") - public BaseResponse findByInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { - -// if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { -// return ResultVOUtils.error(500, "用户或仓库不能未空！"); -// } - - AuthAdmin authAdmin = customerService.getUserBean(); - if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { - if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) { - if (authAdmin.getCustomerId() == 110) { - filterInvWarehouseRequest.setUserId(authAdmin.getId()); - } else { - filterInvWarehouseRequest.setSpUse(true); - } - } - } else { - if (filterInvWarehouseRequest.getFilter() != null && filterInvWarehouseRequest.getFilter() == 3) { - filterInvWarehouseRequest.setUserId(authAdmin.getId()); - } else { - //走这边表示单据选择的是往来单位里面调出调入的库 - //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); - if (systemParamConfigEntity.getParamValue().equals("0")) { - //不允许调拨 - // 查询总库信息 - InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - //查询仓库信息 - if (invWarehouseEntity != null) { - DeptEntity deptEntity = deptService.selectByCodeAll(invWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setSuperiorCode(deptEntity.getCode()); - filterInvWarehouseRequest.setSuperiorPcode(deptEntity.getPcode()); - filterInvWarehouseRequest.setCode(null); - } else { - return ResultVOUtils.error(999, "分库编号为空！"); - } - - - } else { - //允许调拨 - //查询总库信息 - InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - filterInvWarehouseRequest.setWarehouseCode(invWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setCode(null); - } - } - } - - List invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); - return ResultVOUtils.success(invSubWarehouseEntities); - } - @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filterSub") public BaseResponse filterSub(FilterInvWarehouseRequest filterInvWarehouseRequest) { -// if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { -// return ResultVOUtils.error(500, "用户或仓库不能未空！"); -// } - AuthAdmin authAdmin = customerService.getUserBean(); InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index 3c4e758a9..6dce4fff8 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -231,7 +231,7 @@ public class IoPurChangeService { purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); - purOrderEntity.setUpdateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); + purOrderEntity.setUpdateTime(new Date()); } else { purOrderEntity.setCreateTime(new Date()); purOrderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 140b32be1..922404986 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -268,7 +268,7 @@ public class PurApplyController { purOrderEntity.setCreateUser(purApplyEntity.getAuditUser()); purOrderEntity.setCreateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setUpdateUser(purApplyEntity.getAuditUser()); - purOrderEntity.setUpdateTime(timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); + purOrderEntity.setUpdateTime(new Date()); if (purOrderEntity.getStatus() == 3) { purOrderEntity.setAuditUser(""); purOrderEntity.setAuditTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index af5efd3af..5715c8050 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -360,7 +360,7 @@ public class PurOrderReceiveController extends BaseController { purOrderEntity.setCreateUser(purReceiveEntity.getAuditUser()); purOrderEntity.setCreateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setUpdateUser(purReceiveEntity.getAuditUser()); - purOrderEntity.setUpdateTime(timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); + purOrderEntity.setUpdateTime(new Date()); if (purOrderEntity.getStatus() == 3) { purOrderEntity.setAuditUser(""); purOrderEntity.setAuditTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index b497be27e..6dc421476 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -275,7 +275,7 @@ public class PurPlanController { purOrderEntity.setCreateUser(purPlanEntity.getAuditUser()); purOrderEntity.setCreateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser()); - purOrderEntity.setUpdateTime(timeProcess(purPlanEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); + purOrderEntity.setUpdateTime(new Date()); if (purOrderEntity.getStatus() == 3) { purOrderEntity.setAuditUser(""); purOrderEntity.setAuditTime(new Date());