diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 1484c6382..343952b9d 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -45,7 +46,7 @@ public class AuthUserController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } AuthAdmin authAdmin = new AuthAdmin(); - BeanUtils.copyProperties(authUserSaveRequest, authAdmin); + BeanUtil.copyProperties(authUserSaveRequest, authAdmin); authAdmin.setId(getUserId()); authAdmin.setLastModifyTime(new Date()); boolean b = authAdminService.updateAuthAdmin(authAdmin); @@ -102,7 +103,7 @@ public class AuthUserController extends BaseController { //过滤当前已关联用户 FilterNoSelectUserRequest filterNoSelectUserRequest = new FilterNoSelectUserRequest(); - BeanUtils.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest); + BeanUtil.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest); filterNoSelectUserRequest.setUserIds(userIds); //查询部门id FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); 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 85bc7fd15..35e01030b 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -149,7 +150,7 @@ public class InvWarehouseController extends BaseController { } if (filterInvWarehouseRequest.getAdvanceType() == 2 || filterInvWarehouseRequest.getAdvanceType() == 3) { FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); - BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest); + BeanUtil.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest); list = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest); } else { FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 27f09c488..b496ab4a5 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.constant.Constant; @@ -201,7 +202,7 @@ public class LoginController extends BaseController { Long id = Long.valueOf(adminId); AuthAdmin authAdmin = authAdminService.findById(id); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); - BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); + BeanUtil.copyProperties(authAdmin, loginUserInfoResponse); DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode()); loginUserInfoResponse.setLocDeptName(deptEntity.getName()); @@ -219,7 +220,7 @@ public class LoginController extends BaseController { Long id = Long.valueOf(adminId); AuthAdmin authAdmin = authAdminService.findById(id); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); - BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); + BeanUtil.copyProperties(authAdmin, loginUserInfoResponse); CompanyEntity companyEntity = companyService.findCompany(); loginUserInfoResponse.setCompanyName(companyEntity.getName()); loginUserInfoResponse.setLocDeptName(deptService.getInvName(loginUserInfoResponse.getLocDeptCode())); diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index d1116b9ff..91064a358 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -2,6 +2,7 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -69,7 +70,7 @@ public class SysUserController extends BaseController { //查询对应角色和部门 List authAdminResponseList = authAdminList.stream().map(item -> { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); - BeanUtils.copyProperties(item, authAdminResponse); + BeanUtil.copyProperties(item, authAdminResponse); List roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId()); List deptUserResponses=null; if("key".equals(filterAuthUserRequest.getKey())){ @@ -171,7 +172,7 @@ public class SysUserController extends BaseController { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在"); } AuthAdmin authAdmin = new AuthAdmin(); - BeanUtils.copyProperties(authUserSaveRequest, authAdmin); + BeanUtil.copyProperties(authUserSaveRequest, authAdmin); if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } @@ -250,7 +251,7 @@ public class SysUserController extends BaseController { } AuthAdmin authAdmin = new AuthAdmin(); - BeanUtils.copyProperties(authUserSaveRequest, authAdmin); + BeanUtil.copyProperties(authUserSaveRequest, authAdmin); if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } 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 12938b29b..a9f383f37 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -328,7 +328,7 @@ public class BasicBussinessTypeController extends BaseController { List bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest); for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { BussinessTypExportResponse bussinessTypExportResponse = new BussinessTypExportResponse(); - BeanUtils.copyProperties(bussinessTypeEntity, bussinessTypExportResponse); + BeanUtil.copyProperties(bussinessTypeEntity, bussinessTypExportResponse); bussinessTypExportResponses.add(bussinessTypExportResponse); } String json = JSONObject.toJSON(bussinessTypExportResponses).toString(); 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 56932e4d0..4c503a541 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.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -120,7 +121,7 @@ public class BasicCorpController extends BaseController { } BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); - BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); + BeanUtil.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); basicUnitMaintainEntity.setErpId(CustomUtil.getId()); if (basicUnitMaintainSaveRequest.getCorpType() == 1) { basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); @@ -195,7 +196,7 @@ public class BasicCorpController extends BaseController { List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> { BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); - BeanUtils.copyProperties(item, basicUnitMaintainResponse); + BeanUtil.copyProperties(item, basicUnitMaintainResponse); basicUnitMaintainResponse.setUnitId(item.getErpId()); return basicUnitMaintainResponse; }).collect(Collectors.toList()); @@ -393,14 +394,14 @@ public class BasicCorpController extends BaseController { // // } else { // FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); -// BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); +// BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); // filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); // List thrCorpEntities // = thrCorpService.filterThrCorps(filterThrCorpRequest); // List thrCorpEntityList = thrCorpEntities.stream().map(item -> // { // ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); -// BeanUtils.copyProperties(item, thrCorpEntity); +// BeanUtil.copyProperties(item, thrCorpEntity); // BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys()); // if (basicUnitMaintainEntity != null) { // thrCorpEntity.setChecked(true); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index 6e74069f1..44a45e15b 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; @@ -96,7 +97,7 @@ public class BasicGenExcelService { } else {//一键导出 BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); - BeanUtils.copyProperties(basicCorpsExportRequest, filterRequest); + BeanUtil.copyProperties(basicCorpsExportRequest, filterRequest); filterRequest.setPage(null); List> genDatas = genExcelData(filterRequest); if (genDatas != null && genDatas.size() > 0) { @@ -136,7 +137,7 @@ public class BasicGenExcelService { // if (unitMaintainEntities != null && unitMaintainEntities.size() > 0) { // for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) { // CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity(); -// BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity); +// BeanUtil.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity); // corpImportDetailEntities.add(corpImportDetailEntity); // } // postCorpsRequest.setDatas(corpImportDetailEntities); @@ -147,13 +148,13 @@ public class BasicGenExcelService { // // } else {//一键导出 // BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); -// BeanUtils.copyProperties(corpsExportRequest, filterRequest); +// BeanUtil.copyProperties(corpsExportRequest, filterRequest); // // List unitMaintainEntities = basicUnitMaintainService.filterList(filterRequest); // if (unitMaintainEntities != null && unitMaintainEntities.size() > 0) { // for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) { // CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity(); -// BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity); +// BeanUtil.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity); // corpImportDetailEntities.add(corpImportDetailEntity); // } // postCorpsRequest.setDatas(corpImportDetailEntities); @@ -229,7 +230,7 @@ public class BasicGenExcelService { // // } else {//一键导出 // FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); -// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); +// BeanUtil.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); // filterUdiInfoRequest.setPage(null); // List> genDatas = genExcelData(filterUdiInfoRequest); // if (genDatas != null && genDatas.size() > 0) { @@ -289,7 +290,7 @@ public class BasicGenExcelService { // // } else {//一键导出 // FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); -// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); +// BeanUtil.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); // List genDatas = genSmpData(filterUdiInfoRequest); // postUdiInfoRequest.setDatas(genDatas); // } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java index e206e640e..a06b4968c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java @@ -74,7 +74,7 @@ public class BasicGenJsonService { }); } else { //一键导出 BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); - BeanUtils.copyProperties(basicCorpsExportRequest, filterRequest); + BeanUtil.copyProperties(basicCorpsExportRequest, filterRequest); filterRequest.setPage(null); List basicUnitMaintainEntities = basicUnitMaintainService.filterList(filterRequest); unitMaintainEntities.addAll(basicUnitMaintainEntities); @@ -103,7 +103,7 @@ public class BasicGenJsonService { }); } else { //一键导出 BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); - BeanUtils.copyProperties(corpsExportRequest, filterRequest); + BeanUtil.copyProperties(corpsExportRequest, filterRequest); filterRequest.setPage(null); List basicUnitMaintainEntities = basicUnitMaintainService.filterList(filterRequest); unitMaintainEntities.addAll(basicUnitMaintainEntities); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java index d4a913eb2..48218defb 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -180,7 +181,7 @@ public class BasicProductsExportLogController { List udiRlDlResponses = udiRelevanceResponses.stream().map(item -> { UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse(); - BeanUtils.copyProperties(item, udiRlDlResponse); + BeanUtil.copyProperties(item, udiRlDlResponse); return udiRlDlResponse; }).collect(Collectors.toList()); PageInfo pageInfo; @@ -219,7 +220,7 @@ public class BasicProductsExportLogController { List udiRlDlResponses = udiRelevanceResponses.stream().map(item -> { UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse(); - BeanUtils.copyProperties(item, udiRlDlResponse); + BeanUtil.copyProperties(item, udiRlDlResponse); return udiRlDlResponse; }).collect(Collectors.toList()); PageInfo pageInfo; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index f23c051ab..385850000 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -245,7 +246,7 @@ public class UdiContrastController { ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), thrSystemEntity.getThirdId()); UdiProductEntity UdiInfoRequest = new UdiProductEntity(); - BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest); + BeanUtil.copyProperties(thrProductsEntity, UdiInfoRequest); UdiInfoRequest.setNameCode(thrProductsEntity.getCode()); UdiInfoRequest.setCpmctymc(thrProductsEntity.getName()); UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory()); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 18bdda20f..784cccbe1 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -235,8 +236,8 @@ public class UdiRelevanceController extends BaseController { if (CollUtil.isNotEmpty(udiInfoEntities)) { for (UdiProductEntity udiProductEntity : udiInfoEntities) { UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); - BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse); - BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse); + BeanUtil.copyProperties(udiProductEntity, udiRelevanceResponse); + BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse); udiRelevanceResponses.add(udiRelevanceResponse); } } @@ -334,7 +335,7 @@ public class UdiRelevanceController extends BaseController { //更新关联表 UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - BeanUtils.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity); + BeanUtil.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity); udiRelevanceEntity.setId(udiRelevanceSaveRequest.getId()); udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index 0f5f44180..a93ca2a90 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -72,7 +73,7 @@ public class UdiSyncController { nameCode = filterUdiRelRequest.getNameCode(); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); - BeanUtils.copyProperties(filterUdiRelRequest, productInfoFilterRequest); + BeanUtil.copyProperties(filterUdiRelRequest, productInfoFilterRequest); if (StrUtil.isNotEmpty(nameCode)) { productInfoFilterRequest.setNameCode(nameCode); } else { 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 449123a20..4134c98e5 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inout; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -24,10 +25,7 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.req.inout.AddEnterCodeRequest; -import com.glxp.api.req.inout.AddOrderRequest; -import com.glxp.api.req.inout.FilterCodeRequest; -import com.glxp.api.req.inout.PostOrderRequest; +import com.glxp.api.req.inout.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; @@ -95,54 +93,28 @@ public class IoCodeTempController extends BaseController { IoCodeService codeService; @Resource InvPreProductDetailService invPreProductDetailService; + @Resource + IoAddInoutService ioAddInoutService; + @Resource + IoOrderDetailCodeService ioOrderDetailCodeService; //手持端扫码单据上传调用接口 @RepeatSubmit() @AuthRuleAnnotation("") - @PostMapping("warehouse/inout/postOrders") + @PostMapping("udiwms/pda/inout/order/upload") @Log(title = "单据管理", businessType = BusinessType.INSERT) - public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) { + public BaseResponse pdaUploadOrder(@RequestBody PdaPostOrderRequest pdaPostOrderRequest) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + if (pdaPostOrderRequest == null) { + return ResultVOUtils.error(500, "提交参数不能为空！"); } - - Long userId = getUserId(); - try { - PostOrderRequest inPostOrder = new PostOrderRequest(); - List inPostOrders = new ArrayList<>(); - PostOrderRequest outPostOrder = new PostOrderRequest(); - List outPostOrders = new ArrayList<>(); - - List postOrders = postOrderRequest.getPostOrders(); - if (postOrders != null && postOrders.size() > 0) { - for (PostOrderRequest.PostOrder postOrder : postOrders) { - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(postOrder.getOrderBean().getType()); - if (bussinessTypeEntity.isOutToSpms()) { - outPostOrders.add(postOrder); - } else { - inPostOrders.add(postOrder); - } - } - } - - BeanUtils.copyProperties(postOrderRequest, inPostOrder); - BeanUtils.copyProperties(postOrderRequest, outPostOrder); - inPostOrder.setPostOrders(inPostOrders); - outPostOrder.setPostOrders(outPostOrders); - - - if (CollUtil.isNotEmpty(inPostOrders)) { - inPostOrder.setCustomerId(getCustomerId()); - inPostOrder.setUserId(userId); - transInoutService.creatOrderByPda(inPostOrder); - } - - - } catch (Exception e) { - return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + if (pdaPostOrderRequest.getOrderEntity() == null) { + return ResultVOUtils.error(500, "提交单据不能为空！"); } - + if (pdaPostOrderRequest.getCodeTempEntities() == null) { + return ResultVOUtils.error(500, "单据未扫码，请检查后提交！"); + } + ioAddInoutService.creatOrderByPda(pdaPostOrderRequest); return ResultVOUtils.success("上传成功，等待后台处理"); } @@ -572,7 +544,7 @@ public class IoCodeTempController extends BaseController { } udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode(), null); - BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity); + BeanUtil.copyProperties(exitLocalEntity, genDetaiEntity); genDetaiEntity.setCount(1); genDetaiEntity.setReCount(udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); @@ -1058,7 +1030,7 @@ public class IoCodeTempController extends BaseController { } else { IoCodeEntity ioCodeEntity = new IoCodeEntity(); - BeanUtils.copyProperties(codeEnttity, ioCodeEntity); + BeanUtil.copyProperties(codeEnttity, ioCodeEntity); String supId = transInoutService.checkInvExitSup(ioCodeEntity); if (supId == null) { supId = transInoutService.checkExitSup(codeEnttity.getRelId()); @@ -1181,10 +1153,6 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.success("绑定成功"); } - @Resource - IoAddInoutService ioAddInoutService; - @Resource - IoOrderDetailCodeService ioOrderDetailCodeService; @AuthRuleAnnotation("") @GetMapping("warehouse/inout/deleteCodesTempById") @@ -1560,7 +1528,7 @@ public class IoCodeTempController extends BaseController { } udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode(), null); - BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity); + BeanUtil.copyProperties(exitLocalEntity, genDetaiEntity); genDetaiEntity.setCount(1); genDetaiEntity.setReCount(udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 5221451fd..fd4a77d2c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -393,7 +393,7 @@ public class IoOrderController extends BaseController { orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo()); for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) { IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); + BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); orderDetailBizEntity.setId(null); orderDetailBizEntity.setCount(IntUtil.value(orderDetailCodeEntity.getReCount())); getSomeBiz(orderDetailBizEntities, orderDetailBizEntity); @@ -650,7 +650,7 @@ public class IoOrderController extends BaseController { orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo()); for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) { IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); + BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); orderDetailBizEntity.setCount(IntUtil.value(orderDetailCodeEntity.getReCount())); orderDetailBizEntity.setId(null); getSomeBiz(orderDetailBizEntities, orderDetailBizEntity); @@ -823,7 +823,7 @@ public class IoOrderController extends BaseController { if (CollUtil.isNotEmpty(orderResponses)) { for (IoOrderResponse orderResponse : orderResponses) { PdaBusOrderResponse pdaBusOrderResponse = new PdaBusOrderResponse(); - BeanUtils.copyProperties(orderResponse, pdaBusOrderResponse); + BeanUtil.copyProperties(orderResponse, pdaBusOrderResponse); FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); filterOrderDetailBizRequest.setOrderIdFk(orderResponse.getBillNo()); List orderDetailBizEntities = orderDetailBizService.filterList(filterOrderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index f076f97b6..78ffb2e51 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -160,7 +160,7 @@ public class IoOrderInvoiceController { List ioOrderDetailCodeResponses = orderDetailBizService.getInvoicResultDetail(orderDetailBizRequest); for (IoOrderDetailResultResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); - BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity); + BeanUtil.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity); ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId()); ioOrderInvoiceEntity.setOrderIdFk(orderFk); ioOrderInvoiceEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index 6dd5a253e..9f0ed2f92 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inout; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -157,7 +158,7 @@ public class IoOrderMutiController { ioOrderMutiEntity = ioOrderMutiService.getById(ioOrderMutiEntity.getId()); UdiProductEntity udiProductEntity = udiProductService.findByNameCode(ioOrderMutiEntity.getNameCode()); IoOrderMutiResponse ioOrderMutiResponse = new IoOrderMutiResponse(); - BeanUtils.copyProperties(ioOrderMutiEntity, ioOrderMutiResponse); + BeanUtil.copyProperties(ioOrderMutiEntity, ioOrderMutiResponse); ioOrderMutiResponse.setCpmctymc(udiProductEntity.getCpmctymc()); ioOrderMutiResponse.setGgxh(udiProductEntity.getGgxh()); QueryWrapper ew = new QueryWrapper<>(); diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java index 39d200698..c8f6ef27d 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inv; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; @@ -58,7 +59,7 @@ public class DeviceRepairOrderDetailController { public BaseResponse addDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); - BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + BeanUtil.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); deviceRepairOrderDetailService.addDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); return ResultVOUtils.success(deviceRepairOrderDetailEntity); @@ -74,7 +75,7 @@ public class DeviceRepairOrderDetailController { public BaseResponse updateDeviceRepairOrderDetail(@RequestBody FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest) { DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity = new DeviceRepairOrderDetailEntity(); - BeanUtils.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); + BeanUtil.copyProperties(filterDeviceRepairOrderDetailRequest,deviceRepairOrderDetailEntity); deviceRepairOrderDetailService.updateDeviceRepairOrderDetail(deviceRepairOrderDetailEntity); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 761fde551..cc85483d6 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inv; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -141,7 +142,7 @@ public class InvInnerOrderPrintController { if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) { for (int i = 0; i < pdfPrintCount.getRowCount(); i++) { InnerOrderPrintResponse clone = new InnerOrderPrintResponse(); - BeanUtils.copyProperties(InnerOrderPrintResponse, clone); + BeanUtil.copyProperties(InnerOrderPrintResponse, clone); printEntities.add(clone); } } else { @@ -273,7 +274,7 @@ public class InvInnerOrderPrintController { if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) { for (int i = 0; i < pdfPrintCount.getRowCount(); i++) { InnerOrderPrintResponse clone = new InnerOrderPrintResponse(); - BeanUtils.copyProperties(InnerOrderPrintResponse, clone); + BeanUtil.copyProperties(InnerOrderPrintResponse, clone); printEntities.add(clone); } } else { diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index c1f1a7663..f9c39c236 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -166,7 +167,7 @@ public class PurApplyController { Long userId = customerService.getUserId(); PurApplyEntity purApplyEntity = new PurApplyEntity(); - BeanUtils.copyProperties(purApplyRequest, purApplyEntity); + BeanUtil.copyProperties(purApplyRequest, purApplyEntity); purApplyEntity.setUpdateTime(new Date()); purApplyEntity.setAuditTime(new Date()); purApplyEntity.setAuditUser(userId + ""); @@ -204,7 +205,7 @@ public class PurApplyController { // if (CollUtil.isNotEmpty(purApplyDetailEntities)) { // for (PurApplyDetailEntity purApplyDetailEntity : purApplyDetailEntities) { // PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity(); -// BeanUtils.copyProperties(purApplyDetailEntity, purPlanDetailEntity); +// BeanUtil.copyProperties(purApplyDetailEntity, purPlanDetailEntity); // purPlanDetailEntity.setOrderIdFk(purPlanEntity.getId() + ""); // purPlanDetailService.insert(purPlanDetailEntity); // } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index ef33d7d64..326e5449c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -310,7 +311,7 @@ public class PurOrderController { List purOrderDetailEntityList = purApplyDetailEntityList.stream() .map(e -> { PurOrderDetailEntity d = new PurOrderDetailEntity(); - BeanUtils.copyProperties(e, d); + BeanUtil.copyProperties(e, d); return d; }) .collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index c8c0a68c0..1929b0dc1 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -256,7 +256,7 @@ public class PurOrderReceiveController extends BaseController { if (invWarehouseEntity.getAdvanceType() == 3) { //寄售 FilterInvPreProductRequest request = new FilterInvPreProductRequest(); - // BeanUtils.copyProperties(updateReceiveDetailRequest,request); + // BeanUtil.copyProperties(updateReceiveDetailRequest,request); request.setNameCode(updateReceiveDetailRequest.getNameCode()); request.setInvCode(updateReceiveDetailRequest.getTargetInvCode()); list = selectFilterInvPreProductRequest(request); @@ -264,14 +264,14 @@ public class PurOrderReceiveController extends BaseController { } else if (invWarehouseEntity.getAdvanceType() == 2) { //预验收 FilterInvPreinProductRequest request = new FilterInvPreinProductRequest(); - // BeanUtils.copyProperties(updateReceiveDetailRequest,request); + // BeanUtil.copyProperties(updateReceiveDetailRequest,request); request.setNameCode(updateReceiveDetailRequest.getNameCode()); request.setInvCode(updateReceiveDetailRequest.getTargetInvCode()); listinvprein = selectfilterListStock(request); } else { FilterInvProductRequest request = new FilterInvProductRequest(); - // BeanUtils.copyProperties(updateReceiveDetailRequest,request); + // BeanUtil.copyProperties(updateReceiveDetailRequest,request); request.setNameCode(updateReceiveDetailRequest.getNameCode()); request.setInvCode(updateReceiveDetailRequest.getTargetInvCode()); listInv = selectFilterInvProductRequest(request); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index 6dc421476..ccb4fdff9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -416,7 +417,7 @@ public class PurPlanController { List purPlanDetailEntityList = purApplyDetailEntityList.stream() .map(e -> { PurPlanDetailEntity d = new PurPlanDetailEntity(); - BeanUtils.copyProperties(e, d); + BeanUtil.copyProperties(e, d); return d; }) .collect(Collectors.toList()); 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 4ee2c9f9e..ed446907e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -266,7 +267,7 @@ public class SupCertController { @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) { SupCertEntity supCertEntity = new SupCertEntity(); - BeanUtils.copyProperties(postSupCertRequest, supCertEntity); + BeanUtil.copyProperties(postSupCertRequest, supCertEntity); if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) { 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 9f52f29b3..1daf5074a 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -163,7 +164,7 @@ public class SupProductController { //// return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); // } else { supProductEntity = new SupProductEntity(); - BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + BeanUtil.copyProperties(udiRelevanceResponse, supProductEntity); supProductEntity.setProductId(selectProductBindRequest.getProductId()); supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 8fda979bf..d09b49618 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.sync; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -145,7 +146,7 @@ public class SpsSyncExportStatusController { info = basicExportService.getById(deleteRequest.getId()); } else { BasicDownloadStatusEntity basicDownloadStatusEntity = basicDownloadService.getById(deleteRequest.getId()); - BeanUtils.copyProperties(basicDownloadStatusEntity, info); + BeanUtil.copyProperties(basicDownloadStatusEntity, info); } if (info == null) { diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 8c804a8a2..abcb67fcd 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.sync; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONUtil; @@ -67,7 +68,7 @@ public class SyncDataSetController { public BaseResponse save(@RequestBody @Valid SyncDataSetResponse syncDataSetResponse ) { SyncDataSetEntity syncDataSetEntity = new SyncDataSetEntity(); - BeanUtils.copyProperties(syncDataSetResponse, syncDataSetEntity); + BeanUtil.copyProperties(syncDataSetResponse, syncDataSetEntity); syncDataSetEntity.setUpdateTime(new Date()); syncDataSetEntity.setId(1); List busTypes = syncDataSetResponse.getBusTypes(); diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index 66816c73b..4a1ab56f6 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.system; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -64,7 +65,7 @@ public class SysMenuHelpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); - BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); + BeanUtil.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); sysMenuHelpService.insertMenuHelp(sysMenuHelpEntity); return ResultVOUtils.success("成功"); } @@ -77,7 +78,7 @@ public class SysMenuHelpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); - BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); + BeanUtil.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); sysMenuHelpService.updateMenuHelp(sysMenuHelpEntity); return ResultVOUtils.success("成功"); } diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index fdc181594..ba44c5b89 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.system; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import com.github.pagehelper.PageInfo; @@ -52,7 +53,7 @@ public class SysParamConfigController { List systemParamConfigEntityList = systemParamConfigService.queryPage(filterParamConfigRequest); List systemParamConfigResponseList = systemParamConfigEntityList.stream().map(item -> { SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse(); - BeanUtils.copyProperties(item, systemParamConfigResponse); + BeanUtil.copyProperties(item, systemParamConfigResponse); return systemParamConfigResponse; }).collect(Collectors.toList()); @@ -73,7 +74,7 @@ public class SysParamConfigController { } SystemParamConfigEntity systemParamConfigEntity = new SystemParamConfigEntity(); - BeanUtils.copyProperties(sysParamConfigSaveRequest, systemParamConfigEntity); + BeanUtil.copyProperties(sysParamConfigSaveRequest, systemParamConfigEntity); boolean b = systemParamConfigService.insert(systemParamConfigEntity); if (!b) { diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index d73e9adfa..5f0cb3480 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.system; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -55,7 +56,7 @@ public class SysPdfModuleController { List systemPDFModuleEntityList = systemPDFModuleService.queryPage(filterPDFModuleRequest); List systemPDFModuleResponseList = systemPDFModuleEntityList.stream().map(item -> { SystemPDFModuleResponse systemPDFModuleResponse = new SystemPDFModuleResponse(); - BeanUtils.copyProperties(item, systemPDFModuleResponse); + BeanUtil.copyProperties(item, systemPDFModuleResponse); if (item.getTemplateId() != 0) { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(item.getTemplateId())); @@ -130,7 +131,7 @@ public class SysPdfModuleController { pageSimpleResponse.setTotal(pageInfo.getTotal()); List systemPDFModuleSelectResponses = systemPDFModuleEntityList.stream().map(e -> { SystemPDFModuleSelectResponse systemPDFModuleSelectResponse = new SystemPDFModuleSelectResponse(); - BeanUtils.copyProperties(e, systemPDFModuleSelectResponse); + BeanUtil.copyProperties(e, systemPDFModuleSelectResponse); systemPDFModuleSelectResponse.setIdStr(String.valueOf(e.getId())); return systemPDFModuleSelectResponse; }).collect(Collectors.toList()); @@ -150,7 +151,7 @@ public class SysPdfModuleController { } SystemPDFModuleEntity systemPDFModuleEntity = new SystemPDFModuleEntity(); - BeanUtils.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity); + BeanUtil.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity); systemPDFModuleEntity.setCreate_time(new Date()); systemPDFModuleEntity.setUpdate_time(new Date()); diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index 3265caad9..db46137c8 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.system; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; @@ -49,7 +50,7 @@ public class SysPdfTemplateController { List systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(filterPdfTemplateRequest); List systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> { SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse(); - BeanUtils.copyProperties(item, systemPDFTemplateResponse); + BeanUtil.copyProperties(item, systemPDFTemplateResponse); return systemPDFTemplateResponse; }).collect(Collectors.toList()); @@ -95,7 +96,7 @@ public class SysPdfTemplateController { pageSimpleResponse.setTotal(pageInfo.getTotal()); List systemPDFTemplateSelectResponses = systemPDFTemplateEntityList.stream().map(e -> { SystemPDFTemplateSelectResponse systemPDFTemplateSelectResponse = new SystemPDFTemplateSelectResponse(); - BeanUtils.copyProperties(e, systemPDFTemplateSelectResponse); + BeanUtil.copyProperties(e, systemPDFTemplateSelectResponse); systemPDFTemplateSelectResponse.setIdStr(String.valueOf(e.getId())); return systemPDFTemplateSelectResponse; }).collect(Collectors.toList()); @@ -114,7 +115,7 @@ public class SysPdfTemplateController { } SystemPDFTemplateEntity systemPDFTemplateEntity = new SystemPDFTemplateEntity(); - BeanUtils.copyProperties(sysPdfTemplateSaveRequest, systemPDFTemplateEntity); + BeanUtil.copyProperties(sysPdfTemplateSaveRequest, systemPDFTemplateEntity); systemPDFTemplateEntity.setCreate_time(new Date()); systemPDFTemplateEntity.setUpdate_time(new Date()); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 248da8ad1..de9a571db 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; @@ -205,13 +206,13 @@ public class ThrCorpExportLogController { return udiDlDeviceResponse; } else { FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); + BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); List thrCorpEntityList = thrCorpEntities.stream().map(item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; }).collect(Collectors.toList()); PageInfo pageInfo; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index ae7bc4d1f..842799f59 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.thread.ThreadUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -196,13 +197,13 @@ public class ThrCorpsController { } else { FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrUnitMaintainFilterRequest, filterThrCorpRequest); + BeanUtil.copyProperties(thrUnitMaintainFilterRequest, filterThrCorpRequest); filterThrCorpRequest.setThirdSysFk(thrUnitMaintainFilterRequest.getThirdSys()); List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); List thrCorpEntityList = thrCorpEntities.stream().map(item -> { ThrCorpsResponse thrCorpEntity = new ThrCorpsResponse(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); ThrUnitMaintainResponse thrUnitMaintainResponse = thrCorpService.selectByThirdId(item.getUnitId(), thrUnitMaintainFilterRequest.getThirdSys()); if (thrUnitMaintainResponse != null) { thrCorpEntity.setChecked(true); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index 3747f343d..650f412e8 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -161,14 +162,14 @@ public class ThrInvProductsExportLogController { return responseBaseResponse; } else { FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); - BeanUtils.copyProperties(onhandQueryRequest, filterThrInvProductsRequest); + BeanUtil.copyProperties(onhandQueryRequest, filterThrInvProductsRequest); filterThrInvProductsRequest.setThirdSysFk(onhandQueryRequest.getThirdSys()); List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); List erpInvProductResponseList = thrInvProductsEntities.stream().map(item -> { ThrInvProductResponse erpInvProductResponse = new ThrInvProductResponse(); - BeanUtils.copyProperties(item, erpInvProductResponse); + BeanUtil.copyProperties(item, erpInvProductResponse); erpInvProductResponse.setCode(item.getInventoryCode()); erpInvProductResponse.setName(item.getInventoryName()); return erpInvProductResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 1ef89083a..cbf9d13b7 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; @@ -124,8 +125,8 @@ public class ThrOrderController { if (subErpOrders != null && subErpOrders.size() > 0) { for (ThrOrderResponse.SubErpOrder subErpOrder : subErpOrders) { ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); - BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity); - BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); + BeanUtil.copyProperties(erpOrderResponse, thrOrderDetailEntity); + BeanUtil.copyProperties(subErpOrder, thrOrderDetailEntity); thrOrderDetailEntity.setGenKeyFk(finalGenKey); thrOrderDetailEntity.setThirdSysFk(postThrOrderRequest.getThirdSys()); thrOrderDetailEntity.setUpdateTime(new Date()); @@ -328,7 +329,7 @@ public class ThrOrderController { for (String id : ids) { ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id)); UploadSmpRequest uploadSmpRequest = new UploadSmpRequest(); - BeanUtils.copyProperties(thrOrderEntity, uploadSmpRequest); + BeanUtil.copyProperties(thrOrderEntity, uploadSmpRequest); uploadSmpRequest.setType(1); FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); filterThrOrderDetailRequest.setOrderIdFk(id); @@ -337,7 +338,7 @@ public class ThrOrderController { List subErpOrders = new ArrayList<>(); for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { UploadSmpRequest.SubErpOrder subErpOrder = new UploadSmpRequest.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } uploadSmpRequest.setSubErpOrders(subErpOrders); @@ -383,7 +384,7 @@ public class ThrOrderController { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); + BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); List erpOrderResponses = new ArrayList<>(); @@ -394,12 +395,12 @@ public class ThrOrderController { filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getBillNo() + ""); List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); List subErpOrders = new ArrayList<>(); if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } } @@ -431,7 +432,7 @@ public class ThrOrderController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); + BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); @@ -444,12 +445,12 @@ public class ThrOrderController { List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); List subErpOrders = new ArrayList<>(); if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrder.setCount(thrOrderDetailEntity.getCount()); subErpOrder.setReCount(thrOrderDetailEntity.getReCount()); subErpOrders.add(subErpOrder); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index c0a7e81ba..9fd2dc7f2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -182,7 +183,7 @@ public class ThrOrderExportLogController { } else { //todo 订单查询，需加日期 FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); + BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); List erpOrderResponses = new ArrayList<>(); @@ -193,12 +194,12 @@ public class ThrOrderExportLogController { filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); List subErpOrders = new ArrayList<>(); if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 611b80494..c8dc0ac49 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -157,7 +157,7 @@ public class ThrProductsController { if (null == thrProductsEntity) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - BeanUtils.copyProperties(thrProductsEntity, filterThrProductsRequest); + BeanUtil.copyProperties(thrProductsEntity, filterThrProductsRequest); List thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest); if (thrProductsEntities.size() == 0) { thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId())); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index 73f568f57..0a3424ff5 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -236,7 +237,7 @@ public class ThrProductsExportLogController { return ResultVOUtils.error(500, "未查询到产品信息"); } else { FilterThrProductsRequest filterThrProductsRequest1 = new FilterThrProductsRequest(); - BeanUtils.copyProperties(filterThrProductsRequest, filterThrProductsRequest1); + BeanUtil.copyProperties(filterThrProductsRequest, filterThrProductsRequest1); List thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(thrCorpEntities); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index 89d11f1ea..ccdd42e6f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -83,7 +84,7 @@ public class ThrSystemController { List basicThirdSysResponses = basicThirdSysEntities.stream().map(item -> { BasicThirdSysResponse basicThirdSysResponse = new BasicThirdSysResponse(); - BeanUtils.copyProperties(item, basicThirdSysResponse); + BeanUtil.copyProperties(item, basicThirdSysResponse); return basicThirdSysResponse; }).collect(Collectors.toList()); basicThirdSysResponses.add(new BasicThirdSysResponse("ybbm", "医保编码")); diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index c862eb87b..a9234ef13 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -1,5 +1,6 @@ package com.glxp.api.http; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -17,13 +18,9 @@ import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail; import com.glxp.api.service.thrsys.ThrSystemService; import lombok.extern.slf4j.Slf4j; import okhttp3.*; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.io.File; -import java.util.List; /** * 第三方服务HttpClient @@ -42,7 +39,7 @@ public class ErpBasicClient { //获取往来单位 public BaseResponse> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); - BeanUtils.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest); + BeanUtil.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest); udiwmsUnitRequest.setUnitId(thrUnitMaintainFilterRequest.getErpId()); ThrSystemEntity thrSystemEntity = basicThirdSysService.selectByThirdId(thrUnitMaintainFilterRequest.getThirdSysFk()); try { diff --git a/src/main/java/com/glxp/api/http/NmpaUdiClient.java b/src/main/java/com/glxp/api/http/NmpaUdiClient.java index 1cdd310de..700a1e797 100644 --- a/src/main/java/com/glxp/api/http/NmpaUdiClient.java +++ b/src/main/java/com/glxp/api/http/NmpaUdiClient.java @@ -1,5 +1,6 @@ package com.glxp.api.http; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.ProductInfoEntity; @@ -38,7 +39,7 @@ public class NmpaUdiClient { String myUuid = UuidUtils.getUUId(); for (ProductInfoEntity productInfoEntity : productInfoEntityList) { UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(productInfoEntity, udiProductEntity); + BeanUtil.copyProperties(productInfoEntity, udiProductEntity); udiProductEntity.setUuid(myUuid); udiProductEntity.setOriginUuid(productInfoEntity.getUuid()); udiProductEntity.setQxlb(productInfoEntity.getCplx()); @@ -81,7 +82,7 @@ public class NmpaUdiClient { List udiInfoEntities = new ArrayList<>(); for (ProductInfoEntity productInfoEntity : datas) { UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(productInfoEntity, udiProductEntity); + BeanUtil.copyProperties(productInfoEntity, udiProductEntity); udiProductEntity.setQxlb(productInfoEntity.getCplx()); udiProductEntity.setCplb(productInfoEntity.getHchzsb()); udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); diff --git a/src/main/java/com/glxp/api/req/inout/PdaPostOrderRequest.java b/src/main/java/com/glxp/api/req/inout/PdaPostOrderRequest.java new file mode 100644 index 000000000..a83a05483 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/PdaPostOrderRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.entity.inout.*; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class PdaPostOrderRequest implements Serializable { + + IoOrderEntity orderEntity; + List orderDetailBizEntities; + List orderDetailResultEntities; + List orderDetailCodeEntities; + List codeTempEntities; + +} diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java index cc4ff33e5..0d53b1a0d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.auth.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.http.HttpUtil; @@ -57,7 +58,7 @@ public class SysMenuServiceImpl implements ISysMenuService { List menuList = null; // 管理员显示所有菜单信息 FilterMenuRequest filterMenuRequest = new FilterMenuRequest(); - BeanUtils.copyProperties(menu, filterMenuRequest); + BeanUtil.copyProperties(menu, filterMenuRequest); if (Constant.ADMIN_ID.equals(userId + "")) { menuList = sysMenuDao.selectMenuList(filterMenuRequest); } else { diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index ac3f5d5ed..a4f8fc4bf 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import cn.hutool.core.bean.BeanUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.UdiProductEntity; @@ -178,7 +179,7 @@ public class BasicBackUpdateProductService { filterThrProductsRequest = new FilterThrProductsRequest(); } FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); - BeanUtils.copyProperties(filterThrProductsRequest, filterThrInvProductsRequest); + BeanUtil.copyProperties(filterThrProductsRequest, filterThrInvProductsRequest); filterThrInvProductsRequest.setPage(null); List thrProductsEntities = thrProductsService.filterThrProducts(filterThrInvProductsRequest); diff --git a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java index 2f22d2148..db59992e7 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; @@ -64,7 +65,7 @@ public class BasicUpdateProductService { if (thrProductsEntities != null && thrProductsEntities.size() > 0) { ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0); UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); + BeanUtil.copyProperties(thrProductsEntity, udiProductEntity); udiProductEntity.setNameCode(thrProductsEntity.getCode()); udiProductEntity.setCpmctymc(thrProductsEntity.getName()); udiProductEntity.setManufactory(thrProductsEntity.getManufactory()); diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java index 7d270fc47..1ee6219e9 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java @@ -41,7 +41,7 @@ public class CompanyProductsRelService { } else {//一键导出 //todo暂时去掉 // FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); -// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); +// BeanUtil.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); // filterUdiInfoRequest.setPage(null); // List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); // for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 50516d533..be0055951 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.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; @@ -168,7 +169,7 @@ public class UdiContrastService { udiRelevanceEntity.setIsDisable(false); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); + BeanUtil.copyProperties(thrProductsEntity, udiProductEntity); udiProductEntity.setNameCode(thrProductsEntity.getCode()); udiProductEntity.setCpmctymc(thrProductsEntity.getName()); udiProductEntity.setManufactory(thrProductsEntity.getManufactory()); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java index 2171bbf9d..8efdf67eb 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpImportLogDao; @@ -115,7 +116,7 @@ public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService ThrCorpDao mapper = batchSession.getMapper(ThrCorpDao.class); thrCorpEntities.forEach(thrCorpEntity -> { ThrCorpEntity thrCorpEntity1=new ThrCorpEntity(); - BeanUtils.copyProperties(thrCorpEntity1, thrCorpEntity); + BeanUtil.copyProperties(thrCorpEntity1, thrCorpEntity); mapper.importThrCorp(thrCorpEntity1); }); batchSession.commit(); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index 0700853e5..b21a2f71c 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageHelper; @@ -357,7 +358,7 @@ public class BasicProductsImportLogServiceImpl implements BasicProductsImportLog for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { BasicProductsImportDetailEntity udiInfoImportEntity = new BasicProductsImportDetailEntity(); udiInfoImportEntity.setUdiCode(udiRelevanceResponse.getNameCode()); - BeanUtils.copyProperties(udiRelevanceResponse, udiInfoImportEntity); + BeanUtil.copyProperties(udiRelevanceResponse, udiInfoImportEntity); udiInfoImportEntity.setUpdateTime(new Date()); udiInfoImportEntity.setGenKeyFk(genKey); if (udiRelevanceResponse.getUseDy()) { diff --git a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index 4fef3ba09..f27701dea 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.ProductInfoDao; import com.glxp.api.entity.basic.ProductInfoEntity; @@ -140,7 +141,7 @@ public class ProductInfoServiceImpl implements ProductInfoService { public Long filterUdiNoPageCount(ProductInfoFilterRequest request) { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); - BeanUtils.copyProperties(request, productInfoFilterRequest); + BeanUtil.copyProperties(request, productInfoFilterRequest); if (productInfoFilterRequest.getPage() != null) { int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 454cccc9e..e94d881b4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -20,6 +20,7 @@ import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; import com.glxp.api.entity.inout.PdaCodeEntity; +import com.glxp.api.req.inout.PdaPostOrderRequest; import com.glxp.api.req.inout.PostOrderRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.BasicCorpService; @@ -406,111 +407,146 @@ public class IoAddInoutService { } - //手持终端上传生成扫码单据 - public void creatOrderByPda(PostOrderRequest postOrderRequest) { - List postOrders = postOrderRequest.getPostOrders(); - if (postOrders != null && postOrders.size() > 0) { - for (int i = 0; i < postOrders.size(); i++) { - PostOrderRequest.PostOrder postOrder = postOrders.get(i); - //创建单据 - PdaOrderEntity pdaOrderEntity = postOrder.getOrderBean(); - IoOrderEntity orderEntity = null; - if (StrUtil.isNotEmpty(pdaOrderEntity.getDocid())) { - orderEntity = orderService.findByBillNo(pdaOrderEntity.getDocid()); - } - if (orderEntity != null) { - //已包含业务单据校验 - orderEntity.setUpdateUser(postOrderRequest.getUserId() + ""); - orderEntity.setUpdateTime(new Date()); - orderService.update(orderEntity); - List pdaCodeEntities = postOrder.getCodes(); - if (pdaCodeEntities != null && pdaCodeEntities.size() > 0) { - PdaCodeEntity pdaCodeEntity = pdaCodeEntities.get(0); - //写入条码 - List ioCodeEnttities = new ArrayList<>(); - for (int index = 0; index < pdaCodeEntities.size(); index++) { - IoCodeTempEntity codeEnttity = new IoCodeTempEntity(); - BeanUtils.copyProperties(pdaCodeEntities.get(index), codeEnttity); - codeEnttity.setAction(orderEntity.getAction()); - codeEnttity.setMainAction(orderEntity.getMainAction()); - codeEnttity.setDeptCode(orderEntity.getDeptCode()); - codeEnttity.setOrderId(orderEntity.getBillNo()); - codeEnttity.setInvCode(orderEntity.getInvCode()); - codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); - codeEnttity.setUpdateTime(new Date()); - codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); - ioCodeEnttities.add(codeEnttity); - } - codeTempService.insertBatch(ioCodeEnttities); - dealProcess(orderEntity); - if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { - ioCheckInoutService.check(orderEntity.getBillNo()); - } - } - } else { - //创建新单据 - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(pdaOrderEntity.getType()); - String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); - IoOrderEntity orderSaveRequest = new IoOrderEntity(); - orderSaveRequest.setBillNo(orderNo); - orderSaveRequest.setMainAction(pdaOrderEntity.getInout()); - orderSaveRequest.setAction(pdaOrderEntity.getType()); - orderSaveRequest.setCorpOrderId(pdaOrderEntity.getOrder()); - orderSaveRequest.setFromCorp(pdaOrderEntity.getFromCorpID()); - orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId()); - orderSaveRequest.setFromDeptCode(pdaOrderEntity.getFromDeptCode()); - orderSaveRequest.setFromInvCode(pdaOrderEntity.getFromInvCode()); - orderSaveRequest.setDeptCode(pdaOrderEntity.getDeptCode()); - orderSaveRequest.setInvCode(pdaOrderEntity.getInvCode()); - orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - orderSaveRequest.setDealStatus(ConstantStatus.ORDER_DEAL_POST); - orderSaveRequest.setCreateUser(postOrderRequest.getUserId() + ""); - orderSaveRequest.setUpdateUser(postOrderRequest.getUserId() + ""); - orderSaveRequest.setUpdateTime(new Date()); - orderSaveRequest.setBusType(bussinessTypeEntity.getBusType()); - orderSaveRequest.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); - if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0) - orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED); - else - orderSaveRequest.setFromType(ConstantStatus.FROM_PDAUN); - List pdaCodeEntities = postOrder.getCodes(); - if (pdaCodeEntities != null && pdaCodeEntities.size() > 0) { - PdaCodeEntity pdaCodeEntity = pdaCodeEntities.get(0); - if (pdaCodeEntity.getActDate() != null) { - orderSaveRequest.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); - } - //写入条码 - List ioCodeEnttities = new ArrayList<>(); - for (int index = 0; index < pdaCodeEntities.size(); index++) { - IoCodeTempEntity codeEnttity = new IoCodeTempEntity(); - BeanUtils.copyProperties(pdaCodeEntities.get(index), codeEnttity); - codeEnttity.setAction(orderSaveRequest.getAction()); - codeEnttity.setMainAction(orderSaveRequest.getMainAction()); - codeEnttity.setDeptCode(orderSaveRequest.getDeptCode()); - codeEnttity.setOrderId(orderSaveRequest.getBillNo()); - codeEnttity.setInvCode(orderSaveRequest.getInvCode()); - codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); - codeEnttity.setUpdateTime(new Date()); - codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); - ioCodeEnttities.add(codeEnttity); - } - codeTempService.insertBatch(ioCodeEnttities); - } - orderService.insertOrder(orderSaveRequest); - dealProcess(orderSaveRequest); - if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { - ioCheckInoutService.check(orderEntity.getBillNo()); - } - } + /** + * 手持终端上传生成扫码单据 + * + * @param pdaPostOrderRequest + * @return + */ + public BaseResponse creatOrderByPda(PdaPostOrderRequest pdaPostOrderRequest) { + IoOrderEntity orderEntity = pdaPostOrderRequest.getOrderEntity(); + IoOrderEntity tempEntity = orderService.findByBillNo(orderEntity.getBillNo()); + if (tempEntity != null) { + return ResultVOUtils.error(500, "单据已存在，请勿重复提交"); + } + tempEntity = orderService.findByCorpOrderId(orderEntity.getBillNo()); + if (tempEntity != null) { + return ResultVOUtils.error(500, "单据已存在，请勿重复提交"); + } + if (CollUtil.isNotEmpty(pdaPostOrderRequest.getCodeTempEntities())) { + codeTempService.insertBatch(pdaPostOrderRequest.getCodeTempEntities()); + } + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + orderEntity.setBillNo(orderNo); + orderService.insertOrder(orderEntity); - } + dealProcess(orderEntity); + if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); } + return ResultVOUtils.success("单据上传成功！"); + +// List postOrders = postOrderRequest.getPostOrders(); +// if (postOrders != null && postOrders.size() > 0) { +// for (int i = 0; i < postOrders.size(); i++) { +// PostOrderRequest.PostOrder postOrder = postOrders.get(i); +// //创建单据 +// PdaOrderEntity pdaOrderEntity = postOrder.getOrderBean(); +// IoOrderEntity orderEntity = null; +// if (StrUtil.isNotEmpty(pdaOrderEntity.getDocid())) { +// orderEntity = orderService.findByBillNo(pdaOrderEntity.getDocid()); +// } +// if (orderEntity != null) { +// //已包含业务单据校验 +// orderEntity.setUpdateUser(postOrderRequest.getUserId() + ""); +// orderEntity.setUpdateTime(new Date()); +// orderService.update(orderEntity); +// List pdaCodeEntities = postOrder.getCodes(); +// if (pdaCodeEntities != null && pdaCodeEntities.size() > 0) { +// PdaCodeEntity pdaCodeEntity = pdaCodeEntities.get(0); +// //写入条码 +// List ioCodeEnttities = new ArrayList<>(); +// for (int index = 0; index < pdaCodeEntities.size(); index++) { +// IoCodeTempEntity codeEnttity = new IoCodeTempEntity(); +// BeanUtil.copyProperties(pdaCodeEntities.get(index), codeEnttity); +// codeEnttity.setAction(orderEntity.getAction()); +// codeEnttity.setMainAction(orderEntity.getMainAction()); +// codeEnttity.setDeptCode(orderEntity.getDeptCode()); +// codeEnttity.setOrderId(orderEntity.getBillNo()); +// codeEnttity.setInvCode(orderEntity.getInvCode()); +// codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); +// codeEnttity.setUpdateTime(new Date()); +// codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); +// ioCodeEnttities.add(codeEnttity); +// } +// codeTempService.insertBatch(ioCodeEnttities); +// dealProcess(orderEntity); +// if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { +// ioCheckInoutService.check(orderEntity.getBillNo()); +// } +// } +// } else { +// //创建新单据 +// BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(pdaOrderEntity.getType()); +// String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); +// IoOrderEntity orderSaveRequest = new IoOrderEntity(); +// orderSaveRequest.setBillNo(orderNo); +// orderSaveRequest.setMainAction(pdaOrderEntity.getInout()); +// orderSaveRequest.setAction(pdaOrderEntity.getType()); +// orderSaveRequest.setCorpOrderId(pdaOrderEntity.getOrder()); +// orderSaveRequest.setFromCorp(pdaOrderEntity.getFromCorpID()); +// orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId()); +// orderSaveRequest.setFromDeptCode(pdaOrderEntity.getFromDeptCode()); +// orderSaveRequest.setFromInvCode(pdaOrderEntity.getFromInvCode()); +// orderSaveRequest.setDeptCode(pdaOrderEntity.getDeptCode()); +// orderSaveRequest.setInvCode(pdaOrderEntity.getInvCode()); +// orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); +// orderSaveRequest.setDealStatus(ConstantStatus.ORDER_DEAL_POST); +// orderSaveRequest.setCreateUser(postOrderRequest.getUserId() + ""); +// orderSaveRequest.setUpdateUser(postOrderRequest.getUserId() + ""); +// orderSaveRequest.setUpdateTime(new Date()); +// orderSaveRequest.setBusType(bussinessTypeEntity.getBusType()); +// orderSaveRequest.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); +// if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0) +// orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED); +// else +// orderSaveRequest.setFromType(ConstantStatus.FROM_PDAUN); +// List pdaCodeEntities = postOrder.getCodes(); +// if (pdaCodeEntities != null && pdaCodeEntities.size() > 0) { +// PdaCodeEntity pdaCodeEntity = pdaCodeEntities.get(0); +// if (pdaCodeEntity.getActDate() != null) { +// orderSaveRequest.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); +// } +// //写入条码 +// List ioCodeEnttities = new ArrayList<>(); +// for (int index = 0; index < pdaCodeEntities.size(); index++) { +// IoCodeTempEntity codeEnttity = new IoCodeTempEntity(); +// BeanUtil.copyProperties(pdaCodeEntities.get(index), codeEnttity); +// codeEnttity.setAction(orderSaveRequest.getAction()); +// codeEnttity.setMainAction(orderSaveRequest.getMainAction()); +// codeEnttity.setDeptCode(orderSaveRequest.getDeptCode()); +// codeEnttity.setOrderId(orderSaveRequest.getBillNo()); +// codeEnttity.setInvCode(orderSaveRequest.getInvCode()); +// codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode())); +// codeEnttity.setUpdateTime(new Date()); +// codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate())); +// ioCodeEnttities.add(codeEnttity); +// } +// codeTempService.insertBatch(ioCodeEnttities); +// } +// orderService.insertOrder(orderSaveRequest); +// dealProcess(orderSaveRequest); +// if (!ioCheckInoutService.checkManual(orderEntity.getBillNo())) { +// ioCheckInoutService.check(orderEntity.getBillNo()); +// } +// } +// +// +// } +// } + } + /** + * 待配货，待校验单据提交 + * + * @return + */ + public BaseResponse waitOrderByPda(PdaPostOrderRequest pdaPostOrderRequest) { + return ResultVOUtils.success("提交成功！"); } - @Resource - UdiCalCountUtil udiCalCountUtil; //校验条码关联供应商 public String checkExitSup(Long relId) { diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 940cad261..9aeb5f3ed 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.IdUtil; @@ -181,7 +182,7 @@ public class IoChangeInoutService { List temps; temps = filterSupMaps.get(corpName); IoOrderEntity outOrder = new IoOrderEntity(); - BeanUtils.copyProperties(orderEntity, outOrder); + BeanUtil.copyProperties(orderEntity, outOrder); outOrder.setId(null); outOrder.setSupplementNo(null);//补单需置空 if (bussinessChangeTypeEntity.getBeforeTime() != null) @@ -248,7 +249,7 @@ public class IoChangeInoutService { List codeTempEntities = new ArrayList<>(); for (IoCodeEntity warehouseEntity : temps) { IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); - BeanUtils.copyProperties(warehouseEntity, codeTempEntity); + BeanUtil.copyProperties(warehouseEntity, codeTempEntity); codeTempEntity.setId(null); codeTempEntity.setOrderId(outOrder.getBillNo()); codeTempEntity.setAction(outOrder.getAction()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 521ecfba2..5bcfb2655 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -210,7 +211,7 @@ public class IoCheckInoutService { { //生成单据结果 IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); + BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); orderDetailResultEntity.setId(null); @@ -223,7 +224,7 @@ public class IoCheckInoutService { List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { IoCodeEntity codeEnttity = new IoCodeEntity(); - BeanUtils.copyProperties(codeTempEntity, codeEnttity); + BeanUtil.copyProperties(codeTempEntity, codeEnttity); codeEnttity.setId(null); codeService.insert(codeEnttity); } @@ -248,7 +249,7 @@ public class IoCheckInoutService { List orderDetailCodeEntities = null; for (IoCodeTempEntity codeTempEntity : codeTempEntities) { IoCodeEntity codeEnttity = new IoCodeEntity(); - BeanUtils.copyProperties(codeTempEntity, codeEnttity); + BeanUtil.copyProperties(codeTempEntity, codeEnttity); codeEnttity.setId(null); codeService.insert(codeEnttity); orderDetailCodeEntities = addInoutService.genOrderDetailCode(orderEntity, codeTempEntity); @@ -268,7 +269,7 @@ public class IoCheckInoutService { { //生成单据结果 IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); + BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); orderDetailResultEntity.setId(null); @@ -416,7 +417,7 @@ public class IoCheckInoutService { { //生成业务单据 IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); + BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount()); orderDetailBizEntity.setId(null); orderDetailBizService.insert(orderDetailBizEntity); @@ -427,7 +428,7 @@ public class IoCheckInoutService { { //生成单据结果 IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); + BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); orderDetailResultEntity.setCount(orderDetailCodeEntity.getReCount()); orderDetailResultEntity.setReCount(orderDetailCodeEntity.getReCount()); orderDetailResultEntity.setId(null); @@ -440,7 +441,7 @@ public class IoCheckInoutService { List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { IoCodeEntity codeEnttity = new IoCodeEntity(); - BeanUtils.copyProperties(codeTempEntity, codeEnttity); + BeanUtil.copyProperties(codeTempEntity, codeEnttity); codeEnttity.setId(null); codeService.insert(codeEnttity); } @@ -546,7 +547,7 @@ public class IoCheckInoutService { orderDetailResultService.deleteByOrderId(orderEntity.getBillNo()); for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) { IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); - BeanUtils.copyProperties(orderDetailBizEntity, orderDetailResultEntity); + BeanUtil.copyProperties(orderDetailBizEntity, orderDetailResultEntity); orderDetailResultEntity.setId(null); orderDetailResultEntity.setReCount(orderDetailBizEntity.getScanCount()); orderDetailResultService.insert(orderDetailResultEntity); @@ -556,7 +557,7 @@ public class IoCheckInoutService { List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { IoCodeEntity codeEnttity = new IoCodeEntity(); - BeanUtils.copyProperties(codeTempEntity, codeEnttity); + BeanUtil.copyProperties(codeTempEntity, codeEnttity); codeService.insert(codeEnttity); } codeTempService.deleteByBillNo(orderEntity.getBillNo()); @@ -657,7 +658,7 @@ public class IoCheckInoutService { //初始化默认值 for (IoOrderDetailBizResponse bizResponse : orderDetailBizEntities) { IoOrderDetailBizEntity bizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(bizResponse, bizEntity); + BeanUtil.copyProperties(bizResponse, bizEntity); for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null && checkBatchNo(bizEntity, codeEntity) == null @@ -696,7 +697,7 @@ public class IoCheckInoutService { ) { //将产品ID,批次号匹配的合并，添加到列表 IoOrderCheckResultResponse ioOrderCheckResultResponse = new IoOrderCheckResultResponse(); - BeanUtils.copyProperties(bizEntity, ioOrderCheckResultResponse); + BeanUtil.copyProperties(bizEntity, ioOrderCheckResultResponse); ioOrderCheckResultResponse.setBBatchNo(bizEntity.getBatchNo()); ioOrderCheckResultResponse.setBProductDate(bizEntity.getProductDate()); ioOrderCheckResultResponse.setBExpireDate(bizEntity.getExpireDate()); @@ -718,7 +719,7 @@ public class IoCheckInoutService { if (!isPass) { //将未与扫码单 IoOrderCheckResultResponse ioOrderCheckResultResponse = new IoOrderCheckResultResponse(); - BeanUtils.copyProperties(bizEntity, ioOrderCheckResultResponse); + BeanUtil.copyProperties(bizEntity, ioOrderCheckResultResponse); ioOrderCheckResultResponse.setBBatchNo(bizEntity.getBatchNo()); ioOrderCheckResultResponse.setBProductDate(bizEntity.getProductDate()); ioOrderCheckResultResponse.setBExpireDate(bizEntity.getExpireDate()); @@ -730,7 +731,7 @@ public class IoCheckInoutService { for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { if (!codeEntity.isCheckSuccess()) { IoOrderCheckResultResponse ioOrderCheckResultResponse = new IoOrderCheckResultResponse(); - BeanUtils.copyProperties(codeEntity, ioOrderCheckResultResponse); + BeanUtil.copyProperties(codeEntity, ioOrderCheckResultResponse); ioOrderCheckResultResponse.setSBatchNo(codeEntity.getBatchNo()); ioOrderCheckResultResponse.setSProductDate(codeEntity.getProductDate()); ioOrderCheckResultResponse.setSExpireDate(codeEntity.getExpireDate()); @@ -798,7 +799,7 @@ public class IoCheckInoutService { public void codeOrderCheck2(List orderDetailCodeEntities, List orderDetailBizEntities) { for (IoOrderDetailCodeResponse codeResponse : orderDetailCodeEntities) { IoOrderDetailCodeEntity codeEntity = new IoOrderDetailCodeEntity(); - BeanUtils.copyProperties(codeResponse, codeEntity); + BeanUtil.copyProperties(codeResponse, codeEntity); for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { if (!bizEntity.isCheckSuccess() && !codeEntity.isCheckSuccess() && checkId(bizEntity, codeEntity) == null && checkBatchNo(bizEntity, codeEntity) == null @@ -1053,7 +1054,7 @@ public class IoCheckInoutService { for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) { if (IntUtil.value(invPreInProductDetailEntity.getReCount()) > 0) { IoCodeEntity ioCodeEntity = new IoCodeEntity(); - BeanUtils.copyProperties(invPreInProductDetailEntity, ioCodeEntity); + BeanUtil.copyProperties(invPreInProductDetailEntity, ioCodeEntity); ioCodeEntity.setWarehouseCode(invPreInProductDetailEntity.getInvSpaceCode()); backCodeList.add(ioCodeEntity); } @@ -1124,7 +1125,7 @@ public class IoCheckInoutService { List codeTempEntities = new ArrayList<>(); for (IoCodeEntity warehouseEntity : backCodeList) { IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); - BeanUtils.copyProperties(warehouseEntity, codeTempEntity); + BeanUtil.copyProperties(warehouseEntity, codeTempEntity); codeTempEntity.setId(null); codeTempEntity.setOrderId(outOrder.getBillNo()); codeTempEntity.setAction(outOrder.getAction()); diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 9edc7ab2b..939a9a47f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; @@ -99,7 +100,7 @@ public class IoGenInvService { List invProductDetailEntities = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEnttities) { InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invProductDetailEntity); + BeanUtil.copyProperties(codeEntity, invProductDetailEntity); invProductDetailEntity.setRelId(codeEntity.getRelId()); invProductDetailEntity.setUpdateTime(new Date()); invProductDetailEntity.setId(null); @@ -164,7 +165,7 @@ public class IoGenInvService { List invUserProductDetailEntityList = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEnttities) { InvUserProductDetailEntity invUserProductDetailEntity = new InvUserProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invUserProductDetailEntity); + BeanUtil.copyProperties(codeEntity, invUserProductDetailEntity); invUserProductDetailEntity.setRelId(codeEntity.getRelId()); invUserProductDetailEntity.setUpdateTime(new Date()); invUserProductDetailEntity.setId(null); @@ -229,7 +230,7 @@ public class IoGenInvService { List invProductDetailEntities = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEnttities) { InvPreProductDetailEntity invProductDetailEntity = new InvPreProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invProductDetailEntity); + BeanUtil.copyProperties(codeEntity, invProductDetailEntity); invProductDetailEntity.setRelId(codeEntity.getRelId()); invProductDetailEntity.setUpdateTime(new Date()); invProductDetailEntity.setId(null); @@ -289,7 +290,7 @@ public class IoGenInvService { List invUserProductDetailEntityList = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEnttities) { InvUserProductDetailEntity invUserProductDetailEntity = new InvUserProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invUserProductDetailEntity); + BeanUtil.copyProperties(codeEntity, invUserProductDetailEntity); invUserProductDetailEntity.setRelId(codeEntity.getRelId()); invUserProductDetailEntity.setUpdateTime(new Date()); invUserProductDetailEntity.setId(null); @@ -318,14 +319,14 @@ public class IoGenInvService { IoOrderEntity orderEntity = orderService.findByBillNo(orderId); if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { InvPreinOrderEntity invPreinOrderEntity = new InvPreinOrderEntity(); - BeanUtils.copyProperties(orderEntity, invPreinOrderEntity); + BeanUtil.copyProperties(orderEntity, invPreinOrderEntity); invPreinOrderService.insert(invPreinOrderEntity); List codeEnttities = codeService.findByOrderId(orderId); List invPreinDetailEntities = new ArrayList<>(); codeEnttities.forEach(codeEntity -> { InvPreinDetailEntity invPreinDetailEntity = new InvPreinDetailEntity(); - BeanUtils.copyProperties(codeEntity, invPreinDetailEntity); + BeanUtil.copyProperties(codeEntity, invPreinDetailEntity); invPreinDetailEntity.setId(null); invPreinDetailEntity.setStatus(ConstantStatus.INVIN_IN); invPreinDetailEntity.setOriginCount(codeEntity.getCount()); @@ -372,7 +373,7 @@ public class IoGenInvService { List invProductDetailEntities = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEnttities) { InvPreInProductDetailEntity invProductDetailEntity = new InvPreInProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invProductDetailEntity); + BeanUtil.copyProperties(codeEntity, invProductDetailEntity); invProductDetailEntity.setRelId(codeEntity.getRelId()); invProductDetailEntity.setUpdateTime(new Date()); invProductDetailEntity.setId(null); @@ -437,7 +438,7 @@ public class IoGenInvService { List invUserProductDetailEntityList = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEnttities) { InvUserProductDetailEntity invUserProductDetailEntity = new InvUserProductDetailEntity(); - BeanUtils.copyProperties(codeEntity, invUserProductDetailEntity); + BeanUtil.copyProperties(codeEntity, invUserProductDetailEntity); invUserProductDetailEntity.setRelId(codeEntity.getRelId()); invUserProductDetailEntity.setUpdateTime(new Date()); invUserProductDetailEntity.setId(null); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 2c29c59a0..92d4ccfce 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -25,6 +25,9 @@ public interface IoOrderService { IoOrderEntity findByBillNo(String billNO); + IoOrderEntity findByCorpOrderId(String billNO); + + IoOrderResponse findGroupBillNo(String billNo); List findByStatus(String action, Integer status, Date lastUpdateTime); @@ -149,7 +152,7 @@ public interface IoOrderService { List selectOrderIdList(@Param("data") String data); - void updateOrderInventory(String billNo,Integer status); + void updateOrderInventory(String billNo, Integer status); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java index e0b28e805..f49703fcb 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -41,7 +42,7 @@ public class IoOrderInvoiceService extends ServiceImpl 0; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index ce68c067f..b516c6aed 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -149,6 +149,15 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.selectOne(new QueryWrapper().eq("billNo", billNO)); } + @Override + public IoOrderEntity findByCorpOrderId(String billNO) { + List orderEntities = orderDao.selectList(new QueryWrapper().eq("billNo", billNO)); + if (CollUtil.isNotEmpty(orderEntities)) { + return orderEntities.get(0); + } + return null; + } + @Override public IoOrderResponse findGroupBillNo(String billNo) { FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); @@ -569,7 +578,7 @@ public class IoOrderServiceImpl implements IoOrderService { List codeTempEntities = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEntityList) { IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); - BeanUtils.copyProperties(codeEntity, codeTempEntity); + BeanUtil.copyProperties(codeEntity, codeTempEntity); codeTempEntity.setId(null); codeTempEntities.add(codeTempEntity); } @@ -1091,12 +1100,12 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.getfilterOrderList(filterOrderRequest); } - public Boolean setInvProductEntityList(List ioOrderDetailResultEntityList,IoOrderEntity ioOrderEntity) { + public Boolean setInvProductEntityList(List ioOrderDetailResultEntityList, IoOrderEntity ioOrderEntity) { for (IoOrderDetailResultEntity ioOrderDetailResultEntity : ioOrderDetailResultEntityList) { //查询该产品是不是存在 InvProductEntity invProductEntity = invProductService.selectByUnique(ioOrderDetailResultEntity.getBindRlFk(), ioOrderDetailResultEntity.getBatchNo(), - ioOrderDetailResultEntity.getSupId(),ioOrderEntity.getDeptCode(),ioOrderEntity.getInvCode()); + ioOrderDetailResultEntity.getSupId(), ioOrderEntity.getDeptCode(), ioOrderEntity.getInvCode()); if (invProductEntity == null) { //没有该产品就填充数据 invProductEntity = new InvProductEntity(); diff --git a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java b/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java index ef5303192..75fe7d77b 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inv; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -40,7 +41,7 @@ public class DeviceProjectSetService extends ServiceImpl 0; @@ -54,7 +55,7 @@ public class DeviceProjectSetService extends ServiceImpl 0; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index a99e5505b..062595b7a 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inv.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -193,7 +194,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) { for (int i = 0; i < pdfPrintCount.getRowCount(); i++) { InnerOrderPrintResponse clone = new InnerOrderPrintResponse(); - BeanUtils.copyProperties(InnerOrderPrintResponse, clone); + BeanUtil.copyProperties(InnerOrderPrintResponse, clone); printEntities.add(clone); } } else { diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index e69924ba0..4803ffe2e 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -2016,7 +2016,7 @@ public class HeartService { for (IoCodeEntity warehouseEntity : warehouseEntityList) { if (warehouseEntity.getOrderId().equals(orderEntity.getBillNo())) { IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); - BeanUtils.copyProperties(warehouseEntity, codeTempEntity); + BeanUtil.copyProperties(warehouseEntity, codeTempEntity); codeTempEntity.setId(null); codeTempService.insert(codeTempEntity); } diff --git a/src/main/java/com/glxp/api/service/sync/UpBasicService.java b/src/main/java/com/glxp/api/service/sync/UpBasicService.java index e453cda21..ab21683d0 100644 --- a/src/main/java/com/glxp/api/service/sync/UpBasicService.java +++ b/src/main/java/com/glxp/api/service/sync/UpBasicService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.sync; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.*; @@ -87,7 +88,7 @@ public class UpBasicService { SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); List orderEntities = new ArrayList<>(); FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + BeanUtil.copyProperties(spsSyncDataRequest, orderFilterRequest); if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { List temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime())); @@ -149,7 +150,7 @@ public class UpBasicService { SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); List purOrderEntities = new ArrayList<>(); FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + BeanUtil.copyProperties(spsSyncDataRequest, orderFilterRequest); if (CollUtil.isNotEmpty(syncDataSetEntity.getChangeBusTypes())) { for (SyncDataChangeBustypesEntity syncDataChangeBustypesEntity : syncDataSetEntity.getChangeBusTypes()) { if (syncDataChangeBustypesEntity.getAction().equals(ConstantStatus.BUS_ORDER_CGDD)) { @@ -230,7 +231,7 @@ public class UpBasicService { if (syncDataSetEntity.getBasicDept() == 1) { //获取部门信息 FilterInvWarehouseRequest filterDeptRequest = new FilterInvWarehouseRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterDeptRequest); + BeanUtil.copyProperties(spsSyncDataRequest, filterDeptRequest); List deptEntityList = deptService.filterGroupInvWarehouse(filterDeptRequest); syncDataResponse.setDeptEntityList(deptEntityList); @@ -287,7 +288,7 @@ public class UpBasicService { //系统用户信息 if (syncDataSetEntity.getSysUser() == 1) { FilterAuthUserRequest authAdminQueryRequest = new FilterAuthUserRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, authAdminQueryRequest); + BeanUtil.copyProperties(spsSyncDataRequest, authAdminQueryRequest); List authAdminList = authAdminService.listAdminPage(authAdminQueryRequest); syncDataResponse.setAuthAdminList(authAdminList); } diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java index b52e3227c..f2df1bca8 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.sync.impl; +import cn.hutool.core.bean.BeanUtil; import com.glxp.api.dao.system.SyncDataSetDao; import com.glxp.api.entity.system.SyncDataChangeBustypesEntity; import com.glxp.api.entity.system.SyncDataBustypeEntity; @@ -36,7 +37,7 @@ public class SyncDataSetServiceImpl implements SyncDataSetService { public SyncDataSetResponse selectSet() { SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet(); SyncDataSetResponse syncDataSetResponse = new SyncDataSetResponse(); - BeanUtils.copyProperties(syncDataSetEntity, syncDataSetResponse); + BeanUtil.copyProperties(syncDataSetEntity, syncDataSetResponse); List syncDataBustypeEntities = syncDataBustypeService.findAll(1); List syncDataToInBustypeEntities = syncDataBustypeService.findAll(2); List changeBustypesEntities = syncDataChangeBustypeService.findAll(); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index 2f5909e5e..9a0e0ddf6 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -77,7 +78,7 @@ public class ThrCorpsDlService { thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( item -> { ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); thrCorpEntity.setUnitId(item.getUnitId()); thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setCreateTime(new Date()); @@ -95,7 +96,7 @@ public class ThrCorpsDlService { List thrCorpEntities = temps.stream().map( item -> { ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setThirdSysFk(thirdSys); thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setCreateTime(new Date()); @@ -135,7 +136,7 @@ public class ThrCorpsDlService { List thrCorpEntities = thrCorpImportDetailEntities.stream().map( item -> { ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setThirdSysFk(thirdSys); return thrProductsEntity; @@ -206,7 +207,7 @@ public class ThrCorpsDlService { } else { //根据查询条件一键导出数据库往来单位 FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest); filterThrCorpRequest.setPage(null); List> genDatas = genExcelData(filterThrCorpRequest); if (genDatas != null && genDatas.size() > 0) { @@ -234,7 +235,7 @@ public class ThrCorpsDlService { thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( item -> { ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setThirdSysFk(thirdSys); @@ -245,7 +246,7 @@ public class ThrCorpsDlService { thrCorpEntities = thrCorpImportDetailEntities.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); // thrCorpEntity.setUnitId(item.getId()); thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setThirdSysFk(thirdSys); @@ -280,7 +281,7 @@ public class ThrCorpsDlService { thrCorpImportDetailEntities = erpUnitsResponses.stream().map( item -> { ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); thrCorpEntity.setUnitId(item.getUnitId()); thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setUpdateTime(new Date()); @@ -340,7 +341,7 @@ public class ThrCorpsDlService { List thrCorpEntities = erpUnitsResponses.stream().map( item -> { ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setUnitId(item.getId()); return thrProductsEntity; } @@ -359,7 +360,7 @@ public class ThrCorpsDlService { thrCorpEntityList = thrCorpsResponseList.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; } ).collect(Collectors.toList()); @@ -421,14 +422,14 @@ public class ThrCorpsDlService { //根据查询条件一键导出数据库往来单位 List thrCorpEntityList = new ArrayList<>(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest); filterThrCorpRequest.setPage(null); List thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); if (thrCorpsResponseList.size() > 0) { thrCorpEntityList = thrCorpsResponseList.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; } ).collect(Collectors.toList()); @@ -478,14 +479,14 @@ public class ThrCorpsDlService { //根据查询条件一键导出数据库往来单位 List thrCorpEntityList = new ArrayList<>(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest); filterThrCorpRequest.setPage(null); List thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); if (thrCorpsResponseList.size() > 0) { thrCorpEntityList = thrCorpsResponseList.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; } ).collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java index 9c1c42a97..4e364cdc8 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.thrsys.ThrProductsEntity; @@ -52,7 +53,7 @@ public class ThrDataService { List erpProductsResponses = udiDlDeviceResponse.getData().getList(); if (erpProductsResponses != null) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - BeanUtils.copyProperties(erpProductsResponses.get(0), thrProductsEntity); + BeanUtil.copyProperties(erpProductsResponses.get(0), thrProductsEntity); return thrProductsEntity; } } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java index 6ac7b4d42..4a7617551 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.config.WebSocketServer; import com.glxp.api.constant.BasicProcessStatus; @@ -57,7 +58,7 @@ public class ThrInvProductsDlService { List thrProductsEntities = ThrInvProductResponses.stream().map( item -> { ThrInvProductsImportDetailEntity thrProductsEntity = new ThrInvProductsImportDetailEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setInventoryCode(item.getCode()); thrProductsEntity.setInventoryName(item.getName()); thrProductsEntity.setGenKeyFk(genKey); @@ -78,7 +79,7 @@ public class ThrInvProductsDlService { List thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map( item -> { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); - BeanUtils.copyProperties(item, thrInvProductsEntity); + BeanUtil.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); thrInvProductsEntity.setCreateTime(new Date()); thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); @@ -114,7 +115,7 @@ public class ThrInvProductsDlService { List thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map( item -> { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); - BeanUtils.copyProperties(item, thrInvProductsEntity); + BeanUtil.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); thrInvProductsEntity.setCreateTime(new Date()); thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); @@ -172,13 +173,13 @@ public class ThrInvProductsDlService { if (thrSystemDetailEntity.getFromType() == 0) { //从第三方服务实时一键导出 FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); - BeanUtils.copyProperties(thrInvProductsExportRequest, filterThrInvProductsRequest); + BeanUtil.copyProperties(thrInvProductsExportRequest, filterThrInvProductsRequest); List thrInvProductsEntities = exportInvProducts(filterThrInvProductsRequest); excelData.addAll(getRows(thrInvProductsEntities)); } else { //从本地导出 FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); - BeanUtils.copyProperties(thrInvProductsExportRequest, filterThrInvProductsRequest); + BeanUtil.copyProperties(thrInvProductsExportRequest, filterThrInvProductsRequest); List> genDatas = genExcelData(null, filterThrInvProductsRequest); if (genDatas != null && genDatas.size() > 0) { excelData.addAll(genDatas); @@ -200,7 +201,7 @@ public class ThrInvProductsDlService { thrInvProductsImportDetailEntities = erpOnHandResponses.stream().map( item -> { ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity = new ThrInvProductsImportDetailEntity(); - BeanUtils.copyProperties(item, thrInvProductsImportDetailEntity); + BeanUtil.copyProperties(item, thrInvProductsImportDetailEntity); thrInvProductsImportDetailEntity.setInventoryCode(item.getCode()); thrInvProductsImportDetailEntity.setInventoryName(item.getName()); thrInvProductsImportDetailEntity.setThirdSysFk(thirdSys); @@ -218,7 +219,7 @@ public class ThrInvProductsDlService { thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map( item -> { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); - BeanUtils.copyProperties(item, thrInvProductsEntity); + BeanUtil.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); thrInvProductsEntity.setCreateTime(new Date()); thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); @@ -255,7 +256,7 @@ public class ThrInvProductsDlService { List thrProductsEntities = ThrInvProductResponses.stream().map( item -> { ThrInvProductsImportDetailEntity thrProductsEntity = new ThrInvProductsImportDetailEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setInventoryCode(item.getCode()); thrProductsEntity.setInventoryName(item.getName()); thrProductsEntity.setGenKeyFk(genKey); @@ -301,7 +302,7 @@ public class ThrInvProductsDlService { public List getInvProducts(int page, int limit, String invPiUrl, FilterThrInvProductsRequest filterThrInvProductsRequest) { ThrOnhandRequest ThrOnhandRequest = new ThrOnhandRequest(); - BeanUtils.copyProperties(filterThrInvProductsRequest, ThrOnhandRequest); + BeanUtil.copyProperties(filterThrInvProductsRequest, ThrOnhandRequest); ThrOnhandRequest.setPage(page); ThrOnhandRequest.setLimit(limit); @@ -312,7 +313,7 @@ public class ThrInvProductsDlService { List thrProductsEntities = ThrInvProductResponses.stream().map( item -> { ThrInvProductsEntity thrProductsEntity = new ThrInvProductsEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setInventoryCode(item.getCode()); thrProductsEntity.setInventoryName(item.getName()); return thrProductsEntity; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index 804a7de74..4dcca446e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; @@ -94,7 +95,7 @@ public class ThrOrdersDlService { if (erpOrderResponses != null && erpOrderResponses.size() > 0) { for (ThrOrderResponse erpOrderResponse : erpOrderResponses) { ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); + BeanUtil.copyProperties(erpOrderResponse, thrOrderEntity); thrOrderEntity.setThirdSysFk(thirdSys); ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); if (originEntity != null) { @@ -106,7 +107,7 @@ public class ThrOrdersDlService { for (ThrOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); thrOrderDetailEntity.setUpdateTime(new Date()); - BeanUtils.copyProperties(subPurchase, thrOrderDetailEntity); + BeanUtil.copyProperties(subPurchase, thrOrderDetailEntity); thrOrderDetailEntity.setThirdSysFk(thirdSys); thrOrderDetailEntity.setUpdateTime(new Date()); thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getBillNo()); @@ -202,12 +203,12 @@ public class ThrOrdersDlService { // if (basicThirdSysDetailEntity.getFromType() == 0) { // FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); // filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk()); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); +// BeanUtil.copyProperties(thrOrderExportRequest, filterThrOrderRequest); // List> datas = exportThrOrders(filterThrOrderRequest); // excelData.addAll(datas); // } else { // FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); +// BeanUtil.copyProperties(thrOrderExportRequest, filterThrOrderRequest); // List> genDatas = genExcelData(filterThrOrderRequest); // if (genDatas != null && genDatas.size() > 0) { // excelData.addAll(genDatas); @@ -249,16 +250,16 @@ public class ThrOrdersDlService { if (thrSystemDetailEntity.getFromType() == 0) { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); + BeanUtil.copyProperties(thrOrderExportRequest, filterThrOrderRequest); List datas = getThrOrders(filterThrOrderRequest); erpOrderResponses.addAll(datas); } else { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); + BeanUtil.copyProperties(thrOrderExportRequest, filterThrOrderRequest); List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); @@ -266,7 +267,7 @@ public class ThrOrdersDlService { List subErpOrders = new ArrayList<>(); for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } erpOrderResponse.setSubErpOrders(subErpOrders); @@ -308,14 +309,14 @@ public class ThrOrdersDlService { filterThrOrderRequest.setLimit(limit); filterThrOrderRequest.setBillAction(action); FilterThrOrderRequest filterOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); + BeanUtil.copyProperties(filterThrOrderRequest, filterOrderRequest); BaseResponse> responseBaseResponse = erpOrderClient.getThrOrderResponse(filterOrderRequest); if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { List erpOrderResponses = responseBaseResponse.getData().getList(); if (erpOrderResponses != null && erpOrderResponses.size() > 0) { for (ThrOrderResponse erpOrderResponse : erpOrderResponses) { ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); + BeanUtil.copyProperties(erpOrderResponse, thrOrderEntity); ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thirdSys); if (originEntity != null) { thrOrderService.deleteById(originEntity.getId() + ""); @@ -327,7 +328,7 @@ public class ThrOrdersDlService { List thrOrderDetailEntities = new ArrayList<>(); for (ThrOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); - BeanUtils.copyProperties(subPurchase, thrOrderDetailEntity); + BeanUtil.copyProperties(subPurchase, thrOrderDetailEntity); thrOrderDetailEntity.setThirdSysFk(thirdSys); thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getBillNo()); thrOrderDetailEntity.setUpdateTime(new Date()); @@ -377,7 +378,7 @@ public class ThrOrdersDlService { public List getThrOrders(int page, int limit, String orderQueryUrl, FilterThrOrderRequest filterThrOrderRequest) { FilterThrOrderRequest filterOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); + BeanUtil.copyProperties(filterThrOrderRequest, filterOrderRequest); filterOrderRequest.setPage(page); filterOrderRequest.setLimit(limit); BaseResponse> responseBaseResponse = erpOrderClient.getThrOrderResponse(filterOrderRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java index a2e211d1f..73a45e31e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -66,7 +67,7 @@ public class ThrProductsDlService { // thrProductsImportDetailEntities = thrProductsEntities.stream().map( // item -> { // ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); +// BeanUtil.copyProperties(item, thrProductsImportDetailEntity); // thrProductsImportDetailEntity.setSpec(item.getStandard()); // thrProductsImportDetailEntity.setThirdSysFk(thirdSys); // thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); @@ -81,7 +82,7 @@ public class ThrProductsDlService { // List thrProductsEntities1 = thrProductsImportDetailEntities1.stream().map( // item -> { // ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); +// BeanUtil.copyProperties(item, thrProductsEntity); // thrProductsEntity.setUpdateTime(new Date()); //// thrProductsService.insertOrUpdateSelective(thrProductsEntity); // return thrProductsEntity; @@ -113,7 +114,7 @@ public class ThrProductsDlService { // int limit = 50; // while (page != -1) { // FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); -// BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest); +// BeanUtil.copyProperties(filterThrProductsRequest, filterErpGoodsRequest); // page = getInvmandoc(thrProductsImportLogEntity, page, limit, piDetailEntity.getValue(), filterErpGoodsRequest.getThirdSys(), filterErpGoodsRequest); // } // FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); @@ -123,7 +124,7 @@ public class ThrProductsDlService { // List thrProductsEntities = thrProductsImportDetailEntities.stream().map( // item -> { // ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); +// BeanUtil.copyProperties(item, thrProductsEntity); // thrProductsEntity.setUpdateTime(new Date()); // return thrProductsEntity; // } @@ -188,13 +189,13 @@ public class ThrProductsDlService { // // if (basicThirdSysDetailEntity.getFromType() == 0) { // FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); +// BeanUtil.copyProperties(thrProductsExportRequest, filterThrProductsRequest); // List thrProductsEntities = exportThrProducts(filterThrProductsRequest); // excelData.addAll(getRows(thrProductsEntities)); // // } else { // FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); +// BeanUtil.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); // List> genDatas = genExcelData(null, filterThrInvProductsRequest); // if (genDatas != null && genDatas.size() > 0) { // excelData.addAll(genDatas); @@ -222,7 +223,7 @@ public class ThrProductsDlService { // List lists = thrProductsEntities.stream().map( // item -> { // ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); -// BeanUtils.copyProperties(item, thrProductsEntity); +// BeanUtil.copyProperties(item, thrProductsEntity); // return thrProductsEntity; // } // ).collect(Collectors.toList()); @@ -252,7 +253,7 @@ public class ThrProductsDlService { // List thrProductsEntities; // if (basicThirdSysDetailEntity.getFromType() == 0) { // FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); +// BeanUtil.copyProperties(thrProductsExportRequest, filterThrProductsRequest); // thrProductsEntities = exportThrProducts(filterThrProductsRequest); // } else { // FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); @@ -262,7 +263,7 @@ public class ThrProductsDlService { // List lists = thrProductsEntities.stream().map( // item -> { // ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); -// BeanUtils.copyProperties(item, thrProductsEntity); +// BeanUtil.copyProperties(item, thrProductsEntity); // return thrProductsEntity; // } // ).collect(Collectors.toList()); @@ -302,7 +303,7 @@ public class ThrProductsDlService { List lists = thrProductsEntities.stream().map( item -> { ThrProductsResponse thrProductsEntity = new ThrProductsResponse(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); return thrProductsEntity; } ).collect(Collectors.toList()); @@ -332,13 +333,13 @@ public class ThrProductsDlService { List thrProductsResponses = new ArrayList<>(); if (thrSystemDetailEntity.getFromType() == 0) { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); - BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); + BeanUtil.copyProperties(thrProductsExportRequest, filterThrProductsRequest); List thrProductsEntities = exportThrProducts(filterThrProductsRequest); if (thrProductsEntities.size() > 0) { thrProductsResponses = thrProductsEntities.stream().map( item -> { ThrProductsResponse thrProductsResponse = new ThrProductsResponse(); - BeanUtils.copyProperties(item, thrProductsResponse); + BeanUtil.copyProperties(item, thrProductsResponse); return thrProductsResponse; } ).collect(Collectors.toList()); @@ -351,7 +352,7 @@ public class ThrProductsDlService { List lists = thrProductsResponses.stream().map( item -> { ThrProductsResponse thrProductsEntity = new ThrProductsResponse(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); return thrProductsEntity; } ).collect(Collectors.toList()); @@ -391,7 +392,7 @@ public class ThrProductsDlService { // thrProductsImportDetailEntities = erpProductsResponses.stream().map( // item -> { // ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); +// BeanUtil.copyProperties(item, thrProductsImportDetailEntity); // thrProductsImportDetailEntity.setThirdSysFk(thirdSys); // thrProductsImportDetailEntity.setGenKeyFk(genKey); // return thrProductsImportDetailEntity; @@ -406,7 +407,7 @@ public class ThrProductsDlService { // thrProductsEntities = thrProductsImportDetailEntities.stream().map( // item -> { // ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); +// BeanUtil.copyProperties(item, thrProductsEntity); // thrProductsEntity.setUpdateTime(new Date()); // thrProductsService.insertOrUpdateSelective(thrProductsEntity); // return thrProductsEntity; @@ -439,7 +440,7 @@ public class ThrProductsDlService { // thrProductsImportDetailEntities = erpProductsResponses.stream().map( // item -> { // ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); +// BeanUtil.copyProperties(item, thrProductsImportDetailEntity); // thrProductsImportDetailEntity.setSpec(item.getStandard()); // thrProductsImportDetailEntity.setThirdSysFk(thirdSys); // thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); @@ -497,7 +498,7 @@ public class ThrProductsDlService { List thrProductsEntities = erpProductsResponses.stream().map( item -> { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); return thrProductsEntity; } ).collect(Collectors.toList()); @@ -527,7 +528,7 @@ public class ThrProductsDlService { if (id != null) { ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id); ThrProductsResponse thrProductsResponse = new ThrProductsResponse(); - BeanUtils.copyProperties(thrProductsEntity, thrProductsResponse); + BeanUtil.copyProperties(thrProductsEntity, thrProductsResponse); jsonData.add(thrProductsResponse); } else { jsonData = thrProductsService.filterJoinThrProducts(filterThrProductsRequest); @@ -583,14 +584,14 @@ public class ThrProductsDlService { if (thrSystemDetailEntity.getFromType() == 0) { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); - BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); + BeanUtil.copyProperties(thrProductsExportRequest, filterThrProductsRequest); List thrProductsEntities = exportThrProducts(filterThrProductsRequest); exportData.addAll(thrProductsEntities); } else { List exportData1 = new ArrayList<>(); FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); - BeanUtils.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); + BeanUtil.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); List jsonData = genJsonData(null, filterThrInvProductsRequest); exportData1.addAll(jsonData); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java index 2aaf92845..724148727 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.glxp.api.common.res.BaseResponse; @@ -62,7 +63,7 @@ public class ThrUnitImportService { imports.addAll(erpUnitsResponses); } else { FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); + BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); filterThrCorpRequest.setPage(null); List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index 5f51c4cde..d930cb5e3 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys.impl; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.dao.thrsys.ThrOrderImportLogDao; @@ -97,7 +98,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { for (List datas : map.values()) { ThrOrderImportDetailEntity thrOrderImportDetailEntity = datas.get(0); ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); + BeanUtil.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); thrOrderEntity.setUpdateTime(new Date()); // BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(thrOrderEntity.getBillType()); // if (bussinessTypeEntity != null) { @@ -110,7 +111,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { { ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); thrOrderDetailEntity.setUpdateTime(new Date()); - BeanUtils.copyProperties(item, thrOrderDetailEntity); + BeanUtil.copyProperties(item, thrOrderDetailEntity); thrOrderDetailEntity.setOrderIdFk(finalThrOrderEntity.getId() + ""); return thrOrderDetailEntity; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index b1b34a179..d82c96690 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -78,8 +79,8 @@ public class ThrOrderServiceImpl implements ThrOrderService { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrErpOrderResponse thrErpOrderResponse = new ThrErpOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, thrErpOrderResponse); - BeanUtils.copyProperties(thrOrderDetailEntity, thrErpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, thrErpOrderResponse); + BeanUtil.copyProperties(thrOrderDetailEntity, thrErpOrderResponse); thrErpOrderResponse.setCompanyid(thrOrderEntity.getCorpId()); thrErpOrderResponse.setCompanyname(thrOrderEntity.getCorpName()); thrErpOrderResponse.setErpOrderId(thrOrderEntity.getBillNo()); @@ -112,12 +113,12 @@ public class ThrOrderServiceImpl implements ThrOrderService { filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); List subErpOrders = new ArrayList<>(); if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 6afe12389..5ae606ac2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -93,7 +94,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { for (String uuid : uuids) { ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0); ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity(); - BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); + BeanUtil.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); thrProductsAddDiEntity.setCustomerId(customerId + ""); thrProductsAddDiEntity.setUuid(uuid); thrProductsAddDiEntity.setType(1);