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

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

Browse Source
purchase
anthonyywj2 3 years ago
parent cff8e2ce24
commit 77297f5d0f
8 changed files with 89 additions and 9 deletions
Show Stats Download Patch File Download Diff File

3
api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java
Unescape Escape View File

@ -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, "当前暂无更新数据需要同步");
}

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

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

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

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

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

@ -10,6 +10,9 @@ public interface InvBusUserService {
List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
List<InvBusUserEntity> selectByUnion(String userId, String subInvCode);
boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity);
boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity);

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

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

14
api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
Unescape Escape View File

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

14
api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java
Unescape Escape View File

@ -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<InvSubWarehouseEntity> mInvSubWarehouseEntities = new ArrayList<>();
List<WarehouseBussinessTypeEntity> mWarehouseBussinessTypeEntities = new ArrayList<>();
List<WarehouseUserEntity> mWarehouseUserEntities = new ArrayList<>();
List<InvBusUserEntity> mInvBusUserEntities = new ArrayList<>();
for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode());
if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
@ -118,6 +123,15 @@ public class UpBasicService {
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);
}
}
syncDataResponse.setInvBusUserEntities(mInvBusUserEntities);
}
}
}

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