diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index 603f013..6e0a69b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -37,7 +37,10 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(baseResponse.getData().getInvSubWarehouseEntities())) logs = logs + "分库信息:" + baseResponse.getData().getInvSubWarehouseEntities().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getWarehouseUserEntities())) { - logs = logs + "仓库用户信息:" + baseResponse.getData().getWarehouseUserEntities().size() + "条\n"; + logs = logs + "分库用户信息:" + baseResponse.getData().getWarehouseUserEntities().size() + "条\n"; + } + if(CollUtil.isNotEmpty(baseResponse.getData().getWarehouseBussinessTypeEntities())){ + logs = logs + "分库单据类型:" + baseResponse.getData().getWarehouseBussinessTypeEntities().size() + "条\n"; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index 57887ec..58ede26 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.auth.DeptEntity; import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.param.SyncDataBustypeEntity; @@ -35,6 +36,7 @@ import com.glxp.sale.admin.service.auth.DeptService; import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.inout.*; +import com.glxp.sale.admin.service.inventory.InvBusUserService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SyncDataSetService; @@ -89,6 +91,8 @@ public class SpsSyncDownloadService { WarehouseUserService warehouseUserService; @Resource AuthAdminService authAdminService; + @Resource + InvBusUserService invBusUserService; @Resource DeptService deptService; @@ -132,6 +136,7 @@ public class SpsSyncDownloadService { List mInvSubWarehouseEntities = new ArrayList<>(); List mWarehouseBussinessTypeEntities = new ArrayList<>(); + List mInvBusUserEntities = new ArrayList<>(); List mWarehouseUserEntities = new ArrayList<>(); for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { List invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode()); @@ -148,6 +153,14 @@ public class SpsSyncDownloadService { 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); + } + } } } } @@ -155,6 +168,7 @@ public class SpsSyncDownloadService { syncDataResponse.setInvSubWarehouseEntities(mInvSubWarehouseEntities); syncDataResponse.setWarehouseUserEntities(mWarehouseUserEntities); syncDataResponse.setWarehouseBussinessTypeEntities(mWarehouseBussinessTypeEntities); + syncDataResponse.setInvBusUserEntities(mInvBusUserEntities); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index 7068c74..6e3cdbd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -18,6 +18,7 @@ import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; +import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.*; @@ -28,6 +29,7 @@ import com.glxp.sale.admin.service.basic.BasicDownloadService; import com.glxp.sale.admin.service.basic.BussinessChangeTypeService; import com.glxp.sale.admin.service.basic.EntrustReceService; import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.service.inventory.InvBusUserService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SystemParamConfigService; @@ -75,11 +77,12 @@ public class SpsSyncUploadController { @Resource private BasicDownloadService basicDownloadService; @Resource - private SystemParamConfigService systemParamConfigService; - @Resource InvSubWarehouseService invSubWarehouseService; @Resource ThrSubInvWarehouseService thrSubInvWarehouseService; + @Resource + InvBusUserService invBusUserService; + @PostMapping("sps/sync/basic/upload") public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) { @@ -166,6 +169,7 @@ public class SpsSyncUploadController { 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"); } @@ -174,12 +178,20 @@ public class SpsSyncUploadController { if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) { for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) { warehouseBussinessTypeDao.insert(warehouseUserEntity); - } + } 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())) { try { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java index 3b45969..1515126 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java @@ -4,11 +4,15 @@ import cn.hutool.core.collection.CollUtil; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; +import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; import com.glxp.sale.admin.req.inventory.UpdateRelBusRequset; import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; import com.glxp.sale.admin.service.inventory.InvBusUserService; +import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.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 @@ -65,8 +70,11 @@ public class InvBusUserController { invBusUserEntity.setScAction(warehouseBussinessTypeEntity.getAction()); invBusUserService.insertInvBusUser(invBusUserEntity); }); - } + + InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); + invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); + updateInvTime(invBusUserEntity); return ResultVOUtils.success("修改成功!"); } @@ -89,6 +97,7 @@ public class InvBusUserController { } boolean b = invBusUserService.insertInvBusUser(invBusUserEntity); + updateInvTime(invBusUserEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -108,6 +117,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 +138,15 @@ public class InvBusUserController { return ResultVOUtils.success(); } + @Resource + InvSubWarehouseService invSubWarehouseService; + @Resource + InvWarehouseService invWarehouseService; + 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/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index 05ebf91..799dba9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java @@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; +import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.*; @@ -20,8 +21,8 @@ public class SpsSyncDataResponse { //同步任务ID private String taskId; - List invWarehouseEntities; - List udiInfoEntities; + + List basicUnitMaintainEntities; List thrInvWarehouseEntities; List thrSubInvWarehouseEntities; @@ -29,13 +30,22 @@ public class SpsSyncDataResponse { List thrProductsEntities; List thrOrderDetailEntities; List thrOrderEntities; + + //耗材字典相关 List companyProductRelevanceEntities; List udiRelevanceEntities; - List warehouseBussinessTypeEntities; - List warehouseUserEntities; - List invSubWarehouseEntities; + 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/sale/admin/service/inventory/InvBusUserService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java index 2da8e5d..3c6d640 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java @@ -11,12 +11,15 @@ public interface InvBusUserService { List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + List selectByUnion(String userId, String subInvCode); + + boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity); boolean deleteById(String id); - boolean deleteByUnion(String userId,String subInvCode); + boolean deleteByUnion(String userId, String subInvCode); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java index bff7d17..bd72645 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.service.inventory.impl; +import cn.hutool.core.util.StrUtil; import com.glxp.sale.admin.dao.inventory.InvBusUserDao; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.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/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml index b13ee5f..4bf8f3c 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') ]]> +