From d2826842fcd5eb9b6a1463f50e9ca714854def12 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 19 Apr 2024 00:24:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E4=BD=8D=E5=AF=BC=E5=85=A5=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataGoodsShelfController.java | 19 +++++++++---------- .../service/IBasicdataGoodsShelfService.java | 5 +---- .../impl/BasicdataGoodsShelfServiceImpl.java | 8 +------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java index b781401c2..e64c5d8d8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java @@ -245,16 +245,15 @@ public class BasicdataGoodsShelfController extends BladeController { ExcelUtil.export(response, "货架数据" + DateUtil.time(), "货架数据表", list, BasicdataGoodsShelfExcel.class); } - /** - * 导入货架前置条件 - */ - @GetMapping("/preImport") - @ApiOperationSupport(order = 12) - @ApiOperation(value = "导入货架", notes = "传入ids") - public R preImport(Long ids) { - basicdataGoodsShelfService.saveIds(ids); - return R.success("操作成功"); - } +// /** +// * 导入货架前置条件 +// */ +// @GetMapping("/preImport") +// @ApiOperationSupport(order = 12) +// @ApiOperation(value = "导入货架", notes = "传入ids") +// public R preImport(Long ids) { +// return R.success("操作成功"); +// } /** * 导入货架 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java index b7e133446..0e9bc1d01 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsShelfService.java @@ -137,8 +137,5 @@ public interface IBasicdataGoodsShelfService extends BaseService data); - /** - * 货架 ids - */ - void saveIds(Long ids); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index 39ed8e8e1..04fa58f0f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -94,7 +94,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl basicdataGoodsShelfEntities = baseMapper.selectList(new QueryWrapper().lambda() .eq(BasicdataGoodsShelfEntity::getGoodsShelfName, datum.getGoodsShelfName()) .eq(BasicdataGoodsShelfEntity::getWarehouseId, myCurrentWarehouse.getId()) - .eq(BasicdataGoodsShelfEntity::getGoodsAreaId, Long.valueOf(ids)) .eq(BasicdataGoodsShelfEntity::getIsDeleted, 0) ); if (!basicdataGoodsShelfEntities.isEmpty()) { @@ -894,7 +892,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl>>>>>>>>>>>{}", copy); assert copy != null; copy.setWarehouseId(myCurrentWarehouse.getId()); - copy.setGoodsAreaId(Long.valueOf(ids)); arrayList.add(copy); } // 根据对象的value属性进行去重 @@ -902,10 +899,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl products, String ColumnNum) { -- 2.27.0 From 40e3b63bf3cd1b12842a19f395a9f4864c8d9d41 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 19 Apr 2024 10:27:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(service):=20=E4=BF=AE=E6=94=B9=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E4=BD=93=E7=B3=BB=E7=BB=B4=E6=8A=A4=E6=97=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BasicdataPriceRouteServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java index 469c224f7..4bacbfd67 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceRouteServiceImpl.java @@ -147,7 +147,7 @@ public class BasicdataPriceRouteServiceImpl extends BaseServiceImpl priceGeneralEntities = new ArrayList<>(); - biuldGeneral(route.getId(), generalServiceTypeEnums.getCode(), vo.getMinCost(), vo.getAdditionalCost(), priceGeneralEntities); + biuldGeneral(route, generalServiceTypeEnums.getCode(), vo.getMinCost(), vo.getAdditionalCost(), priceGeneralEntities); generalService.saveOrUpdateBatch(priceGeneralEntities); } return route.getId(); @@ -263,16 +263,16 @@ public class BasicdataPriceRouteServiceImpl extends BaseServiceImpl generalList) { + private void biuldGeneral(BasicdataPriceRouteEntity routeEntity, Integer code, Double minCost, Double additionalCost, List generalList) { // 1 最低计费一个价格体系一个服务类型只存在一条 BasicdataPriceGeneralEntity generalEntity = generalService.getOne(Wrappers.lambdaQuery() - .eq(BasicdataPriceGeneralEntity::getBoId, priceId) + .eq(BasicdataPriceGeneralEntity::getBoId, routeEntity.getId()) .eq(BasicdataPriceGeneralEntity::getServiceType, code) ); if (ObjectUtil.isEmpty(generalEntity)) { generalEntity = new BasicdataPriceGeneralEntity(); - generalEntity.setBoId(priceId); - generalEntity.setPriceId(priceId); + generalEntity.setBoId(routeEntity.getId()); + generalEntity.setPriceId(routeEntity.getPriceId()); generalEntity.setServiceType(code); } // 设置最低计费和加算价格 -- 2.27.0