From 77297f5d0f1287159841f77c0ee556ed43348e0a Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 6 Aug 2022 11:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=B3=E8=81=94=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8Bbug=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncExportStatusController.java | 3 ++- .../inventory/InvBusUserController.java | 24 +++++++++++++++++-- .../admin/res/basic/SpsSyncDataResponse.java | 20 ++++++++++++---- .../service/inventory/InvBusUserService.java | 3 +++ .../inventory/impl/InvBusUserServiceImpl.java | 17 +++++++++++++ .../glxp/api/admin/thread/DlBasicService.java | 14 ++++++++++- .../glxp/api/admin/thread/UpBasicService.java | 14 +++++++++++ .../resources/mybatis/mapper/auth/DeptDao.xml | 3 +++ 8 files changed, 89 insertions(+), 9 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java index f8046dfe..a24eaa2f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java @@ -166,7 +166,8 @@ public class SpsSyncExportStatusController { && CollUtil.isEmpty(syncDataResponse.getThrOrderEntities()) && CollUtil.isEmpty(syncDataResponse.getThrOrderDetailEntities()) && CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities()) - && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities())) { + && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities()) + && CollUtil.isEmpty(syncDataResponse.getAuthAdminList())) { //数据不记录日志 return ResultVOUtils.error(500, "当前暂无更新数据需要同步"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java index 3c6973ba..39e11fce 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java @@ -4,11 +4,15 @@ import cn.hutool.core.collection.CollUtil; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; +import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; import com.glxp.api.admin.req.inventory.UpdateRelBusRequset; import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; import com.glxp.api.admin.service.inventory.InvBusUserService; +import com.glxp.api.admin.service.inventory.InvSubWarehouseService; +import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -20,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.Date; import java.util.List; @RestController @@ -28,7 +33,10 @@ public class InvBusUserController { @Resource InvBusUserService invBusUserService; - + @Resource + InvSubWarehouseService invSubWarehouseService; + @Resource + InvWarehouseService invWarehouseService; @Resource WarehouseBussinessTypeService warehouseBussinessTypeService; @@ -66,6 +74,11 @@ public class InvBusUserController { invBusUserService.insertInvBusUser(invBusUserEntity); }); + + InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); + invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); + updateInvTime(invBusUserEntity); + } return ResultVOUtils.success("修改成功！"); } @@ -89,7 +102,7 @@ public class InvBusUserController { } boolean b = invBusUserService.insertInvBusUser(invBusUserEntity); - + updateInvTime(invBusUserEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } @@ -108,6 +121,7 @@ public class InvBusUserController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } boolean b = invBusUserService.updateInvBusUser(invBusUserEntity); + updateInvTime(invBusUserEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } @@ -128,5 +142,11 @@ public class InvBusUserController { return ResultVOUtils.success(); } + public void updateInvTime(InvBusUserEntity invBusUserEntity) { + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(invBusUserEntity.getSubInvCode()); + InvWarehouseEntity pEntity = invWarehouseService.selectByCode(invSubWarehouseEntity.getParentId()); + pEntity.setUpdateTime(new Date()); + invWarehouseService.updateInvWarehouse(pEntity); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java index a50fd89c..9e199b07 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java @@ -8,6 +8,7 @@ import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; +import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.thrsys.*; @@ -20,8 +21,6 @@ public class SpsSyncDataResponse { //同步任务ID private String taskId; - List invWarehouseEntities; - List udiInfoEntities; List basicUnitMaintainEntities; List thrInvWarehouseEntities; List thrSubInvWarehouseEntities; @@ -29,11 +28,22 @@ public class SpsSyncDataResponse { List thrProductsEntities; List thrOrderDetailEntities; List thrOrderEntities; + + //耗材字典相关 List companyProductRelevanceEntities; List udiRelevanceEntities; - List invSubWarehouseEntities; - List warehouseBussinessTypeEntities; - List warehouseUserEntities; + List udiInfoEntities; + + //用户信息 List authAdminList; List deptEntityList; + + + //仓库相关 + List invWarehouseEntities; + List warehouseBussinessTypeEntities; + List warehouseUserEntities; + List invSubWarehouseEntities; + List invBusUserEntities; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java index 3c32733e..ed073fb0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvBusUserService.java @@ -10,6 +10,9 @@ public interface InvBusUserService { List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + List selectByUnion(String userId, String subInvCode); + + boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java index f1d2d148..ea9104da 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvBusUserServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.service.inventory.impl; +import cn.hutool.core.util.StrUtil; import com.glxp.api.admin.dao.inventory.InvBusUserDao; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest; @@ -25,6 +26,19 @@ public class InvBusUserServiceImpl implements InvBusUserService { return invBusUserDao.filterInvBusUser(filterInvBusUserRequest); } + @Override + public List selectByUnion(String userId, String subInvCode) { + + if (StrUtil.isEmpty(userId) || StrUtil.isEmpty(subInvCode)) { + return Collections.emptyList(); + } + + FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); + filterInvBusUserRequest.setUserId(userId); + filterInvBusUserRequest.setSubInvCode(subInvCode); + return invBusUserDao.filterInvBusUser(filterInvBusUserRequest); + } + @Override public boolean insertInvBusUser(InvBusUserEntity invBusUserEntity) { return invBusUserDao.insertInvBusUser(invBusUserEntity); @@ -42,6 +56,9 @@ public class InvBusUserServiceImpl implements InvBusUserService { @Override public boolean deleteByUnion(String userId, String subInvCode) { + if (StrUtil.isEmpty(userId) || StrUtil.isEmpty(subInvCode)) { + return false; + } return invBusUserDao.deleteByUnion(userId, subInvCode); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 990cca2a..74f87136 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -24,6 +24,7 @@ import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; +import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.thrsys.*; @@ -40,6 +41,7 @@ import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.EntrustReceService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.service.inventory.InvBusUserService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService; @@ -102,6 +104,8 @@ public class DlBasicService { private BussinessTypeService bussinessTypeService; @Resource private StockOrderRemakDao stockOrderRemakDao; + @Resource + private InvBusUserService invBusUserService; private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class); @@ -167,11 +171,13 @@ public class DlBasicService { if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) { warehouseUserDao.insert(warehouseUserEntity); + invBusUserService.deleteByUnion(warehouseUserEntity.getUserid() + "", warehouseUserEntity.getCode()); + } remark.append("仓库用户：").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n"); } - //仓库单据类型表 + //分库单据类型表 if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) { for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) { warehouseBussinessTypeDao.insert(warehouseUserEntity); @@ -179,6 +185,12 @@ public class DlBasicService { remark.append("仓库单据：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n"); } + //用户对应单据类型 + if (CollUtil.isNotEmpty(syncDataResponse.getInvBusUserEntities())) { + for (InvBusUserEntity invBusUserEntity : syncDataResponse.getInvBusUserEntities()) { + invBusUserService.insertInvBusUser(invBusUserEntity); + } + } //关联表导入 if (CollUtil.isNotEmpty(syncDataResponse.getUdiRelevanceEntities())) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java index 626afc44..f16c0f5c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java @@ -11,6 +11,7 @@ import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; import com.glxp.api.admin.entity.info.SyncDataSetEntity; import com.glxp.api.admin.entity.inout.*; +import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.thrsys.*; @@ -33,6 +34,7 @@ import com.glxp.api.admin.service.basic.*; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import com.glxp.api.admin.service.info.SyncDataSetService; import com.glxp.api.admin.service.inout.*; +import com.glxp.api.admin.service.inventory.InvBusUserService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.thrsys.*; @@ -82,6 +84,8 @@ public class UpBasicService { WarehouseBussinessTypeService warehouseBussinessTypeService; @Resource WarehouseUserService warehouseUserService; + @Resource + InvBusUserService invBusUserService; public SpsSyncDataResponse upAllData(SpsSyncDataRequest spsSyncDataRequest) { SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); @@ -103,6 +107,7 @@ public class UpBasicService { List mInvSubWarehouseEntities = new ArrayList<>(); List mWarehouseBussinessTypeEntities = new ArrayList<>(); List mWarehouseUserEntities = new ArrayList<>(); + List mInvBusUserEntities = new ArrayList<>(); for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { List invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode()); if (CollUtil.isNotEmpty(invSubWarehouseEntities)) { @@ -118,6 +123,15 @@ public class UpBasicService { filterInvUserRequest.setCode(invSubWarehouseEntity.getCode()); List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); mWarehouseUserEntities.addAll(warehouseUserEntities); + + if (CollUtil.isNotEmpty(warehouseUserEntities)) { + for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities) { + List invBusUserEntities = invBusUserService.selectByUnion(warehouseUserEntity.getUserid() + "", invSubWarehouseEntity.getCode()); + mInvBusUserEntities.addAll(invBusUserEntities); + } + } + + syncDataResponse.setInvBusUserEntities(mInvBusUserEntities); } } } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 2a679e66..88e9e8aa 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -11,6 +11,9 @@ AND `name` LIKE CONCAT('%',#{name},'%') + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> +