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

同步数据修改为雪花ID

Browse Source
master
anthonywj 2 years ago
parent 528585b467
commit 963406dd91
50 changed files with 186 additions and 122 deletions

2
pom.xml
Unescape Escape View File

@ -220,7 +220,7 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.9</version>
<version>5.8.18</version>
</dependency>
<dependency>
<groupId>com.belerweb</groupId>

2
src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
Unescape Escape View File

@ -215,7 +215,7 @@ public class InvWarehouseController extends BaseController {
updateEntity.setId(pEntity.getId());
updateEntity.setUpdateTime(new Date());
deptService.updateInvWarehouse(updateEntity);
invWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
invWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId());
invWarehouseEntity.setUpdateTime(new Date());
boolean b = invWarehouseService.insertInvSubWarehouse(invWarehouseEntity);
if (!b) {

2
src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.basic;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -149,6 +150,7 @@ public class BasicBussinessTypeController extends BaseController {
bussinessTypeSaveRequest.setAction("SC" + CustomUtil.getId());
BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity();
BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity);
basicBussinessTypeEntity.setId(IdUtil.getSnowflakeNextId());
basicBussinessTypeService.insertBussinessType(basicBussinessTypeEntity);
} else {
ResultVOUtils.error(999, "参数错误");

9
src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic;
import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
@ -126,7 +127,8 @@ public class BasicCorpController {
basicUnitMaintainEntity.setErpId(CustomUtil.getId());
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
basicUnitMaintainEntity.setUpdateTime(new Date());
boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = basicUnitMaintainService.insert(basicUnitMaintainEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
@ -244,7 +246,8 @@ public class BasicCorpController {
basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP);
basicUnitMaintainEntity.setUpdateTime(new Date());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());
basicUnitMaintainService.insert(basicUnitMaintainEntity);
}
}
return ResultVOUtils.success("选入成功");
@ -281,7 +284,7 @@ public class BasicCorpController {
}
BasicErpUnitsResponse basicErpUnitsResponse = combineRequest.getBasicErpUnitsResponse();
BasicCorpEntity basicCorpEntity = new BasicCorpEntity();
basicCorpEntity.setId(Integer.parseInt(combineRequest.getKey()));
basicCorpEntity.setId(Long.parseLong(combineRequest.getKey()));
if (combineRequest.getThirdSys() != null) {
if ("thirdId".equals(combineRequest.getThirdSys())) {
basicCorpEntity.setThirdId(basicErpUnitsResponse.getId());

2
src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.controller.inout;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
@ -101,6 +102,7 @@ public class IoCodeLostController extends BaseController {
if (codeLostEntity != null) {
codeLostService.update(insertEntity);
} else {
insertEntity.setId(IdUtil.getSnowflakeNextId());
codeLostService.insert(insertEntity);
}
return ResultVOUtils.success("修改成功！");

4
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;
import cn.hutool.Hutool;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
@ -594,7 +595,8 @@ public class IoCodeTempController extends BaseController {
basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
basicCorpEntity.setName(addOrderRequest.getFromCorp());
addOrderRequest.setFromCorp(basicCorpEntity.getName());
basicUnitMaintainService.insertBasicUnitMaintain(basicCorpEntity);
basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
basicUnitMaintainService.insert(basicCorpEntity);
}
}

101
src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.inout;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
@ -49,71 +50,73 @@ public class ioCodeRelController {
//判断码有没有重复
List<IoCodeRelEntity> list=ioCodeRelServicec.selectIoCodeRelByCode("",code);
if(list.size()>0){
return ResultVOUtils.error(999,"此码已做关联！");
List<IoCodeRelEntity> list = ioCodeRelServicec.selectIoCodeRelByCode("", code);
if (list.size() > 0) {
return ResultVOUtils.error(999, "此码已做关联！");
}
if(StrUtil.isNotEmpty(code)){
UdiEntity udiEntity=FilterUdiUtils.getGS1Udi(code);
UdiProductEntity udiProductEntity=udiProductService.findByNameCode(udiEntity.getUdi());
if(udiProductEntity.getPackLevel()!=null){
if(Integer.valueOf(udiProductEntity.getPackLevel())>1){
return ResultVOUtils.success(udiProductEntity.getBhxjcpbm());
if (StrUtil.isNotEmpty(code)) {
UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(code);
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi());
if (udiProductEntity.getPackLevel() != null) {
if (Integer.valueOf(udiProductEntity.getPackLevel()) > 1) {
return ResultVOUtils.success(udiProductEntity.getBhxjcpbm());
}
}
}
return ResultVOUtils.error(999,"扫码错误！");
return ResultVOUtils.error(999, "扫码错误！");
}
@GetMapping("/udi/ioCode/Rel/checkLowProduct")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse checkLowProduct(String upCode,String lowCode) {
public BaseResponse checkLowProduct(String upCode, String lowCode) {
UdiProductEntity udiProductEntity=new UdiProductEntity();
UdiProductEntity udiProductEntity = new UdiProductEntity();
//查询上级产品信息
if(StrUtil.isNotEmpty(upCode)){
UdiEntity udiEntity=FilterUdiUtils.getGS1Udi(upCode);
udiProductEntity=udiProductService.findByNameCode(udiEntity.getUdi());
if (StrUtil.isNotEmpty(upCode)) {
UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(upCode);
udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi());
}
//判断码有没有重复
List<IoCodeRelEntity> list=ioCodeRelServicec.selectIoCodeRelByCode(lowCode,upCode);
if(list.size()>0){
return ResultVOUtils.error(999,"此码已做关联！");
List<IoCodeRelEntity> list = ioCodeRelServicec.selectIoCodeRelByCode(lowCode, upCode);
if (list.size() > 0) {
return ResultVOUtils.error(999, "此码已做关联！");
}
//判断条数是否超出
Long count=ioCodeRelServicec.selectIoCodeRelCount(upCode);
if(count>=udiProductEntity.getBhxjsl()){
return ResultVOUtils.error(999,"数量超出！");
Long count = ioCodeRelServicec.selectIoCodeRelCount(upCode);
if (count >= udiProductEntity.getBhxjsl()) {
return ResultVOUtils.error(999, "数量超出！");
}
//查询下级产品信息
if(StrUtil.isNotEmpty(lowCode)){
UdiEntity udiEntity=FilterUdiUtils.getGS1Udi(lowCode);
UdiProductEntity udiProductEntity1=udiProductService.findByNameCode(udiEntity.getUdi());
if(udiProductEntity!=null){
if(udiProductEntity1.getNameCode().equals(udiProductEntity.getBhxjcpbm())){
IoCodeRelEntity ioCodeRelEntity=new IoCodeRelEntity();
ioCodeRelEntity.setCode(lowCode);
ioCodeRelEntity.setParentCode(upCode);
ioCodeRelEntity.setNameCode(udiProductEntity1.getNameCode());
ioCodeRelEntity.setDiType(udiProductEntity1.getDiType());
ioCodeRelEntity.setLevel(udiProductEntity1.getPackLevel());
ioCodeRelEntity.setProduceDate(udiProductEntity1.getProduceDate());
ioCodeRelEntity.setExpireDate(udiProductEntity1.getExpireDate());
ioCodeRelEntity.setSerialNo(udiProductEntity1.getSerialNo());
ioCodeRelEntity.setCreateTime(new Date());
ioCodeRelEntity.setUpdateTime(new Date());
ioCodeRelServicec.insert(ioCodeRelEntity);
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(999,"该条码不属于下级产品！");
}
}
if (StrUtil.isNotEmpty(lowCode)) {
UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(lowCode);
UdiProductEntity udiProductEntity1 = udiProductService.findByNameCode(udiEntity.getUdi());
if (udiProductEntity != null) {
if (udiProductEntity1.getNameCode().equals(udiProductEntity.getBhxjcpbm())) {
IoCodeRelEntity ioCodeRelEntity = new IoCodeRelEntity();
ioCodeRelEntity.setCode(lowCode);
ioCodeRelEntity.setParentCode(upCode);
ioCodeRelEntity.setNameCode(udiProductEntity1.getNameCode());
ioCodeRelEntity.setDiType(udiProductEntity1.getDiType());
ioCodeRelEntity.setLevel(udiProductEntity1.getPackLevel());
ioCodeRelEntity.setProduceDate(udiProductEntity1.getProduceDate());
ioCodeRelEntity.setExpireDate(udiProductEntity1.getExpireDate());
ioCodeRelEntity.setSerialNo(udiProductEntity1.getSerialNo());
ioCodeRelEntity.setCreateTime(new Date());
ioCodeRelEntity.setUpdateTime(new Date());
ioCodeRelEntity.setId(
IdUtil.getSnowflakeNextId());
ioCodeRelServicec.insert(ioCodeRelEntity);
return ResultVOUtils.success();
} else {
return ResultVOUtils.error(999, "该条码不属于下级产品！");
}
}
}
return ResultVOUtils.error(999,"");
return ResultVOUtils.error(999, "");
}
@GetMapping("/udi/ioCode/Rel/delectList")
@ -131,13 +134,13 @@ public class ioCodeRelController {
@GetMapping("/udi/ioCode/Rel/del")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse del(String code,String parentCode) {
public BaseResponse del(String code, String parentCode) {
int count=ioCodeRelServicec.delIoCodeRel(code,parentCode);
if(count>0){
int count = ioCodeRelServicec.delIoCodeRel(code, parentCode);
if (count > 0) {
return ResultVOUtils.success("删除成功");
}else{
return ResultVOUtils.error(999,"删除失败");
} else {
return ResultVOUtils.error(999, "删除失败");
}
}

5
src/main/java/com/glxp/api/controller/purchase/SupCertController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
@ -135,6 +136,7 @@ public class SupCertController {
supCertEntity.setStatus(0);
supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT);
supCertEntity.setUpdateTime(new Date());
supCertEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supCertService.insertCompanyCert(supCertEntity);
}
return ResultVOUtils.success("成功");
@ -173,6 +175,7 @@ public class SupCertController {
supCertEntity.setStatus(0);
supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT);
supCertEntity.setUpdateTime(new Date());
supCertEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supCertService.insertCompanyCert(supCertEntity);
}
return ResultVOUtils.success("成功");
@ -456,7 +459,7 @@ public class SupCertController {
if (StrUtil.isNotEmpty(filterSupCertRequest.getCustomerId()) && filterSupCertRequest.getType() != null) {
List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
List<Integer> idsList = supCertEntityList.stream().map(SupCertEntity::getId).distinct().collect(Collectors.toList());
List<Long> idsList = supCertEntityList.stream().map(SupCertEntity::getId).distinct().collect(Collectors.toList());
return ResultVOUtils.success(idsList);
}
return ResultVOUtils.error(999, "参数错误");

2
src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
@ -73,6 +74,7 @@ public class SupCertSetController {
supCertSetEntity.setFlbm(flbm);
}
}
supCertSetEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supCertSetService.insertCertSet(supCertSetEntity);
return ResultVOUtils.success("添加成功！");
}

3
src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
@ -180,7 +181,7 @@ public class SupManufacturerController {
supManufacturerEntity.setCreateTime(new Date());
supManufacturerEntity.setUpdateTime(new Date());
supManufacturerEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supManufacturerService.insertCompany(supManufacturerEntity);
if (b) {
return ResultVOUtils.success("添加成功");

2
src/main/java/com/glxp/api/controller/purchase/SupProductController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
@ -140,6 +141,7 @@ public class SupProductController {
}
supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date());
supProductEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = supProductService.insertRegistration(supProductEntity);
if (b) {
return ResultVOUtils.success("添加成功");

2
src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java
Unescape Escape View File

@ -99,7 +99,7 @@ public class ThrDeptController {
if (thrDeptEntity.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
String id = Integer.toString(thrDeptEntity.getId());
String id = Long.toString(thrDeptEntity.getId());
ThrDeptEntity thrDeptEntity1 = thrDeptService.selectById(id);
//查询该部门下的仓库
filterThrSubInvWarehouseRequest.setParentId(thrDeptEntity1.getCode());

2
src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
Unescape Escape View File

@ -81,7 +81,7 @@ public interface AuthAdminDao extends BaseMapperPlus<AuthAdminDao, AuthAdmin, Au
*/
List<AuthAdmin> selectHospitalUser();
List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds, @Param("deptId") Integer deptId);
List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds, @Param("deptId") Long deptId);
List<AuthAdmin> selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest);

6
src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java
Unescape Escape View File

@ -25,7 +25,7 @@ public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, Wareh
int insertSelective(WarehouseUserEntity record);
WarehouseUserEntity selectByPrimaryKey(Integer id);
WarehouseUserEntity selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(WarehouseUserEntity record);
@ -61,7 +61,7 @@ public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, Wareh
* @param id
* @param isDirector
*/
void updateDirectorById(@Param("id") Integer id, @Param("isDirector") int isDirector);
void updateDirectorById(@Param("id") Long id, @Param("isDirector") int isDirector);
/**
* 根据分仓编码统计绑定的用户数
@ -70,4 +70,4 @@ public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, Wareh
* @return
*/
Integer countByCode(@Param("code") String code);
}
}

4
src/main/java/com/glxp/api/entity/auth/DeptEntity.java
Unescape Escape View File

@ -11,8 +11,8 @@ import java.util.Date;
@Data
@TableName(value = "auth_dept")
public class DeptEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
@TableField(value = "pid")
private Integer pid;
@TableField(value = "code;")

4
src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java
Unescape Escape View File

@ -12,8 +12,8 @@ import java.util.Date;
@Data
@TableName(value = "auth_user_bustype")
public class InvBusUserEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
@TableField(value = "userId")
private String userId;
@TableField(value = "subInvCode")

4
src/main/java/com/glxp/api/entity/auth/InvSpace.java
Unescape Escape View File

@ -10,7 +10,7 @@ import java.util.Date;
@Data
public class InvSpace {
private Integer id;
private Long id;
/**
* 货位码
@ -66,4 +66,4 @@ public class InvSpace {
* 备注
*/
private String remark;
}
}

5
src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java
Unescape Escape View File

@ -13,8 +13,9 @@ import java.util.Date;
public class InvWarehouseEntity {
@TableId(value = "id", type = IdType.AUTO)
private String id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 仓库编码

2
src/main/java/com/glxp/api/entity/auth/WarehouseBussinessTypeEntity.java
Unescape Escape View File

@ -18,7 +18,7 @@ public class WarehouseBussinessTypeEntity {
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Long id;
/**
* 仓位码

2
src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java
Unescape Escape View File

@ -15,7 +15,7 @@ public class WarehouseUserEntity {
/**
* id
*/
private Integer id;
private Long id;
/**
* 仓位码

4
src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java
Unescape Escape View File

@ -18,8 +18,8 @@ public class BasicBusTypeChangeEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 原单据类型代码

2
src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java
Unescape Escape View File

@ -19,7 +19,7 @@ public class BasicBusTypePreEntity {
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Long id;
/**
* 说明

4
src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
Unescape Escape View File

@ -18,8 +18,8 @@ public class BasicBussinessTypeEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 主类型（出库，入库）

4
src/main/java/com/glxp/api/entity/basic/BasicCorpEntity.java
Unescape Escape View File

@ -12,7 +12,7 @@ import java.util.Date;
@TableName(value = "basic_corp")
public class BasicCorpEntity {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
private Long id;
/**
* 往来单位编码
@ -141,4 +141,4 @@ public class BasicCorpEntity {
private String remark;
}
}

8
src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java
Unescape Escape View File

@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import lombok.Data;
@Data
@TableName(value = "basic_hosp_type")
public class BasicHospTypeEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 院内编码
@ -78,4 +80,4 @@ public class BasicHospTypeEntity {
public static final String COL_CREATEUSER = "createUser";
public static final String COL_UPDATEUSER = "updateUser";
}
}

2
src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
Unescape Escape View File

@ -12,7 +12,7 @@ import java.util.Date;
@TableName(value = "basic_products")
public class BasicProductsEntity {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
private Long id;
/**
* UUID

2
src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java
Unescape Escape View File

@ -14,7 +14,7 @@ import lombok.Data;
@TableName(value = "company_product_relevance")
public class CompanyProductRelevanceEntity {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
private Long id;
/**
* 客户ID

4
src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java
Unescape Escape View File

@ -13,8 +13,8 @@ import java.util.Date;
@TableName(value = "basic_entrust_accept")
public class EntrustReceEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 当前单据类型

2
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -8,7 +8,7 @@ import lombok.Data;
@Data
public class UdiProductEntity {
private Integer id;
private Long id;
private String uuid;
private String originUuid;
private String nameCode;

4
src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java
Unescape Escape View File

@ -16,8 +16,8 @@ import lombok.Data;
@Data
@TableName(value = "io_code_lost")
public class IoCodeLostEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* UDI码

5
src/main/java/com/glxp/api/entity/inout/IoCodeRelEntity.java
Unescape Escape View File

@ -14,8 +14,9 @@ import java.util.Date;
@Data
@TableName(value = "io_code_rel")
public class IoCodeRelEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* UDI码

6
src/main/java/com/glxp/api/entity/purchase/SupCertEntity.java
Unescape Escape View File

@ -11,7 +11,7 @@ import java.util.Date;
/**
* <p>
*
*
* </p>
*
* @author 作者
@ -21,8 +21,8 @@ import java.util.Date;
@Data
public class SupCertEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 配送企业ID外键

4
src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java
Unescape Escape View File

@ -23,8 +23,8 @@ import java.util.List;
@Data
public class SupCertSetEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 证书名称

4
src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java
Unescape Escape View File

@ -11,7 +11,7 @@ import java.util.Date;
/**
* <p>
*
*
* </p>
*
* @author 作者
@ -21,7 +21,7 @@ import java.util.Date;
@Data
public class SupManufacturerEntity{
@TableId(value = "id", type = IdType.AUTO)
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**

2
src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java
Unescape Escape View File

@ -20,7 +20,7 @@ import java.util.Date;
@Data
public class SupProductEntity {
@TableId(value = "id", type = IdType.AUTO)
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**

3
src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java
Unescape Escape View File

@ -21,8 +21,7 @@ public class ThrBusTypeOriginEntity {
* id
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Long id;
/**
* 单据类型名称
*/

4
src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java
Unescape Escape View File

@ -10,7 +10,7 @@ import java.util.Date;
/**
* <p>
*
*
* </p>
* @since 2023-01-12
*/
@ -19,7 +19,7 @@ import java.util.Date;
public class ThrCorpEntity{
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Long id;
@TableField("unitId")
private String unitId;

2
src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java
Unescape Escape View File

@ -12,7 +12,7 @@ import java.util.Date;
@TableName("thr_dept")
public class ThrDeptEntity {
private Integer id;
private Long id;
private Integer pid;
private String code;
private String name;

4
src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java
Unescape Escape View File

@ -10,7 +10,7 @@ import java.util.Date;
/**
* <p>
*
*
* </p>
*
* @author ${author}
@ -21,7 +21,7 @@ import java.util.Date;
public class ThrProductsEntity{
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private Long id;
/**
* 产品编码

2
src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java
Unescape Escape View File

@ -10,5 +10,5 @@ public class FilterNoSelectUserRequest extends ListPageRequest {
List<Long> userIds;
private Integer deptId;
private Long deptId;
}

14
src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java
Unescape Escape View File

@ -7,12 +7,12 @@ import lombok.Data;
import java.util.List;
@Data
public class BasicHospTypeRequest{
public class BasicHospTypeRequest {
private Integer id;
private String code;
private String parentCode;
private String name;
private String remark;
List<String> ids;
private Long id;
private String code;
private String parentCode;
private String name;
private String remark;
List<String> ids;
}

2
src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java
Unescape Escape View File

@ -8,7 +8,7 @@ import lombok.Data;
public class FilterCertSetsRequest extends ListPageRequest {
private String name;
private Integer id;
private Long id;
private Integer type;
private Integer need;

2
src/main/java/com/glxp/api/service/auth/WarehouseUserService.java
Unescape Escape View File

@ -39,7 +39,7 @@ public interface WarehouseUserService {
*
* @param id
*/
void updateDirector(Integer id);
void updateDirector(Long id);
void updateDirector(WarehouseUserEntity warehouseUserEntity);

2
src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java
Unescape Escape View File

@ -81,7 +81,7 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
}
@Override
public void updateDirector(Integer id) {
public void updateDirector(Long id) {
if (null != id) {
WarehouseUserEntity warehouseUserEntity = warehouseUserDao.selectByPrimaryKey(id);
warehouseUserDao.updateDirector(warehouseUserEntity.getCode(), 0);

4
src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.basic.impl;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -67,7 +68,7 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, Basi
ew.ne("code",10000);
if(basicHospTypeFilterRequest.getType()!=null && basicHospTypeFilterRequest.getType()==1 && StrUtil.isNotEmpty(basicHospTypeFilterRequest.getCode())){
List<BasicHospTypeEntity> basicHospTypeEntityList=basicHospTypeDao.selectLowTypeAll(basicHospTypeFilterRequest.getCode());
List<Integer> ids=basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList());
List<Long> ids=basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList());
ew.notIn("id",ids);
}
List<BasicHospTypeEntity> data = basicHospTypeDao.selectList(ew);
@ -98,6 +99,7 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, Basi
ew.select("max(code) as code");
BasicHospTypeEntity code=basicHospTypeDao.selectOne(ew);
basicHospTypeEntity.setCode(Integer.valueOf(code.getCode())+1+"");
basicHospTypeEntity.setId(IdUtil.getSnowflakeNextId());
int count=basicHospTypeDao.insert(basicHospTypeEntity);
if(count==0){
falg=false;

2
src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java
Unescape Escape View File

@ -128,7 +128,7 @@ public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> i
@Override
public boolean insertCompanyCert(SupCertEntity supCertEntity) {
return supCertDao.insertCompanyCert(supCertEntity);
return supCertDao.insert(supCertEntity) > 0 ? true : false;
}
@Override

2
src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java
Unescape Escape View File

@ -41,7 +41,7 @@ public class SupCertSetServiceImpl extends ServiceImpl<SupCertSetDao, SupCertSet
@Override
public boolean insertCertSet(SupCertSetEntity supCertSetEntity) {
return supCertSetDao.insertCertSet(supCertSetEntity);
return supCertSetDao.insert(supCertSetEntity) > 0 ? true : false;
}
@Override

2
src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java
Unescape Escape View File

@ -68,7 +68,7 @@ public class SupManufacturerServiceImpl extends ServiceImpl<SupManufacturerDao,
@Override
public boolean insertCompany(SupManufacturerEntity companyEntity) {
return supManufacturerDao.insertCompany(companyEntity);
return supManufacturerDao.insert(companyEntity) > 0 ? true : false;
}
@Override

2
src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
Unescape Escape View File

@ -140,7 +140,7 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
@Override
public boolean insertRegistration(SupProductEntity companyEntity) {
return supProductDao.insertRegistration(companyEntity);
return supProductDao.insert(companyEntity) > 0 ? true : false;
}
@Override

39
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -301,3 +301,42 @@ CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes`
# 修改主键为LONG
CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_products', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('company_product_relevance', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_corp', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('sup_cert', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('sup_cert_set', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('sup_company', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('sup_manufacturer', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('sup_product', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('io_code_lost', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('io_code_rel', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_bustype_change', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);

Write Preview
Loading…
Cancel
Save