From 038d541b658f53d735db3e25f19c4fd89e3134c5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 28 Dec 2022 22:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncUploadController.java | 4 +- .../basic/UdiContrastController.java | 12 +- .../basic/UdiRelevanceController.java | 105 +++++++++--------- .../thrsys/ThrProductsAddDiController.java | 3 +- .../glxp/sale/admin/dao/basic/UdiInfoDao.java | 7 +- ...diInfoReqeust.java => UdiInfoRequest.java} | 2 +- .../admin/res/basic/UdiRelevanceResponse.java | 4 +- .../service/basic/UdiContrastService.java | 4 +- .../admin/service/basic/UdiInfoService.java | 6 +- .../impl/UdiInfoImportDetailServiceImpl.java | 4 +- .../basic/impl/UdiInfoServiceImpl.java | 7 +- .../thread/BasicBackUpdateProductService.java | 6 +- .../thread/BasicUdiInfoImportService.java | 4 +- .../thread/BasicUpdateProductService.java | 6 +- .../thread/CompanyProductsRelService.java | 6 +- .../mybatis/mapper/basic/UdiInfoDao.xml | 4 +- 16 files changed, 92 insertions(+), 92 deletions(-) rename api-admin/src/main/java/com/glxp/sale/admin/req/basic/{UdiInfoReqeust.java => UdiInfoRequest.java} (98%) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index 448d267..75aca07 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -23,7 +23,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.*; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; @@ -216,7 +216,7 @@ public class SpsSyncUploadController { List udiInfoEntities = syncDataResponse.getUdiInfoEntities(); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { - UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest); mapper.insertUdiInfo(udiInfoRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index e62da7b..b1875b3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -14,7 +14,7 @@ import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.RemoveRelRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; @@ -157,11 +157,11 @@ public class UdiContrastController { udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); - UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust(); - BeanUtils.copyProperties(udiInfoEntity, udiInfoReqeust); - udiInfoService.updateUdiInfo(udiInfoReqeust); + UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); + BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); + udiInfoService.updateUdiInfo(udiInfoRequest); } - udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); +// udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); String time = DateUtil.formatDateTime(new Date()); udiRelevanceEntity.setUpdateTime(time); @@ -364,7 +364,7 @@ public class UdiContrastController { udiInfoEntity.setScbssfbhsxrq("是"); udiInfoEntity.setScbssfbhxlh("否"); udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); - UdiInfoReqeust udiInfoRequest = new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 4b786b6..b4d404f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -8,10 +8,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.config.WebSocketServer; import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.sale.admin.entity.basic.FilterSysEntity; -import com.glxp.sale.admin.entity.basic.UdiInfoEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; @@ -280,52 +277,58 @@ public class UdiRelevanceController { return ResultVOUtils.error(500, vailResult); } + //判断父id不为空就吧值给到id里面防止id变成详情id + if (udiRelevanceResponse.getPid() != null) { + udiRelevanceResponse.setId(udiRelevanceResponse.getPid()); + } - UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); - udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); + //更新关联表相关信息 + UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceRequest); + udiRelevanceRequest.setId(udiRelevanceResponse.getId() + ""); String time = DateUtil.getDateTime(); - udiRelevanceEntity.setUpdateTime(time); - udiRelevanceEntity.setModifyTime(time); + udiRelevanceRequest.setUpdateTime(time); + udiRelevanceRequest.setModifyTime(time); if (udiRelevanceResponse.getIsUseDy() == 1) { - udiRelevanceEntity.setIsUseDy(true); - } else udiRelevanceEntity.setIsUseDy(false); - UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); - BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + udiRelevanceRequest.setIsUseDy(true); + } else udiRelevanceRequest.setIsUseDy(false); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); - if (!customerId.equals("110")) { - if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { - CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceEntity.getId(), customerId + ""); - companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); + if (StrUtil.isNotEmpty(udiRelevanceRequest.getPrice())) { + //更新供应商关联表相关信息 + CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceRequest.getId(), customerId + ""); + companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceRequest.getPrice())); companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity); } } - UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust(); - udiInfoEntity.setSptm(udiRelevanceResponse.getSptm()); - udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode()); - udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm()); - udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname()); - udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory()); - udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); - udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); - udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); - udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); - udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); - udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); - udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); - udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); - udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); - udiInfoEntity.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4()); - udiInfoEntity.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5()); - udiInfoEntity.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6()); - udiInfoEntity.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7()); - udiInfoEntity.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8()); + //更新产品信息表相关产品信息 + UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); + udiInfoRequest.setNameCode(udiRelevanceResponse.getNameCode()); + udiInfoRequest.setSptm(udiRelevanceResponse.getSptm()); + udiInfoRequest.setYbbm(udiRelevanceResponse.getYbbm()); + udiInfoRequest.setMeasname(udiRelevanceResponse.getMeasname()); + udiInfoRequest.setManufactory(udiRelevanceResponse.getManufactory()); + udiInfoRequest.setCpms(udiRelevanceResponse.getCpms()); +// udiInfoRequest.setDiType(udiRelevanceResponse.getDiType()); + udiInfoRequest.setPrice(udiRelevanceResponse.getPrice()); + udiInfoRequest.setSpmc(udiRelevanceResponse.getSpmc()); + udiInfoRequest.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); + udiInfoRequest.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); + udiInfoRequest.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); + udiInfoRequest.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl()); + udiInfoRequest.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); + udiInfoRequest.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); + udiInfoRequest.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); + udiInfoRequest.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4()); + udiInfoRequest.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5()); + udiInfoRequest.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6()); + udiInfoRequest.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7()); + udiInfoRequest.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8()); if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) { - udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); + udiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); } - udiInfoEntity.setUuid(udiRelevanceResponse.getUuid()); - udiInfoService.updateUdiInfo(udiInfoEntity); + udiInfoRequest.setUuid(udiRelevanceResponse.getUuid()); + udiInfoService.updateUdiInfo(udiInfoRequest); return ResultVOUtils.success("更新成功"); } @@ -503,12 +506,12 @@ public class UdiRelevanceController { String time = DateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setModifyTime(time); - UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust(); - udiInfoReqeust.setYbbm(postSmpUdiInfoRequest.getYbbm()); - udiInfoReqeust.setSptm(postSmpUdiInfoRequest.getSptm()); - BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoReqeust); - udiInfoReqeust.setUuid(udiRelevanceEntity.getUuid()); - udiInfoService.insertUdiInfo(udiInfoReqeust); + UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); + udiInfoRequest.setYbbm(postSmpUdiInfoRequest.getYbbm()); + udiInfoRequest.setSptm(postSmpUdiInfoRequest.getSptm()); + BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoRequest); + udiInfoRequest.setUuid(udiRelevanceEntity.getUuid()); + udiInfoService.insertUdiInfo(udiInfoRequest); udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } @@ -688,7 +691,7 @@ public class UdiRelevanceController { } BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId()); - UdiInfoReqeust UdiInfoRequest = new UdiInfoReqeust(); + UdiInfoRequest UdiInfoRequest = new UdiInfoRequest(); BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest); UdiInfoRequest.setNameCode(thrProductsEntity.getCode()); UdiInfoRequest.setCpmctymc(thrProductsEntity.getName()); @@ -704,8 +707,8 @@ public class UdiRelevanceController { String time = DateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setModifyTime(time); - UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); - BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); return ResultVOUtils.success("解除绑定成功！"); } @@ -726,8 +729,8 @@ public class UdiRelevanceController { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setId(id); udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus()); - UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); - BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); } return ResultVOUtils.success("更新成功！"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java index ab3ad79..1ba7ce6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java @@ -28,7 +28,6 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService; import com.glxp.sale.admin.util.BeanUtils; -import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.admin.util.SupplementVailUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -184,7 +183,7 @@ public class ThrProductsAddDiController { udiRelevanceEntity.setManufactory(thrProductsAddDiEntity.getManufactory()); UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid()); - UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest); udiInfoRequest.setSptm(thrProductsAddDiResponse.getSptm()); udiInfoRequest.setYbbm(thrProductsAddDiResponse.getYbbm()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java index 30e828f..232e5e2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiInfoDao.java @@ -1,9 +1,8 @@ package com.glxp.sale.admin.dao.basic; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,11 +24,11 @@ public interface UdiInfoDao { List findByUuids(@Param("uuid") String uuid); - boolean insertUdiInfo(UdiInfoReqeust udiInfoEntity); + boolean insertUdiInfo(UdiInfoRequest udiInfoEntity); boolean insertUdiInfos(@Param("udiInfoEntities") List udiInfoEntities); - boolean updateUdiInfo(UdiInfoReqeust udiInfoEntity); + boolean updateUdiInfo(UdiInfoRequest udiInfoEntity); boolean deleteById(@Param("id") String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoRequest.java similarity index 98% rename from api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java rename to api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoRequest.java index ff0a17e..dafef1a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoRequest.java @@ -4,7 +4,7 @@ package com.glxp.sale.admin.req.basic; import lombok.Data; @Data -public class UdiInfoReqeust { +public class UdiInfoRequest { private Integer id; private String nameCode; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index d8c4f64..812fffe 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -85,7 +85,9 @@ public class UdiRelevanceResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; - + private Boolean useMuti; //是否多次使用 + private Integer useNum; //最小包装单元可使用次数 + private Integer pid; //用来存父id //产品代理商 private String cpdls; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java index e8fe6b7..e0122a7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java @@ -11,7 +11,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.thread.UdiDlHttpClient; @@ -172,7 +172,7 @@ public class UdiContrastService { udiInfoEntity.setScbssfbhsxrq("是"); udiInfoEntity.setScbssfbhxlh("否"); udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); - UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java index f37dce1..774cfca 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoService.java @@ -3,7 +3,7 @@ package com.glxp.sale.admin.service.basic; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Param; @@ -28,11 +28,11 @@ public interface UdiInfoService { List findByUuids(String uuid); - boolean insertUdiInfo(UdiInfoReqeust udiInfoRequest); + boolean insertUdiInfo(UdiInfoRequest udiInfoRequest); boolean insertUdiInfos(List udiInfoEntities); - boolean updateUdiInfo(UdiInfoReqeust udiInfoRequest); + boolean updateUdiInfo(UdiInfoRequest udiInfoRequest); boolean deleteById(String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java index 97ff97e..fb361fb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -11,7 +11,7 @@ import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService; import org.apache.ibatis.session.ExecutorType; @@ -102,7 +102,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic List corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); for (UdiInfoEntity basicUnitMaintainEntity : corpList) { - UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); BeanUtils.copyProperties(basicUnitMaintainEntity, udiInfoRequest); mapper.insertUdiInfo(udiInfoRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java index 5406b22..68e0e21 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java @@ -5,9 +5,8 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.basic.UdiInfoDao; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; -import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.util.FilterUdiUtils; @@ -93,7 +92,7 @@ public class UdiInfoServiceImpl implements UdiInfoService { } @Override - public boolean insertUdiInfo(UdiInfoReqeust udiInfoRequest) { + public boolean insertUdiInfo(UdiInfoRequest udiInfoRequest) { return udiInfoDao.insertUdiInfo(udiInfoRequest); } @@ -103,7 +102,7 @@ public class UdiInfoServiceImpl implements UdiInfoService { } @Override - public boolean updateUdiInfo(UdiInfoReqeust udiInfoRequest) { + public boolean updateUdiInfo(UdiInfoRequest udiInfoRequest) { if (StrUtil.isEmpty(udiInfoRequest.getUuid())) return false; return udiInfoDao.updateUdiInfo(udiInfoRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 6d1e1d3..7cffa04 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -10,7 +10,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.httpclient.ErpBasicClient; import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest; import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.*; @@ -90,7 +90,7 @@ public class BasicBackUpdateProductService { inventoryCodes.add(invmandocResponse.getCode()); erpProductsMap.put(invmandocResponse.getCode(), invmandocResponse); if (isUpdate.getParamValue().equals("1")) {//不根据库存信息过滤 - UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust(); + UdiInfoRequest udiInfoEntity = new UdiInfoRequest(); udiInfoEntity.setNameCode(invmandocResponse.getCode()); udiInfoEntity.setCpmctymc(invmandocResponse.getName()); udiInfoEntity.setGgxh(invmandocResponse.getSpec()); @@ -192,7 +192,7 @@ public class BasicBackUpdateProductService { if (udiRelevanceEntity == null) { if (isUpdate.getParamValue().equals("1")) { - UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust(); + UdiInfoRequest udiInfoEntity = new UdiInfoRequest(); udiInfoEntity.setNameCode(thrProductsEntity.getCode()); udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java index 6266d1a..d435442 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java @@ -8,7 +8,7 @@ import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; @@ -114,7 +114,7 @@ public class BasicUdiInfoImportService { udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); - UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java index 2b66098..bb25565 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java @@ -13,7 +13,7 @@ import com.glxp.sale.admin.httpclient.ErpBasicClient; import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.ErpProductsResponse; @@ -93,7 +93,7 @@ public class BasicUpdateProductService { udiInfoEntity.setUuid(CustomUtil.getUUId()); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiInfoEntity.setDiType(1); - UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest); } @@ -171,7 +171,7 @@ public class BasicUpdateProductService { udiInfoEntity.setUuid(CustomUtil.getUUId()); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiInfoEntity.setDiType(1); - UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java index 17e2606..aa7d3f8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java @@ -1,18 +1,16 @@ package com.glxp.sale.admin.thread; import cn.hutool.core.util.StrUtil; -import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; +import com.glxp.sale.admin.req.basic.UdiInfoRequest; import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.util.BeanUtils; -import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -42,7 +40,7 @@ public class CompanyProductsRelService { if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) { companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); } - UdiInfoReqeust udiInfoRequest = new UdiInfoReqeust(); + UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); udiInfoRequest.setUuid(udiRelevanceEntity.getUuid()); SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 6477b3e..8f8efb8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -127,7 +127,7 @@ nameCode = #{nameCode}) limit 1 - + replace INTO basic_products (id, @@ -232,7 +232,7 @@ WHERE uuid = #{uuid} - + UPDATE basic_products packRatio=#{packRatio},