diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index c4980feac..0b452d79c 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -246,7 +246,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) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index b9165de93..3391c2feb 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.basic; 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.Log; @@ -208,6 +209,7 @@ public class BasicBusTypePreController { InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getInvCode()); basicBusTypePreEntity.setDeptCode(invWarehouse.getParentId()); } + basicBusTypePreEntity.setId(IdUtil.getSnowflakeNextId()); basicBusTypePreService.insertBusChangeType(basicBusTypePreEntity); } else { ResultVOUtils.error(999, "参数错误"); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 92268c540..e524628f7 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -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; @@ -135,6 +136,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, "参数错误"); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index c9dd8147e..fdad7138e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -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.common.enums.ResultEnum; @@ -64,7 +65,7 @@ public class BasicCorpController { private ThrCorpService thrCorpService; @Resource private CompanyService companyService; -// @Resource + // @Resource // private OrderService orderService; @Resource private ErpBasicClient erpBasicClient; @@ -123,7 +124,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); } @@ -133,7 +135,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/update") - public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest,BindingResult bindingResult) { + public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -239,7 +241,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("选入成功"); @@ -275,7 +278,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()); @@ -346,7 +349,8 @@ public class BasicCorpController { basicUnitMaintainService.deleteById(id); return ResultVOUtils.success("删除成功"); } -// + + // // //查询ERP往来单位 // @AuthRuleAnnotation("") // @GetMapping("/udiwms/unitMaintain/filterErp") @@ -507,15 +511,15 @@ public class BasicCorpController { rMap.put("BUMThirdIdValue", systemParamConfigEntityBUMThirdId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMThirdId.getParamValue()) ? systemParamConfigEntityBUMThirdId.getParamValue() : "0"); - return ResultVOUtils.success(rMap); + return ResultVOUtils.success(rMap); } @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/getCorpList") public BaseResponse getCorpList() { - List getCorpList=basicUnitMaintainService.getCorpList(); - return ResultVOUtils.success(getCorpList); + List getCorpList = basicUnitMaintainService.getCorpList(); + return ResultVOUtils.success(getCorpList); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index 5f3c7682f..fd2e55dd6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -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("修改成功!"); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 4ef41b507..4996e3916 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.inout; import cn.hutool.Hutool; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.UUID; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -593,7 +594,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); } } diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java index a2af6fefc..2bf1ba6c5 100644 --- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java +++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java @@ -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,53 +50,53 @@ public class ioCodeRelController { //判断码有没有重复 - List list=ioCodeRelServicec.selectIoCodeRelByCode("",code); - if(list.size()>0){ - return ResultVOUtils.error(999,"此码已做关联!"); + List 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){ + 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 list=ioCodeRelServicec.selectIoCodeRelByCode(lowCode,upCode); - if(list.size()>0){ - return ResultVOUtils.error(999,"此码已做关联!"); + List 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(); + 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()); @@ -106,14 +107,15 @@ public class ioCodeRelController { 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.success(); + } else { + return ResultVOUtils.error(999, "该条码不属于下级产品!"); } } } - return ResultVOUtils.error(999,""); + return ResultVOUtils.error(999, ""); } @GetMapping("/udi/ioCode/Rel/delectList") @@ -131,13 +133,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, "删除失败"); } } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index c146736bb..0b963156e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -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; @@ -117,8 +118,8 @@ public class SupCertController { } } } - }else{ - if(postSelCertRequest.getProductIdFk()==null) { + } else { + if (postSelCertRequest.getProductIdFk() == null) { String errMsg = ""; ArrayList list = new ArrayList<>(); int i = postSelCertRequest.getSupCertSetEntities().size(); @@ -140,7 +141,7 @@ public class SupCertController { } } } - }else{ + } else { String errMsg = ""; ArrayList list = new ArrayList<>(); int i = postSelCertRequest.getSupCertSetEntities().size(); @@ -178,6 +179,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("成功"); @@ -203,6 +205,7 @@ public class SupCertController { supCertEntity.setCreateTime(new Date()); supCertEntity.setUpdateTime(new Date()); supCertEntity.setStatus(0); + supCertEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = supCertService.insertCompanyCert(supCertEntity); return ResultVOUtils.success("成功"); } @@ -265,15 +268,13 @@ public class SupCertController { BeanUtils.copyProperties(postSupCertRequest, supCertEntity); - if(postSupCertRequest.getVailDate() !=null && postSupCertRequest.getExpireDate() != null){ - if(postSupCertRequest.getVailDate().getTime()>postSupCertRequest.getExpireDate().getTime()){ - return ResultVOUtils.error(999,"生效期不能小于失效期!"); + if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) { + if (postSupCertRequest.getVailDate().getTime() > postSupCertRequest.getExpireDate().getTime()) { + return ResultVOUtils.error(999, "生效期不能小于失效期!"); } } - - if (postSupCertRequest.getRepeatUpload() == 1) { //已审核的重新提交 //1.修改对应的资质信息进入变更审核状态, @@ -419,7 +420,7 @@ public class SupCertController { if (StrUtil.isNotEmpty(filterSupCertRequest.getCustomerId()) && filterSupCertRequest.getType() != null) { List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); - List idsList = supCertEntityList.stream().map(SupCertEntity::getId).distinct().collect(Collectors.toList()); + List idsList = supCertEntityList.stream().map(SupCertEntity::getId).distinct().collect(Collectors.toList()); return ResultVOUtils.success(idsList); } return ResultVOUtils.error(999, "参数错误"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index 677d958a6..4a0c383aa 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -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; import com.glxp.api.annotation.Log; @@ -58,20 +59,21 @@ public class SupCertSetController { supCertSetEntity = new SupCertSetEntity(); } //判断名字存在就返回 - FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(supCertSetEntity.getType()); filterCertSetsRequest.setName(supCertSetEntity.getName()); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); - if(supCertEntityList.size()>0){ - return ResultVOUtils.error(999,"该证书名称已存在!"); + if (supCertEntityList.size() > 0) { + return ResultVOUtils.error(999, "该证书名称已存在!"); } supCertSetEntity.setUpdateTime(new Date()); - if(supCertSetEntity.getType()==3){ - if(supCertSetEntity.getFlbmList().size()>0){ + if (supCertSetEntity.getType() == 3) { + if (supCertSetEntity.getFlbmList().size() > 0) { String flbm = String.join(",", supCertSetEntity.getFlbmList()); supCertSetEntity.setFlbm(flbm); } } + supCertSetEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = supCertSetService.insertCertSet(supCertSetEntity); return ResultVOUtils.success("添加成功!"); } @@ -86,14 +88,14 @@ public class SupCertSetController { supCertSetEntity.setFlbm(flbm); } //判断名字存在就返回 - FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(supCertSetEntity.getType()); filterCertSetsRequest.setName(supCertSetEntity.getName()); filterCertSetsRequest.setId(supCertSetEntity.getId()); filterCertSetsRequest.setUpdateType(1); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); - if(supCertEntityList.size()!=0){ - return ResultVOUtils.error(999,"证书已存在!"); + if (supCertEntityList.size() != 0) { + return ResultVOUtils.error(999, "证书已存在!"); } boolean b = supCertSetService.updateCertSet(supCertSetEntity); return ResultVOUtils.success("修改成功"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 20127a48e..24c9851ab 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -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; @@ -178,7 +179,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("添加成功"); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index be7e3525d..acd248ad6 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -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; @@ -136,6 +137,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("添加成功"); @@ -150,27 +152,27 @@ public class SupProductController { public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk())); - SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(),selectProductBindRequest.getManufacturerId()); + SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId()); if (supProductEntity != null) { return ResultVOUtils.error(500, "该产品资质已存在,请勿重复添加!"); - }else{ - supProductEntity = new SupProductEntity(); - BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); - supProductEntity.setProductId(selectProductBindRequest.getProductId()); - supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); - supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); - supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); - supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); - supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); - supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); - supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); - supProductEntity.setCreateTime(new Date()); - supProductEntity.setUpdateTime(new Date()); - supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); - supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); - supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); + } else { + supProductEntity = new SupProductEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + supProductEntity.setProductId(selectProductBindRequest.getProductId()); + supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); + supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); + supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); + supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); + supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); + supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); + supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); + supProductEntity.setCreateTime(new Date()); + supProductEntity.setUpdateTime(new Date()); + supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); + supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); + supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); // supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); - supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); + supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index 097c711ce..9994c5cf9 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -96,7 +96,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()); diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index 4f2ca48f3..e496b2901 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -75,7 +75,7 @@ public interface AuthAdminDao extends BaseMapperPlus selectHospitalUser(); - List selectNotSelectUser(@Param("userIds") List userIds, @Param("deptId") Integer deptId); + List selectNotSelectUser(@Param("userIds") List userIds, @Param("deptId") Long deptId); List selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index e6fe3084f..43cefff33 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -25,7 +25,7 @@ public interface WarehouseUserDao extends BaseMapperPlus - * + * *

* * @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外键 diff --git a/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java index dfc28ed93..df5c0b8c0 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java @@ -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; /** * 证书名称 diff --git a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java index 176efe79e..5d0d41a8e 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java @@ -11,7 +11,7 @@ import java.util.Date; /** *

- * + * *

* * @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; /** diff --git a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java index 16fa287bd..d37b53453 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java @@ -10,7 +10,7 @@ import java.util.Date; /** *

- * + * *

* * @author 作者 @@ -18,9 +18,9 @@ import java.util.Date; */ @TableName("sup_product") @Data -public class SupProductEntity{ +public class SupProductEntity { - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.INPUT) private Long id; /** diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java index 54664fc0b..8a65fae2a 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java @@ -21,7 +21,7 @@ public class ThrBusTypeOriginEntity { * id */ @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 单据类型名称 diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java index 2f3d673b5..57984c6f0 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java @@ -10,16 +10,17 @@ import java.util.Date; /** *

- * + * *

+ * * @since 2023-01-12 */ @Data @TableName("thr_corp") -public class ThrCorpEntity{ +public class ThrCorpEntity { @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; @TableField("unitId") private String unitId; diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java index 7b72e4321..a3940207d 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrDeptEntity.java @@ -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; @@ -36,4 +36,4 @@ public class ThrDeptEntity { * 第三方系统标识 */ private String thirdSysFk; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java index c462d63b3..4157848a5 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java @@ -10,7 +10,7 @@ import java.util.Date; /** *

- * + * *

* * @author ${author} @@ -18,10 +18,10 @@ import java.util.Date; */ @Data @TableName("thr_products") -public class ThrProductsEntity{ +public class ThrProductsEntity { @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 产品编码 @@ -180,6 +180,4 @@ public class ThrProductsEntity{ private String updateUser; - - } diff --git a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java index 403d4040e..eadab4da5 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java @@ -10,5 +10,5 @@ public class FilterNoSelectUserRequest extends ListPageRequest { List userIds; - private Integer deptId; + private Long deptId; } diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java index 18da850ec..fd4fc10fe 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java @@ -9,7 +9,7 @@ import java.util.List; @Data public class BasicHospTypeRequest{ - private Integer id; + private Long id; private String code; private String parentCode; private String name; diff --git a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java index bb8c32f31..9c8dcdd50 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class FilterCertSetsRequest extends ListPageRequest { - private Integer id; + private Long id; private String name; private Integer type; private Integer need; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 9b77eeeda..476f5a36b 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -15,7 +15,6 @@ public interface WarehouseUserService extends IService { /** * 查询仓库信息关联的用户数据 * - * @param code 仓位码 * @return */ @@ -40,7 +39,7 @@ public interface WarehouseUserService extends IService { * * @param id */ - void updateDirector(Integer id); + void updateDirector(Long id); void updateDirector(WarehouseUserEntity warehouseUserEntity); diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index 1e6eb018d..ab5966e5f 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -82,7 +82,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl implements IBasicBussinessTypeService { +public class BasicBussinessTypeServiceImpl extends ServiceImpl implements IBasicBussinessTypeService { @Resource private CustomerService customerService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 140f9f7a9..7ba10f5f0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -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; @@ -65,7 +66,7 @@ public class BasicHospTypeServiceImpl extends ServiceImpl basicHospTypeEntityList = basicHospTypeDao.selectLowTypeAll(basicHospTypeFilterRequest.getCode()); - List ids = basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList()); + List ids = basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList()); ew.notIn("id", ids); } List data = basicHospTypeDao.selectList(ew); @@ -105,6 +106,7 @@ public class BasicHospTypeServiceImpl extends ServiceImpl i @Override public boolean insertCompanyCert(SupCertEntity supCertEntity) { - return supCertDao.insertCompanyCert(supCertEntity); + return supCertDao.insert(supCertEntity) > 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java index ce8be5769..e74b0c772 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java @@ -41,7 +41,7 @@ public class SupCertSetServiceImpl extends ServiceImpl 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java index d75d7b3c9..e770a6d63 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java @@ -68,7 +68,7 @@ public class SupManufacturerServiceImpl extends ServiceImpl 0 ? true : false; } @Override diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index 8188e72d3..c1fac32a5 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -140,7 +140,7 @@ public class SupProductServiceImpl extends ServiceImpl 0 ? true : false; } @Override diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 8d3efa011..e382616d4 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -145,28 +145,6 @@ #{remark}) - - insert INTO basic_corp(thirdId, erpId, name, spell, addr, - status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, - thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType, - createUser, createTime, updateUser, remark) - values (#{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile}, - #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, - #{thirdName}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{updateTime}, #{corpType}, - #{outType}, #{createUser}, - #{createTime}, - #{updateUser}, - #{remark}) - diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index ecc5871b6..71208f2ee 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -306,6 +306,41 @@ CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes` COLLATE = utf8mb4_0900_ai_ci COMMENT = '单据同步 - 业务单据类型' ROW_FORMAT = DYNAMIC; +# 修改主键为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);