From 175f40cd3d6dfa089adfd54c0fba1a41a7e18261 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Wed, 14 Jun 2023 22:12:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature=201.=E4=BF=AE=E6=94=B9=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/service/impl/CommodityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index 08831a9f..db05a6d4 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -645,7 +645,7 @@ public class CommodityServiceImpl implements CommodityService { }else{ // TODO 简称、商品编码、规格型号、单位、优惠政策标识、零税率标识 if (commodityCodeEntity != null){ - commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); +// commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); } } } From 53f11c9ed2408d1609cf09c66bd4f51f55fa6329 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 15 Jun 2023 10:43:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8=E5=90=8E?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=A9=E6=96=99=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commodity/service/impl/CommodityServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index e5fbb05e..3db0916f 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -615,15 +615,18 @@ public class CommodityServiceImpl implements CommodityService { CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery(); commodityCodeCheckQuery.setXmmc(xmmc); - String zxbm = StringUtils.isNotBlank(receiveSpxxReq.getZxbm()) ? receiveSpxxReq.getZxbm() : baseService.getGenerateShotKey(); - commodityCodeCheckQuery.setZxbm(zxbm); + if(StringUtils.isBlank(receiveSpxxReq.getZxbm())){ + receiveSpxxReq.setZxbm(baseService.getGenerateShotKey()); + } + + commodityCodeCheckQuery.setZxbm(receiveSpxxReq.getZxbm()); commodityCodeCheckQuery.setGgxh(receiveSpxxReq.getGgxh()); commodityCodeCheckQuery.setXmdw(receiveSpxxReq.getXmdw()); commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj()); commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl()); commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId()); Map map = new HashMap<>(); - map.put("zxbm",zxbm); + map.put("zxbm",receiveSpxxReq.getZxbm()); map.put("entId",receiveSpxxReq.getEntId()); if(StringUtils.isBlank(receiveSpxxReq.getEntId())){ From e7b62fc2a63bb02277914c4ee5a5b6c46ae26763 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 15 Jun 2023 14:05:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feature=EF=BC=9A=E8=8E=B7=E5=8F=96mdm?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=BE=E7=BD=AE=E5=85=AC=E5=8F=B8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/model/CommodityCodeEnum.java | 1 + .../module/commodity/service/impl/CommodityServiceImpl.java | 2 +- .../consumer/openapi/service/impl/SDEnregyServiceImpl.java | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java index c54f13ed..e54b7f04 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java @@ -17,6 +17,7 @@ public enum CommodityCodeEnum { DATA_SOURCE_9("9", "引用集团库"), DATA_SOURCE_10("10", "克隆公司库"), DATA_SOURCE_11("11", "电商接口同步"), + DATA_SOURCE_12("12", "mdm同步"), ; diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index ded6f438..3db0916f 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -662,7 +662,7 @@ public class CommodityServiceImpl implements CommodityService { commodityCodeEntity.setModifyTime(new Date()); commodityCodeEntity.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():""); if (commodityCodeEntity != null){ -// commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); + commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map); } } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index 735b314a..6d7ca9e8 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -13,6 +13,7 @@ import com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail; import com.dxhy.order.baseservice.module.buyer.protocol.MdmGmfxxtbMulticodeValuelistBO; import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; +import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum; import com.dxhy.order.baseservice.module.taxclass.dao.GroupTaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; @@ -344,6 +345,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { String ggxh = StringUtils.isNotBlank(reqBO.getDESCSHORT())&& reqBO.getDESCSHORT().contains("_")? reqBO.getDESCSHORT().substring(reqBO.getDESCSHORT().indexOf("_") + 1) : ""; ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(ggxh); //调整后不更新公司物料 + commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_12.getKey()); if(collect != null && collect.size() > 0){ //matchCommodityCode(commodityCodeEntity); commodityCodeEntity.setXmmc(reqBO.getDESC1()); @@ -357,7 +359,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){ commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME()); } - commodityCodeEntity.setDataSource("4"); //matchCommodityCode(commodityCodeEntity); List ids = collect.stream().map(t -> t.getId()).collect(Collectors.toList()); int updateCommodity = commodityMapper.batchUpdateCommodity(commodityCodeEntity, ids); @@ -383,7 +384,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){ commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME()); } - commodityCodeEntity.setDataSource("4"); // sdenergyTaxCodeMatchDao.queryByWlflbm(requestBody.get) commodityCodeEntity.setId(DistributedKeyMaker.generateShotKey()); @@ -422,6 +422,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { if (codeEntityForMatch != null) { // 查找原codeEntityR BeanUtils.copyProperties(codeEntityForMatch, commodityCodeEntity); + commodityCodeEntity.setEntId(""); commodityCodeEntity.setXhfNsrsbh("-1"); commodityCodeEntity.setHsbz("1"); return; From 4ed87ad0831059cb7cda83e9c8834286aa3fc0da Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 15 Jun 2023 14:33:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AD=98=E5=82=A8=E6=8A=A5=E9=94=99=E8=BF=94=E5=9B=9E?= =?UTF-8?q?9999?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/service/impl/CommodityServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index 3db0916f..e63c793e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -377,8 +377,12 @@ public class CommodityServiceImpl implements CommodityService { } num++; } + R ok = R.ok(); + if(resultMap.size() > 0){ + ok = R.error(); + } - return R.ok().put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) + return ok.put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) .put("fail", resultMap.size()); }