UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户关联单据类型bug，以及同步问题，部门同步问题

Browse Source
zhairh
anthonyywj2 3 years ago
parent e5a9fddd61
commit aa96e0be18
8 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File

5
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java
Unescape Escape View File

@ -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";
}

14
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java
Unescape Escape View File

@ -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<InvSubWarehouseEntity> mInvSubWarehouseEntities = new ArrayList<>();
List<WarehouseBussinessTypeEntity> mWarehouseBussinessTypeEntities = new ArrayList<>();
List<InvBusUserEntity> mInvBusUserEntities = new ArrayList<>();
List<WarehouseUserEntity> mWarehouseUserEntities = new ArrayList<>();
for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode());
@ -148,6 +153,14 @@ public class SpsSyncDownloadService {
filterInvUserRequest.setCode(invSubWarehouseEntity.getCode());
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
mWarehouseUserEntities.addAll(warehouseUserEntities);
if (CollUtil.isNotEmpty(warehouseUserEntities)) {
for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities) {
List<InvBusUserEntity> 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);
}
}

18
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java
Unescape Escape View File

@ -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 {

22
api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvBusUserController.java
Unescape Escape View File

@ -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);
}
}

20
api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java
Unescape Escape View File

@ -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<InvWarehouseEntity> invWarehouseEntities;
List<UdiInfoEntity> udiInfoEntities;
List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
List<ThrInvWarehouseEntity> thrInvWarehouseEntities;
List<ThrSubInvWarehouseEntity> thrSubInvWarehouseEntities;
@ -29,13 +30,22 @@ public class SpsSyncDataResponse {
List<ThrProductsEntity> thrProductsEntities;
List<ThrOrderDetailEntity> thrOrderDetailEntities;
List<ThrOrderEntity> thrOrderEntities;
//耗材字典相关
List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
List<UdiRelevanceEntity> udiRelevanceEntities;
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
List<WarehouseUserEntity> warehouseUserEntities;
List<InvSubWarehouseEntity> invSubWarehouseEntities;
List<UdiInfoEntity> udiInfoEntities;
//用户信息
List<AuthAdmin> authAdminList;
List<DeptEntity> deptEntityList;
//仓库相关
List<InvWarehouseEntity> invWarehouseEntities;
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
List<WarehouseUserEntity> warehouseUserEntities;
List<InvSubWarehouseEntity> invSubWarehouseEntities;
List<InvBusUserEntity> invBusUserEntities;
}

5
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java
Unescape Escape View File

@ -11,12 +11,15 @@ public interface InvBusUserService {
List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
List<InvBusUserEntity> 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);
}

17
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java
Unescape Escape View File

@ -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<InvBusUserEntity> 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);
}
}

3
api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml
Unescape Escape View File

@ -11,6 +11,9 @@
<if test="name != null and '' != name">
AND `name` LIKE CONCAT('%',#{name},'%')
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if>
</where>
</select>

Write Preview
Loading…
Cancel
Save