From 2a85cc6f0599b64bc5ca8d594536347acea96fa8 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 11 Jan 2024 15:39:05 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95nacos=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../springblade/common/launch/LauncherServiceImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
index 2749bc113..7d5c44bb6 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
@@ -41,10 +41,10 @@ public class LauncherServiceImpl implements LauncherService {
PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
-// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos");
-// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123");
-// PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos");
-// PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123");
+ PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos");
+ PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123");
+ PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos");
+ PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123");
PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
From e701b1c9921763696fa77ca21f2aea199e8b1e26 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Thu, 11 Jan 2024 16:12:29 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/AftersalesWorkOrderEntity.java | 4 +++
.../AftersalesWorkOrderController.java | 8 +++++
.../mapper/AftersalesWorkOrderMapper.xml | 24 ++++++++-------
.../impl/AftersalesWorkOrderServiceImpl.java | 29 +++++++++++++++----
4 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
index 3e6ddd0c0..a76731372 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesWorkOrderEntity.java
@@ -283,6 +283,10 @@ public class AftersalesWorkOrderEntity extends TenantEntity {
* 处理仓库名称
*/
private String completionName;
+ /**
+ * 品牌名称
+ */
+ private String brandName;
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
index e385c1ee0..77b148af1 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
@@ -201,6 +201,14 @@ public class AftersalesWorkOrderController extends BladeController {
if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getId())){
throw new ServiceException("异常工单ID不能为空");
}
+ try{
+ if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getSurveyRecordDTO().getContent())){
+ throw new ServiceException("内容不能为空！！");
+ }
+ }catch (Exception e ){
+ log.info("内容不能为空！！");
+ throw new ServiceException("内容不能为空！！");
+ }
return R.status(aftersalesWorkOrderService.savaSurveyRecord(aftersalesWorkOrderDTO));
}
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index cf62eb9a1..999c41613 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -54,10 +54,11 @@
select DISTINCT lawo.id,lawo.work_order_type,lawo.discovery_node,lawo.work_order_number,lawo.waybill_number,lawo.order_code,lawo.train_number,lawo.first,
lawo.secondary,lawo.vehicle_route,lawo.deliver_goods_time,lawo.discovery_time,lawo.warehousing_time,lawo.waybill_mall,lawo.remarks,lawo.delivery_time,
lawo.delivery_driver,lawo.work_order_status,lawo.problem_description,lawo.responsible_person,lawo.processed_by,lawo.create_time,
- lawo.customer_service_name customerServiceName
+ lawo.customer_service_name customerServiceName,lawo.warehouse_id warehouseId,lawo.brand_name brandName
from logpm_aftersales_work_order lawo
LEFT JOIN logpm_aftersales_processor lap on lawo.id = lap.work_order_id and lap.types_of = '2' and lap.conditions in (1,2)
+ lawo.is_deleted = 0
and lawo.id = #{param.id }
and lawo.work_order_type = #{param.workOrderType }
and lawo.initiation_identification = #{param.initiationIdentification }
@@ -87,7 +88,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.customer_service_name = #{param.customerServiceName }
and lawo.waybill_mall_id = #{param.waybillMallId }
and lawo.problem_description = #{param.problemDescription}
- and lawo.warehouse_id = #{param.warehouseId}
+ and lawo.warehouse_id = #{param.warehouseId}
and lawo.person_responsible = #{param.personResponsible }
and lawo.process_number = #{param.processNumber }
and lawo.reviewed_by = #{param.reviewedBy }
@@ -96,18 +97,21 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
and lawo.processed_by = #{param.processedBy}
and lawo.investigation_process = #{param.investigationProcess }
and lawo.related_work_orders_id = #{param.relatedWorkOrdersId }
- and lawo.work_order_status in( #{param.workOrderStatus })
+ and lawo.work_order_status in( #{param.workOrderStatus })
and lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110')
and lawo.work_order_status in (21,30) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId}
- and lawo.warehouse_id = #{param.warehouseId}
- and lawo.work_order_status in( #{param.workOrderStatus })
- or 1 = 1
- and lawo.work_order_status in ( #{param.workOrderStatus }) and lap.types_of = '2' and lap.business_id = #{param.warehouseId}
- and lap.types_of = '2' and lap.business_id = #{param.warehouseId}
- and lawo.work_order_status in (21,30) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId}
- and lawo.work_order_status in (80,100) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId}
+
+ and lawo.work_order_status in (80,100) and lap.processing_status = '4'
+ or 1=1
+ and lap.business_id = #{param.warehouseId}
+ and lawo.work_order_status in ( #{param.workOrderStatus })
+
+ and lawo.work_order_status in ('10','20' ) and lap.types_of = '2' and lap.processing_status in ('1')
+ and lap.types_of = '2'
+ and lawo.work_order_status in (21,30) and lap.processing_status = '4'
+ and lawo.work_order_status in (80,100) and lap.processing_status = '4'
ORDER BY lawo.create_time DESC
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 9f0c2a3df..92951afbb 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -594,6 +594,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
+// List collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
//添加待回复信息
- collect.forEach( i ->{
-
- AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordEntity);
- //添加待回复信息
- aftersalesReplyingPartyService.save(replyingPartyEntity);
+ list.forEach( i ->{
+ //没有处理方，修改已回复的处理方为待回复
+ if(ProcessorProcessingStatusStatusConstant.yichuli.getValue().equals(i.getProcessingStatus())){
+ //已处理
+ AftersalesProcessorEntity processor = new AftersalesProcessorEntity();
+ processor.setId(i.getId());
+ processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.daichuli.getValue());
+ aftersalesProcessorService.updateById(processor);
+ }
+ if(ProcessorProcessingStatusStatusConstant.daichuli.getValue().equals(i.getProcessingStatus())){
+ AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordEntity);
+ //添加待回复信息
+ aftersalesReplyingPartyService.save(replyingPartyEntity);
+ }
});
}else{
From 0cd02576713ad922a16183ebee2d48d384836fe7 Mon Sep 17 00:00:00 2001
From: zhenghaoyu
Date: Thu, 11 Jan 2024 15:42:17 +0800
Subject: [PATCH 03/14] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E5=8C=85=E4=BB=B6?=
=?UTF-8?q?=E4=BF=A1=E6=81=AFsql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
index c242cbca1..ce91366aa 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
@@ -90,6 +90,7 @@
d.unitNo = #{unitNo}
and d.delete_time = 0
and wb.`status` != -1
+ limit 1
From 35143660f7fe4812775060bed581ffd4b8001433 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 11 Jan 2024 16:16:17 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/DistrilbutionBillLadingServiceImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index c5cd087b7..4cdf92552 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -256,7 +256,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl packageEntityList = new ArrayList<>();
@@ -469,7 +469,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distributionParcelListService.list(queryWrapper);
List list = distrilbutionBillPackageService.list(Wrappers.query().lambda()
.eq(DistrilbutionBillPackageEntity::getBillLadingId,vo.getBillLadingId())
+ .eq(DistrilbutionBillPackageEntity::getStockArticleId,s)
.apply("packet_bar_status in (1,3)")
);
int pn = list.size(); //包件数量
From 8022d5526ca8817898055092ff10e045d37a3d27 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 11 Jan 2024 16:36:40 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/DistributionSignforServiceImpl.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index ac3e6bdca..0229e6ae8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -670,6 +670,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl
Date: Thu, 11 Jan 2024 21:23:39 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=96=E6=B6=88?=
=?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8C=85=E4=BB=B6=E7=BB=B4=E6=8A=A4=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/DistributionReservationServiceImpl.java | 2 ++
1 file changed, 2 insertions(+)
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 4a02c15a6..32eec400a 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
@@ -3578,6 +3578,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(distributionCancelReservationPackageDTO.getReservationId());
+ String orderCodes = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderCode).distinct().collect(Collectors.joining(","));
for (String s : split) {
if (Func.isNotEmpty(distributionParcelListEntities)){
List cancelPackage = distributionParcelListEntities.stream().filter(p -> p.getId().equals(Long.parseLong(s))).collect(Collectors.toList());
@@ -3605,6 +3606,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl
Date: Mon, 15 Jan 2024 20:27:01 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E5=85=B3=E9=97=AD=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/org/springblade/common/utils/FileUtil.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java
index c419ea87c..bbb4699d6 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java
@@ -199,6 +199,8 @@ public class FileUtil extends TimerTask {
while ((n = in.read(buff)) >= 0) {
out.write(buff, 0, n);
}
+ out.close();
+ in.close();
}
From 458c94119a4f8c0be927e9f8fd0e561b098dac94 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com"
Date: Mon, 15 Jan 2024 21:33:28 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E5=AF=BB=E6=89=BE=E4=BB=93=E5=BA=93?=
=?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/BasicdataWarehouseServiceImpl.java | 28 ++++++++++++-------
.../DistributionStockupAppController.java | 11 ++++++++
.../receiver/StockupStateUpdateHandler.java | 1 +
.../impl/DistributionAsyncServiceImpl.java | 10 ++-----
4 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
index dc09200db..ca8cca51c 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
@@ -168,7 +168,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl myWarehouseList = getMyWarehouseList();
- if (myWarehouseList != null) {
- if (myWarehouseList.size() == 1) {
- return myWarehouseList.get(0);
+ try {
+ BladeUser user = AuthUtil.getUser();
+ String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()));
+ if (StringUtil.isBlank(json)) {
+ List myWarehouseList = getMyWarehouseList();
+ if (myWarehouseList != null) {
+ if (myWarehouseList.size() == 1) {
+ return myWarehouseList.get(0);
+ }
}
}
+ BasicdataWarehouseEntity o = JSONObject.parseObject(json, BasicdataWarehouseEntity.class);
+ return o;
+ } catch (Exception e) {
+
+ log.error(">>>>>> 获取仓库信息错误",e);
}
- BasicdataWarehouseEntity o = JSONObject.parseObject(json, BasicdataWarehouseEntity.class);
- return o;
+
+ return null;
+
}
@Override
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index 47ac0d799..f6a916587 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -65,6 +65,7 @@ import org.springblade.common.constant.reservation.ReservationPackageStatusConst
import org.springblade.common.constant.reservation.ReservationSigningStatusConstant;
import org.springblade.common.constant.stockup.StockupStatusConstant;
import org.springblade.common.constant.stockup.StockupTypeStatusConstant;
+import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.CommonUtil;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.exception.ServiceException;
@@ -1505,6 +1506,8 @@ public class DistributionStockupAppController extends BladeController {
*/
@NotNull
private R stockupScanByCustom(StockupDTO stockupDTO) {
+
+
//包件扫描
String orderCode = stockupDTO.getOrderCode();//订单自编号
String packetBarCode = stockupDTO.getPacketBarCode();//包件码
@@ -1589,9 +1592,16 @@ public class DistributionStockupAppController extends BladeController {
map.put("logId", entity.getId());
map.put("messageData", entity);
map.put("createTime", new Date().getTime());
+
+ BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+ log.info(">>>> find bug myCurrentWarehouse {}",myCurrentWarehouse);
+ if (Objects.isNull(myCurrentWarehouse)) {
+ throw new CustomerException(403, "仓库信息不能为空");
+ }
//将消息携带绑定键值
rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_SCAN_EXCHANGE, RabbitConstant.STOCKUP_SCAN_ROUTING, map);
+
//查询是否货位数据是否该下架
Map mapState = new HashMap<>();
mapState.put("messageId", CommonUtil.getUUID());
@@ -1601,6 +1611,7 @@ public class DistributionStockupAppController extends BladeController {
mapState.put("reservationId", stockupDTO.getReservationId());
mapState.put("logId", entity.getId());
mapState.put("messageData", entity);
+ mapState.put("warehouseId",myCurrentWarehouse.getId());
mapState.put("createTime", new Date().getTime());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/StockupStateUpdateHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/StockupStateUpdateHandler.java
index 9e1e0416d..ecdeb8d25 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/StockupStateUpdateHandler.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/StockupStateUpdateHandler.java
@@ -40,6 +40,7 @@ public class StockupStateUpdateHandler {
messageData.setStockupId((Long) map.get("stockupId"));
messageData.setTypeService(String.valueOf( map.get("typeService")));
messageData.setReservationId((Long) map.get("reservationId"));
+ messageData.setWarehouseId((Long)map.get("warehouseId"));
//查询是否货位数据是否该下架
distributionAsyncService.stockupSelfOffShelf(messageData);
log.info("######STOCKUP_STATE_UPDATE_QUEUE：备货下架查询成功");
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 0af063f3f..4c073fd09 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -643,11 +643,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
*/
@Override
public void stockupSelfOffShelf(StockupDTO stockupDTO) throws InterruptedException {
- BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
- log.info(">>>> find bug {}",myCurrentWarehouse);
- if (Objects.isNull(myCurrentWarehouse)) {
- throw new CustomerException(403, "仓库信息不能为空");
- }
+
//判断类型
List distributionStockupSelfVO = new ArrayList<>();
@@ -656,7 +652,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
distributionStockupSelfVO = distributionStockupMapper.stockupSelfOffShelf(stockupDTO);
} else {
//商 市
- log.info(">>>> find bug {}",stockupDTO);
+ log.info(">>>> find bug stockupDTO {}",stockupDTO);
distributionStockupSelfVO = distributionStockupMapper.stockupOffShelf(stockupDTO);
}
//有
@@ -678,7 +674,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
if (a.get() == b.get()) {
//下架
list.forEach(i -> {
- warehouseUpdownTypeClient.downPackage(i, myCurrentWarehouse.getId());
+ warehouseUpdownTypeClient.downPackage(i, stockupDTO.getWarehouseId());
});
}
From 8e3988608f7e5384d31989f27ae3b024d3940c62 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com"
Date: Mon, 15 Jan 2024 22:43:07 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9sentinel=20=E5=9C=B0?=
=?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/springblade/common/constant/LauncherConstant.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
index dabc47e78..e8ecf5200 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
@@ -67,7 +67,7 @@ public interface LauncherConstant {
/**
* sentinel prod 地址
*/
- String SENTINEL_PROD_ADDR = "172.30.0.58:8858";
+ String SENTINEL_PROD_ADDR = "172.16.128.145:8858";
/**
* sentinel test 地址
From e45f2a07a02c1753adc5b2e7c186db2ea0c041ff Mon Sep 17 00:00:00 2001
From: Diss <1157651603@qq.com>
Date: Tue, 16 Jan 2024 09:04:17 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=B8=E6=9C=BA?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/BasicMaterialServiceImpl.java | 2 +
.../BasicdataDriverArteryServiceImpl.java | 174 +++++++++---------
.../jobhandle/DistributionDatarepair.java | 2 +-
.../patch/mapper/SyncServiceTypeMapper.xml | 2 +-
4 files changed, 94 insertions(+), 86 deletions(-)
diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java
index 50cb34b91..7575b5f07 100644
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java
@@ -72,9 +72,11 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl data) {
+
log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}",data);
ArrayList arrayList = new ArrayList<>();
for (BasicMaterialExcel datum : data) {
+
if(ObjectUtils.isNotNull(datum) && ObjectUtils.isNotNull(datum.getProductCode())){
//去重
List basicMaterialEntities = baseMapper.selectList(new QueryWrapper().lambda()
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java
index 372a5abbb..acc4e8276 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java
@@ -34,29 +34,24 @@ import com.logpm.basicdata.service.IBasicdataVehicleService;
import com.logpm.basicdata.vo.BasicdataDriverArteryVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.constant.driver.DriverTypeStatusConstant;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.system.cache.DictBizCache;
import org.springblade.system.entity.User;
import org.springblade.system.feign.IUserClient;
-import org.springblade.system.feign.IUserSearchClient;
+import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static com.alibaba.fastjson.JSONPatch.OperationType.copy;
-
/**
* 司机信息表 服务实现类
*
@@ -68,9 +63,9 @@ import static com.alibaba.fastjson.JSONPatch.OperationType.copy;
@Slf4j
public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl implements IBasicdataDriverArteryService {
- private final BasicdataVehicleMapper basicdataVehicleMapper;
+ private final BasicdataVehicleMapper basicdataVehicleMapper;
- private final IBasicdataVehicleService basicdataVehicleService;
+ private final IBasicdataVehicleService basicdataVehicleService;
private final BasicdataDrivermiddleMapper basicdataDrivermiddleMapper;
@@ -103,18 +98,18 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl().lambda().eq(BasicdataDrivermiddleEntity::getDriverId, basicdataDriverArtery.getId()));
- if (basicdataDriverArtery.getBindVehicles().equals(""))return delete;
+ if (basicdataDriverArtery.getBindVehicles().equals("")) return delete;
//新增现有的数据
//if (delete>0){
- List bindVehicles = Arrays.asList(basicdataDriverArtery.getBindVehicles().split(","));
- ArrayList basicdataDrivermiddleEntities = new ArrayList<>();
- bindVehicles.forEach(e->{
- BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity();
- basicdataDrivermiddleEntity.setDriverId(basicdataDriverArtery.getId());
- basicdataDrivermiddleEntity.setBrandId(Long.valueOf(e));
- basicdataDrivermiddleEntities.add(basicdataDrivermiddleEntity);
- });
- basicdataDrivermiddleService.saveBatch(basicdataDrivermiddleEntities);
+ List bindVehicles = Arrays.asList(basicdataDriverArtery.getBindVehicles().split(","));
+ ArrayList basicdataDrivermiddleEntities = new ArrayList<>();
+ bindVehicles.forEach(e -> {
+ BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity();
+ basicdataDrivermiddleEntity.setDriverId(basicdataDriverArtery.getId());
+ basicdataDrivermiddleEntity.setBrandId(Long.valueOf(e));
+ basicdataDrivermiddleEntities.add(basicdataDrivermiddleEntity);
+ });
+ basicdataDrivermiddleService.saveBatch(basicdataDrivermiddleEntities);
//}
return delete;
}
@@ -127,23 +122,23 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl getDriverList() {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
- if (Func.isEmpty(myCurrentWarehouse)){
- log.error("################getDriverList 无当前登录人仓库信息:{}",myCurrentWarehouse);
+ if (Func.isEmpty(myCurrentWarehouse)) {
+ log.error("################getDriverList 无当前登录人仓库信息:{}", myCurrentWarehouse);
return null;
}
- log.info("################ getDriverList 仓库信息:{}",myCurrentWarehouse);
+ log.info("################ getDriverList 仓库信息:{}", myCurrentWarehouse);
ArrayList basicdataDriverArteryVOS = new ArrayList<>();
List list = this.list();
- log.info("################getDriverList list:{}",list);
+ log.info("################getDriverList list:{}", list);
//Stream basicdataDriverArteryEntityStream = list.stream().filter(l -> l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
Stream basicdataDriverArteryEntityStream = list.stream().filter(l -> Func.isNotEmpty(l.getWarehouseId()) && l.getWarehouseId().contains(myCurrentWarehouse.getId().toString()));
- if (Func.isNotEmpty(basicdataDriverArteryEntityStream)){
- basicdataDriverArteryEntityStream.forEach(l->{
+ if (Func.isNotEmpty(basicdataDriverArteryEntityStream)) {
+ basicdataDriverArteryEntityStream.forEach(l -> {
BasicdataDriverArteryVO driverArteryVO = Func.copy(l, BasicdataDriverArteryVO.class);
List vehicleIds = basicdataDrivermiddleService.list(Wrappers.query().lambda()
.eq(BasicdataDrivermiddleEntity::getDriverId, l.getId())).stream().filter(f -> Func.isNotEmpty(f.getBrandId())).map(BasicdataDrivermiddleEntity::getBrandId).collect(Collectors.toList());
- if (Func.isNotEmpty(vehicleIds)){
- driverArteryVO.setVehicleVOList(basicdataVehicleService.list(Wrappers.query().lambda().in(BasicdataVehicleEntity::getId,vehicleIds)));
+ if (Func.isNotEmpty(vehicleIds)) {
+ driverArteryVO.setVehicleVOList(basicdataVehicleService.list(Wrappers.query().lambda().in(BasicdataVehicleEntity::getId, vehicleIds)));
}
basicdataDriverArteryVOS.add(driverArteryVO);
});
@@ -157,89 +152,100 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl data) {
- log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}",data);
+ @Transactional
+ public void importDriverArtery(List data) {
+ log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}", data);
outerLoop:
for (BasicdataDriverArteryImproterExcel datum : data) {
- List driverMiddleEntity = new ArrayList<>();
- //检查数据是否为空
- if (ObjectUtils.isEmpty(datum.getPhone())|| ObjectUtils.isEmpty(datum.getName())|| ObjectUtils.isEmpty(datum.getWarehouseName())|| ObjectUtils.isEmpty(datum.getCarrierName())) {
+ try {
+ List driverMiddleEntity = new ArrayList<>();
+
+ //检查数据是否为空
+ if (ObjectUtils.isEmpty(datum.getPhone()) || ObjectUtils.isEmpty(datum.getName()) || ObjectUtils.isEmpty(datum.getWarehouseName()) || ObjectUtils.isEmpty(datum.getCarrierName())) {
// log.error("必填数据不能为空");
// continue;
- throw new ServiceException("用户"+datum.getName() +"必填数据不能为空！");
- }
- if(!ObjectUtils.isEmpty(datum.getPhone())){
- R userR = userClient.userInfoByPhone("627683", datum.getPhone());
- if (userR.getData() == null){
+ throw new ServiceException("必填数据不能为空！");
+ }
+ if (!ObjectUtils.isEmpty(datum.getPhone())) {
+ R userR = userClient.userInfoByPhone("627683", datum.getPhone());
+ if (userR.getData() == null) {
// log.error("未找到用户");
// continue;
- throw new ServiceException("用户"+datum.getName() +"未找到用户！");
- }else {
- datum.setUserId(userR.getData().getId());
+ throw new ServiceException("未找到用户！");
+ } else {
+ datum.setUserId(userR.getData().getId());
+ }
}
- }
- if (!ObjectUtils.isEmpty(datum.getBindVehicle())){
- String[] car = datum.getBindVehicle().split(",");
- for (String s : car) {
- List carListByName = basicdataVehicleService.findCarListByName(s);
+ if (!ObjectUtils.isEmpty(datum.getBindVehicle())) {
+ String[] car = datum.getBindVehicle().split(",");
+ for (String s : car) {
+ List carListByName = basicdataVehicleService.findCarListByName(s);
- if (carListByName.isEmpty()){
+ if (carListByName.isEmpty()) {
// log.error("未找到可绑定的车辆");
- throw new ServiceException("用户"+datum.getName() +"未找到可绑定的车辆！");
- }else{
- BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity();
- basicdataDrivermiddleEntity.setBrandId(carListByName.get(0).getId());
- driverMiddleEntity.add(basicdataDrivermiddleEntity);
+ throw new ServiceException("未找到可绑定的车辆！");
+ } else {
+ BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity();
+ basicdataDrivermiddleEntity.setBrandId(carListByName.get(0).getId());
+ driverMiddleEntity.add(basicdataDrivermiddleEntity);
+ }
}
}
- }
- if (!ObjectUtils.isEmpty(datum.getCarrierName())){
- //找到数据库内的承运商
- List basicdataCarrierEntities = basicdataCarrierService.list(Wrappers.lambdaQuery().eq(BasicdataCarrierEntity::getCarrierName,datum.getCarrierName()));
+ if (!ObjectUtils.isEmpty(datum.getCarrierName())) {
+ //找到数据库内的承运商
+ List basicdataCarrierEntities = basicdataCarrierService.list(Wrappers.lambdaQuery().eq(BasicdataCarrierEntity::getCarrierName, datum.getCarrierName()));
- if (ObjectUtils.isEmpty(basicdataCarrierEntities)){
+ if (ObjectUtils.isEmpty(basicdataCarrierEntities)) {
// log.error("未找到承运商");
// continue;
- throw new ServiceException("用户"+datum.getName() +"未找到承运商！");
- }else{
- datum.setCarrierId(basicdataCarrierEntities.get(0).getId());
+ throw new ServiceException("未找到承运商！");
+ } else {
+ datum.setCarrierId(basicdataCarrierEntities.get(0).getId());
+ }
}
- }
- if (!ObjectUtils.isEmpty(datum.getWarehouseName())){
- //在数据库找到仓库名字对应
- BasicdataWarehouseEntity byName = warehouseClient.findByName(datum.getWarehouseName());
- if (ObjectUtils.isEmpty(byName)){
+ if (!ObjectUtils.isEmpty(datum.getWarehouseName())) {
+ //在数据库找到仓库名字对应
+ BasicdataWarehouseEntity byName = warehouseClient.findByName(datum.getWarehouseName());
+ if (ObjectUtils.isEmpty(byName)) {
// log.error("未找到仓库");
// continue;
- throw new ServiceException("用户"+datum.getName() +"未找到仓库！");
- }else{
- datum.setWarehouseId(String.valueOf(byName.getId()));
+ throw new ServiceException("未找到仓库！");
+ } else {
+ datum.setWarehouseId(String.valueOf(byName.getId()));
+ }
}
- }
- //根据手机号去重 如果有手机号相同 就删除老数据
- if (ObjectUtils.isNotNull(datum) && ObjectUtils.isNotNull(datum.getPhone())) {
- List basicdataVehicleEntities = baseMapper.selectList(new QueryWrapper().lambda()
- .eq(BasicdataDriverArteryEntity::getPhone, datum.getPhone()));
- if (!basicdataVehicleEntities.isEmpty()){
- basicdataDriverArteryMapper.updateIsdeletedByPhone(datum.getPhone());
+ //根据手机号去重 如果有手机号相同 就删除老数据
+ if (ObjectUtils.isNotNull(datum) && ObjectUtils.isNotNull(datum.getPhone())) {
+ List basicdataVehicleEntities = baseMapper.selectList(new QueryWrapper().lambda()
+ .eq(BasicdataDriverArteryEntity::getPhone, datum.getPhone()));
+ if (!basicdataVehicleEntities.isEmpty()) {
+ basicdataDriverArteryMapper.updateIsdeletedByPhone(datum.getPhone());
+ }
}
- }
- BasicdataDriverArteryEntity copy = Func.copy(datum, BasicdataDriverArteryEntity.class);
- //连接到前端后取消注释
- BladeUser user = AuthUtil.getUser();
- copy.setTenantId(user.getTenantId());// 租户号
- copy.setUserId(user.getUserId()); // 创建人
- copy.setUpdateUser(user.getUserId());// 更新人
- log.info("复制后>>>>>>>>>>>>{}",copy);
+ BasicdataDriverArteryEntity copy = Func.copy(datum, BasicdataDriverArteryEntity.class);
+ //连接到前端后取消注释
+ BladeUser user = AuthUtil.getUser();
+ copy.setTenantId(user.getTenantId());// 租户号
+ copy.setUserId(user.getUserId()); // 创建人
+ copy.setUpdateUser(user.getUserId());// 更新人
+ log.info("复制后>>>>>>>>>>>>{}", copy);
this.save(copy);
//车辆和司机绑定关系
- for (BasicdataDrivermiddleEntity basicdataDrivermiddleEntity : driverMiddleEntity) {
- basicdataDrivermiddleEntity.setDriverId(copy.getId());
- basicdataDrivermiddleServiceImpl.save(basicdataDrivermiddleEntity);
+ for (BasicdataDrivermiddleEntity basicdataDrivermiddleEntity : driverMiddleEntity) {
+ basicdataDrivermiddleEntity.setDriverId(copy.getId());
+ basicdataDrivermiddleServiceImpl.save(basicdataDrivermiddleEntity);
+ }
+ } catch (DataAccessException e) {
+ throw new ServiceException("用户" + datum.getName() + "数据长度异常");
+ } catch (ServiceException e) {
+ throw new ServiceException("用户" + datum.getName() + e.getMessage());
+ } catch (Exception e) {
+ throw new RuntimeException("用户" + datum.getName() + "数据错误" + e.getMessage());
}
+
}
}
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
index bbf8d3742..49f60b42e 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
public class DistributionDatarepair {
- private final ISyncDistributionParcelListService distributionParcelListService;
+// private final ISyncDistributionParcelListService distributionParcelListService;
/**
* 预约状态修复
* @param param
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml
index bd58d55a4..d58355ccb 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml
@@ -12,7 +12,7 @@
ldsa.mall_name = COALESCE(lbc.client_name, ldsa.mall_name),
ldsa.type_service = COALESCE(lbsb.type_service, ldsa.type_service),
ldsa.consignee_unit = #{mallName}
- WHERE ldsa.id = #{stockArticleId};
+ WHERE ldsa.id = #{stockArticleId} and ldsa.is_deleted = 0;
From 401c5bdb7103e153557bafadb7ecb1c9dafd940f Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 16 Jan 2024 12:05:14 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=8D=E6=A0=B8?=
=?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=BF=BD=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=8B=A6?=
=?UTF-8?q?=E6=88=AA=E3=80=81=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E6=97=A0?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E6=95=B0=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/DistributionSignforMapper.java | 8 ++++++++
.../distribution/mapper/DistributionSignforMapper.xml | 4 ++++
.../service/IDistributionDeliveryListService.java | 2 +-
.../impl/DistributionDeliveryListServiceImpl.java | 11 +++++++++++
.../impl/DistributionReservationServiceImpl.java | 4 +++-
5 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
index 8378e7ca7..814b17f1c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java
@@ -301,4 +301,12 @@ public interface DistributionSignforMapper extends BaseMapper
SELECT * FROM logpm_distribution_signfor WHERE reservation_id = #{reservationId}
+
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
index bd76a2a1c..bd8587232 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
@@ -155,7 +155,7 @@ public interface IDistributionDeliveryListService extends BaseService selectDistributionAppDeliverywrapIn( DistributionAppDeliveryListDTO distributionAppDeliveryListDTO);
/**
- * 修改配送任务
+ * 修改商配配送任务
* @param deliveryListDTO
* @return
*/
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 3ba29e112..02de1493c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2964,6 +2964,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl
Date: Tue, 16 Jan 2024 13:51:36 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/DistributionDeliveryListServiceImpl.java | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 02de1493c..3ba29e112 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2964,17 +2964,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl
Date: Tue, 16 Jan 2024 13:53:12 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/DistributionDeliveryListServiceImpl.java | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 02de1493c..3ba29e112 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2964,17 +2964,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl
Date: Tue, 16 Jan 2024 14:34:07 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=A4=8D=E6=A0=B8=E6=8B=A6=E6=88=AA?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/DistributionReservationMapper.xml | 1 -
.../impl/DistributionDeliveryListServiceImpl.java | 11 +++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index f9ae56dcd..4672d55b8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -465,7 +465,6 @@
INNER JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
INNER JOIN logpm_distribution_reservation AS ldr ON ldr.id = lds.reservation_id
- ldr.reservation_status != '40'
and lddl.id = #{id}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 3ba29e112..3eb659eea 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -2964,9 +2964,20 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda()
+ .eq(DistributionSignforEntity::getReservationId, reservationEntity.getId())
+ .eq(DistributionSignforEntity::getDeliveryId, deliveryListEntity.getId())
+ );
+ if (Func.isNotEmpty(signforEntity) && signforEntity.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())){
+ log.error("#############商配文员对已复核预约进行订单追加reservationId:{}",reservationEntity.getId());
+ throw new RuntimeException("收货单位:"+reservationEntity.getMallName()+"客户:"+reservationEntity.getConsignee()+"完成复核签收,无法追加订单");
+ }
+
//查询出该预约下的订单信息
List reservationStockarticleEntityList = distributionReservationStockarticleMapper.selectList(Wrappers.query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, reservationEntity.getId()).ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
Map> oldOrder = reservationStockarticleEntityList.stream().collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getStockArticleId));