From 95dcd6900833b0f6ebc5b1c5386b4cbd938d6340 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 12 Oct 2024 23:22:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?add:=E5=A4=87=E8=B4=A7BUG=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?,=E9=A2=84=E7=BA=A6=E5=BA=93=E5=AD=98=E5=93=81BUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D,=E7=BC=96=E7=A0=81BUG=E4=BF=AE=E5=A4=8D,=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E5=A4=8D=E6=A0=B8=E5=A4=87=E6=B3=A8BUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicTenantCodeController.java | 6 +-- .../service/IBasicTenantCodeService.java | 10 +++++ .../impl/BasicTenantCodeServiceImpl.java | 38 +++++++++++++++++++ .../mapper/DistributionSignforMapper.xml | 2 +- .../mapper/DistributionStockupMapper.xml | 2 +- .../DistributionReservationServiceImpl.java | 5 ++- .../impl/DistributionSignforServiceImpl.java | 1 + .../impl/DistributionStockupServiceImpl.java | 2 +- 8 files changed, 58 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java index c60ee4f07..ffbbe1238 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicTenantCodeController.java @@ -101,8 +101,8 @@ public class BasicTenantCodeController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入basicTenantCode") public R save(@Valid @RequestBody BasicTenantCodeEntity basicTenantCode) { - boolean save = basicTenantCodeService.save(basicTenantCode); - return R.status(save); + R r = basicTenantCodeService.saveBasicTenantCodeEntity(basicTenantCode); + return r; } /** @@ -112,7 +112,7 @@ public class BasicTenantCodeController extends BladeController { @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入basicTenantCode") public R update(@Valid @RequestBody BasicTenantCodeEntity basicTenantCode) { - return R.status(basicTenantCodeService.updateById(basicTenantCode)); + return R.status(basicTenantCodeService.BasicTenantCodeEntity(basicTenantCode)); } /** diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java index 11411b37b..e5be41461 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java @@ -22,6 +22,7 @@ import com.logpm.basic.entity.BasicTenantCodeEntity; import com.logpm.basic.excel.BasicTenantCodeExcel; import com.logpm.basic.vo.BasicTenantCodeVO; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import java.util.List; import java.util.Map; @@ -70,4 +71,13 @@ public interface IBasicTenantCodeService extends BaseService implements IBasicTenantCodeService { + private final BladeRedis redis; @Override public IPage list(Map basicTenantCode, IPage page) { @@ -92,6 +100,36 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl list = this.list(Wrappers.query().lambda() + .eq(BasicTenantCodeEntity::getCodeType, basicTenantCode.getCodeType()) + .eq(BasicTenantCodeEntity::getShowType, basicTenantCode.getShowType()) + ); + if (!list.isEmpty()) { + return R.fail("此编码配置已存在"); + } + return R.status(this.save(basicTenantCode)); + } + @Override public boolean save(BasicTenantCodeEntity entity) { String code = entity.getCode(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 54eb311c4..876011d22 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -728,7 +728,7 @@ lddl.train_number trainNumber, lddl.vehicle_name vehicleName, lddl.driver_name driverName, - lddl.driver_name driverName, + lddl.loading_team_name loadingTeamName, lddl.unloading_team_name unLoadingTeamName, CASE diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 7004f37e8..b5117f1fc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -625,7 +625,7 @@ and ldrs.stock_article_status in (1, 3) ) orderNum, ( - ldr.reservation_num + ldr.reservation_stock_list_num + ldr.reservation_num ) planNum, ( ldr.reservation_stock_list_num diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index 0f6c9e4ca..3fbf5a176 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -2087,12 +2087,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl>>>>>>>>>>>>:{}", user.getNickName()); signforEntity.setSigneeId(user.getUserId()); return R.data(this.updateById(signforEntity)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index f3e019276..9f6cedc58 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -392,7 +392,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl Date: Sat, 12 Oct 2024 23:27:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=A0=81=E8=A1=A8=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/CodeNumConstant.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java index 0e46c3f52..29ebb7198 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java @@ -4,13 +4,8 @@ public class CodeNumConstant { public final static int WAYBILL = 1;//运单号 public final static int ORDER = 2;//订单号 - public final static int PSCC = 3;//配送车次号 - public final static int PSJH = 4;//配送计划号 - public final static int LOCATION = 5;//库位号 - public final static int TRAYS = 6;//托盘号 + public final static int TRAYS = 8;//托盘号 public final static int PACKAGE = 7;//包件号 - public final static int SHELF = 8;//货架号 - public final static int PSKH = 9;//配送客户号 public final static int ABNORMAL_ORDER = 10;//异常工单号 public final static int TRUNKLINEBILLLADING = 11;//干线提货单号 public final static int TRUNKLINE_CARS_LOAD = 12;//干线配载批次号 From e09774eb801c63c29ae9bf84c5267a95d5e3d7a7 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 12 Oct 2024 23:58:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?add:=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BasicdataClientServiceImpl.java | 47 +++++++++---------- .../impl/BusinessPreOrderServiceImpl.java | 3 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index f23c291d2..24663cad5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -168,16 +168,16 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>>>>>>记录客户修改日志操作失败"); } - if (Objects.isNull(basicdataClient.getBladeRegionProvinceId())){ + if (Objects.isNull(basicdataClient.getBladeRegionProvinceId())) { basicdataClient.setBladeRegionProvinceId(""); } - if (Objects.isNull(basicdataClient.getBladeRegionAreaId())){ + if (Objects.isNull(basicdataClient.getBladeRegionAreaId())) { basicdataClient.setBladeRegionAreaId(""); } - if (Objects.isNull(basicdataClient.getBladeRegionCityId())){ + if (Objects.isNull(basicdataClient.getBladeRegionCityId())) { basicdataClient.setBladeRegionCityId(""); } //修改 @@ -324,13 +324,13 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl predicateClientName = Predicate.isEqual(oldClientEntity.getClientName()); boolean clientName = predicateClientName.test(newClientEntity.getClientName()); - if (!clientName){ + if (!clientName) { //客户名称 content.append("客户名称由[").append(oldClientEntity.getClientName()).append("]变更为-->[").append(newClientEntity.getClientName()).append("],"); } Predicate predicateClientType = Predicate.isEqual(oldClientEntity.getClientType()); boolean clientType = predicateClientType.test(newClientEntity.getClientType()); - if (!clientType){ + if (!clientType) { //类型 String oldClientTypeValue = DictBizCache.getValue(DictBizConstant.CLIENT_TYPE, oldClientEntity.getClientType()); String newClientTypeValue = DictBizCache.getValue(DictBizConstant.CLIENT_TYPE, newClientEntity.getClientType()); @@ -338,21 +338,21 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl predicateDetailedly = Predicate.isEqual(oldClientEntity.getDetailedly()); boolean detailedly = predicateDetailedly.test(newClientEntity.getDetailedly()); - if (!detailedly){ + if (!detailedly) { //详细地址 content.append("详细地址由[").append(oldClientEntity.getDetailedly()).append("]变更为-->[").append(newClientEntity.getDetailedly()).append("],"); } Predicate predicateTypeService = Predicate.isEqual(oldClientEntity.getTypeService()); boolean typeService = predicateTypeService.test(newClientEntity.getTypeService()); - if (!typeService){ + if (!typeService) { //配送类型 - String oldDeliveryType = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, oldClientEntity.getTypeService()); + String oldDeliveryType = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, oldClientEntity.getTypeService()); String newDeliveryType = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, newClientEntity.getTypeService()); content.append("配送类型由[").append(oldDeliveryType).append("]变更为-->[").append(newDeliveryType).append("],"); } Predicate predicateDefaultPaymentMethods = Predicate.isEqual(oldClientEntity.getDefaultPaymentMethods()); boolean defaultPaymentMethods = predicateDefaultPaymentMethods.test(newClientEntity.getDefaultPaymentMethods()); - if (!defaultPaymentMethods){ + if (!defaultPaymentMethods) { //结算方式 String oldDefaultPaymentMethodsValue = DictBizCache.getValue(DictBizConstant.MAINLINE_WAYBILL_PAYMENTMETHOD, oldClientEntity.getDefaultPaymentMethods()); String newDefaultPaymentMethodsValue = DictBizCache.getValue(DictBizConstant.MAINLINE_WAYBILL_PAYMENTMETHOD, newClientEntity.getDefaultPaymentMethods()); @@ -361,7 +361,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl[").append(newAddress).append("],"); } @@ -398,7 +398,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl[").append(newClientEntity.getFileName()).append("],"); } } @@ -406,13 +406,13 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl predicateContractStartTime = Predicate.isEqual(oldClientEntity.getContractStartTime()); boolean contractStartTime = predicateContractStartTime.test(newClientEntity.getContractStartTime()); - if (!contractStartTime){ + if (!contractStartTime) { content.append("合同开始时间由[").append(sdf.format(oldClientEntity.getContractStartTime())).append("]变更为-->[").append(sdf.format(oldClientEntity.getContractStartTime())).append("],"); } //对于合同结束时间比对 Predicate predicateContractEntTime = Predicate.isEqual(oldClientEntity.getContractEntTime()); boolean contractEndTime = predicateContractEntTime.test(newClientEntity.getContractEntTime()); - if (!contractEndTime){ + if (!contractEndTime) { content.append("合同开始时间由[").append(sdf.format(oldClientEntity.getContractEntTime())).append("]变更为-->[").append(sdf.format(newClientEntity.getContractEntTime())).append("],"); } BasicdataClientLogEntity basicdataClientLogEntity = new BasicdataClientLogEntity(); @@ -825,7 +825,8 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl storeBrandEntityList = collect.get(clientId); - if(storeBrandEntityList.size() == 1){ + + if (storeBrandEntityList != null && storeBrandEntityList.size() == 1) { clientInfoVO.setBrandId(storeBrandEntityList.get(0).getBrandId()); } list.add(JSON.parseObject(JSON.toJSONString(clientInfoVO))); @@ -932,23 +933,23 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl list1 = baseMapper.selectList(queryWrapper1); - if (!list1.isEmpty()) { + if (CollUtil.isNotEmpty(list1)) { return Resp.scanFail("扫描失败", "包件已入库"); }