From b12c5cfb7d559883eb2d6c06dfad03113fcac597 Mon Sep 17 00:00:00 2001 From: Diss <1157651603@qq.com> Date: Wed, 10 Jan 2024 14:24:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=20=E5=9C=A8=E5=BA=93?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E6=9C=89=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A6=82=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E6=89=98=E7=9B=98=E7=AD=89=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/launch/LauncherServiceImpl.java | 8 +- .../DistributionStockArticleEntity.java | 14 +- .../excel/DistributionStockArticleExcel.java | 146 +++++++++++++++--- .../mapper/DistributionStockArticleMapper.xml | 3 +- .../DistributionStockArticleServiceImpl.java | 16 +- 5 files changed, 157 insertions(+), 30 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 7d5c44bb6..2749bc113 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)); diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 2eb478547..fec559377 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -450,5 +450,17 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "配载件数") private Integer carsLoadNum; - + /** + * 未入库数量 + */ + @TableField(exist = false) + private Integer unreceivedQuantity; + /** + * 创建用户id和时间 + */ + @TableField(exist = false) + private Long createUser; + @TableField(exist = false) + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java index 986231616..e4fb6e1a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java @@ -17,13 +17,17 @@ package com.logpm.distribution.excel; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @@ -40,6 +44,12 @@ import java.util.Date; public class DistributionStockArticleExcel implements Serializable { private static final long serialVersionUID = 1L; + /** + * 运单号 + */ + @ColumnWidth(20) + @ExcelProperty("运单号") + private String waybillNumber; /** * 服务号 */ @@ -73,8 +83,7 @@ public class DistributionStockArticleExcel implements Serializable { /** * 仓库 */ - @ColumnWidth(20) - @ExcelProperty("仓库编码") + @ExcelIgnore private String warehouseCode; /** * 入库时间 @@ -82,12 +91,30 @@ public class DistributionStockArticleExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("入库时间") private Date warehouseEntryTime; + /** + * 最新入库时间 + */ + @ColumnWidth(20) + @ExcelProperty("最新入库时间") + private Date warehouseEntryTimeEnd; /** * 在库时间 */ @ColumnWidth(20) @ExcelProperty("在库时间") private String storeTime; + /** + * 收货单位 + */ + @ColumnWidth(20) + @ExcelProperty("收货单位") + private String consigneeUnit; + /** + * 收货人 + */ + @ColumnWidth(20) + @ExcelProperty("收货人") + private String consigneePerson; /** * 订单总件数 */ @@ -101,35 +128,105 @@ public class DistributionStockArticleExcel implements Serializable { @ExcelProperty("在库件数") private Integer handQuantity; /** - * 是否齐套 + * 未入库数量 */ @ColumnWidth(20) - @ExcelProperty("是否齐套") - private String completeSet; + @ExcelProperty("未入库数量") + private Integer unreceivedQuantity; + /** + * 分拣件数 + */ + @ColumnWidth(20) + @ExcelProperty("分拣件数") + private Integer sortingQuantity; + /** + * 配送件数 + */ + @ColumnWidth(20) + @ExcelProperty("配送件数") + private Integer deliveryQuantity; + /** + * 中转件数 + */ + @ColumnWidth(20) + @ExcelProperty("中转件数") + private Integer transferQuantity; + /** + * 中转件数 + */ + @ColumnWidth(20) + @ExcelProperty("签收件数") + private Integer signinQuantity; + /** + * 上架状态 + */ + @ColumnWidth(20) + @ExcelProperty("上架状态") + private String groundingStatusName; + /** + * 订单来源 + */ + @ColumnWidth(20) + @ExcelProperty("订单来源") + private String resource; /** * 品牌 */ @ColumnWidth(20) @ExcelProperty("品牌") private String brand; + /** + * 所在托盘 + */ + @ColumnWidth(20) + @ExcelProperty("所在托盘") + private String trays; + /** + * 冻结状态 + */ + @ColumnWidth(20) + @ExcelProperty("冻结状态") + private String freezeStatusName; + /** + * 订单状态 + */ + @ColumnWidth(20) + @ExcelProperty("订单状态") + private String orderStatusName; + /** + * 预约状态 + */ + @ColumnWidth(20) + @ExcelProperty("预约状态") + private String reservationStatusName; + /** + * 备货状态 + */ + @ColumnWidth(20) + @ExcelProperty("备货状态") + private String stockupStatusName; + /** + * 是否齐套 + */ + @ColumnWidth(20) + @ExcelProperty("是否齐套") + private String completeSetName; /** * 服务类型 */ + @ExcelIgnore + private String typeService; + @ColumnWidth(20) @ExcelProperty("服务类型") - private String typeService; + private String typeServerName; + /** * 顾客名字 */ @ColumnWidth(20) @ExcelProperty("顾客名字") private String customerName; - /** - * 运单号 - */ - @ColumnWidth(20) - @ExcelProperty("运单号") - private String waybillNumber; /** * 顾客电话 */ @@ -143,23 +240,30 @@ public class DistributionStockArticleExcel implements Serializable { @ExcelProperty("顾客地址") private String customerAddress; /** - * 收货人 + * 增值服务 */ @ColumnWidth(20) - @ExcelProperty("收货人") - private String consigneePerson; + @ExcelProperty("增值服务") + private BigDecimal fee; /** - * 收货单位 + * 创建人 */ @ColumnWidth(20) - @ExcelProperty("收货单位") - private String consigneeUnit; + @ExcelProperty("创建人") + private String createUserName; /** - * 订单来源 + * 创建时间 */ @ColumnWidth(20) - @ExcelProperty("订单来源") - private String resource; + @ExcelProperty("创建时间") + private Date createTime; +// /** +// * 配载件数 +// */ +// @ColumnWidth(20) +// @ExcelProperty("配载件数") +// private Integer carsLoadNum; + /** * 类型;1 预约单 2库存单 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 80a15a841..6e5bd59d4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -729,6 +729,7 @@ ldsa.status, ldsa.is_deleted, ldsa.create_dept, + ldsa.incoming_num, ldsa.reserve1, ldsa.reserve2, ldsa.reserve3, @@ -767,7 +768,7 @@ ldsa.rate, ldsa.advance_id, ldsa.waybill_id, - group_concat(DISTINCT ldpl.waybill_number) as waybillNumber, + ldsa.waybill_number AS waybillNumber, ldsa.consignee_unit, ldsa.collect_fee, ldsa.storage_fee, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index ce50109ae..deb186be4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -71,7 +71,9 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.entity.DictBiz; +import org.springblade.system.entity.User; import org.springblade.system.feign.IDictBizClient; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -125,7 +127,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl selectDistributionStockArticlePage(IPage page, DistributionStockArticleVO distributionStockArticle) { @@ -163,9 +165,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list = baseMapper.exportDistributionStockArticle(paramMap, idArr); List excelList = new ArrayList<>(); - list.forEach(li -> { + list.parallelStream().forEach(li -> { + li.setCreateUserName(userClient.userInfoById(li.getCreateUser()).getData().getName()); + DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(li); DistributionStockArticleExcel excel = new DistributionStockArticleExcel(); - BeanUtil.copyProperties(li,excel); + if (distributionStockArticleVO.getTotalNumber() != null && + distributionStockArticleVO.getHandQuantity() != null) { + distributionStockArticleVO.setUnreceivedQuantity( + distributionStockArticleVO.getTotalNumber() - distributionStockArticleVO.getHandQuantity() + ); + } + BeanUtil.copyProperties(distributionStockArticleVO,excel); excelList.add(excel); }); From a58f7cc4e58302cb5c55819fc353656105a350d5 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Wed, 10 Jan 2024 14:50:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=94=B3=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesAppealController.java | 16 +++--- .../AftersalesWorkOrderController.java | 20 +++++++- .../dto/AftersalesWorkOrderDTO.java | 14 +++--- .../mapper/AftersalesWorkOrderMapper.xml | 14 ++++-- .../service/IAftersalesWorkOrderService.java | 8 +++ .../impl/AftersalesWorkOrderServiceImpl.java | 50 +++++++++++++++++-- 6 files changed, 97 insertions(+), 25 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java index a5d6afc3c..704374ad3 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java @@ -70,7 +70,6 @@ import javax.servlet.http.HttpServletResponse; public class AftersalesAppealController extends BladeController { private final IAftersalesAppealService aftersalesAppealService; - private final IAftersalesWorkOrderService aftersalesWorkOrderService; /** * 异常工单申述表 详情 @@ -147,14 +146,13 @@ public class AftersalesAppealController extends BladeController { aftersalesAppeal.setProcessedByName(user.getUserName()); aftersalesAppeal.setProcessedById(user.getUserId()); aftersalesAppeal.setProcessedDate(new Date()); - if(ObjectUtils.isNotNull(aftersalesAppeal.getTypesOf()) && "3".equals(aftersalesAppeal.getTypesOf())){ - //取消订单申述 - AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity(); - workOrderEntity.setId(aftersalesAppeal.getWorkOrderId()); - workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue()); - aftersalesWorkOrderService.updateById(workOrderEntity); - } - +// if(ObjectUtils.isNotNull(aftersalesAppeal.getTypesOf()) && "3".equals(aftersalesAppeal.getTypesOf())){ +// //取消订单申述 +// AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity(); +// workOrderEntity.setId(aftersalesAppeal.getWorkOrderId()); +// workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue()); +// aftersalesWorkOrderService.updateById(workOrderEntity); +// } return R.status(aftersalesAppealService.updateById(aftersalesAppeal)); } 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 0fff38870..e385c1ee0 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 @@ -19,6 +19,7 @@ package com.logpm.aftersales.controller; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity; +import com.logpm.aftersales.entity.AftersalesAppealEntity; import com.logpm.aftersales.entity.AftersalesSettlementEntity; import com.logpm.aftersales.excel.AftersalesWorkOrderImporter; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; @@ -32,6 +33,7 @@ import lombok.AllArgsConstructor; import javax.validation.Valid; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.aftersales.WorkOrderStatusConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; @@ -54,6 +56,7 @@ import org.springblade.core.excel.util.ExcelUtil; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; +import java.util.Date; import java.util.Map; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -333,6 +336,22 @@ public class AftersalesWorkOrderController extends BladeController { return R.status(aftersalesWorkOrderService.updateCompletionEnd(aftersalesWorkOrder)); } + /** + * 异常工单申述表状态 修改 + */ + @PostMapping("/updateAppeal") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入aftersalesAppeal") + public R update(@Valid @RequestBody AftersalesAppealEntity aftersalesAppeal) { + log.info("客服操作确定修改》》》》{}",aftersalesAppeal); + if(ObjectUtils.isNull(aftersalesAppeal.getId())){ + throw new ServiceException("申述ID不能为空！！"); + } + if(ObjectUtils.isNull(aftersalesAppeal.getWorkOrderId())){ + throw new ServiceException("异常工单ID不能为空！！"); + } + return R.status(aftersalesWorkOrderService.updateByIdAppel(aftersalesAppeal)); + } /** * 客服异常工单 查询处理结果全部信息数据 @@ -399,7 +418,6 @@ public class AftersalesWorkOrderController extends BladeController { if(aftersalesWorkOrder.getAssignList().isEmpty()){ throw new ServiceException("确定工单ID不能为空！！"); } - return R.status( aftersalesWorkOrderService.updateManagerConfirmed(aftersalesWorkOrder) ); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java index 6afa9d4a2..8c58f1471 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesWorkOrderDTO.java @@ -111,12 +111,14 @@ public class AftersalesWorkOrderDTO extends AftersalesWorkOrderEntity { * 配送任务Id */ private Long deliveryId; - - - - - - + /** + * 申述完结变动标识 1 申述成立 + */ + private String typesOf; + /** + * 申述Id + */ + private Long appealId; } 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 03bf5e0a7..5e6758180 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 @@ -81,10 +81,8 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') and lawo.waybill_mall = #{param.waybillMall } and lawo.delivery_driver = #{param.deliveryDriver } - and lawo.work_order_status in( #{param.workOrderStatus }) - and lawo.work_order_status in ('30','40') - and lawo.work_order_status in (21,30) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId} - or lawo.work_order_status in (80,100) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId} + and lawo.work_order_status in ('30','40') + and lawo.customer_service_id = #{param.customerServiceId } and lawo.customer_service_name = #{param.customerServiceName } and lawo.waybill_mall_id = #{param.waybillMallId } @@ -98,9 +96,15 @@ 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 ('10','20','30','40','50','60','70','80','90') + 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} + or lawo.work_order_status in (80,100) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId} + and lawo.warehouse_id = #{param.warehouseId} or lap.types_of = '2' and lap.business_id = #{param.warehouseId} + and lawo.work_order_status in( #{param.workOrderStatus }) or lap.types_of = '2' and lap.business_id = #{param.warehouseId} + ORDER BY lawo.create_time DESC diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index 7abad6398..9f5d32152 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -18,6 +18,7 @@ package com.logpm.aftersales.service; import com.logpm.aftersales.dto.AftersalesPackageScanDTO; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; +import com.logpm.aftersales.entity.AftersalesAppealEntity; import com.logpm.aftersales.entity.AftersalesSettlementEntity; import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; @@ -265,4 +266,11 @@ public interface IAftersalesWorkOrderService extends BaseService 0; + } + /** * 添加处理处理方信息 * @param aftersalesWorkOrderDTO From 0547b497e9abf6b65b9aaf3caa9e12a2c501d26a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 10 Jan 2024 16:53:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E7=9A=84=E8=BD=A6=E8=BE=86=E8=BE=93=E5=85=A5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/BasicdataVehicleController.java | 9 +++++++-- .../controller/BasicdataWarehouseController.java | 3 ++- .../logpm/basicdata/mapper/BasicdataVehicleMapper.java | 2 +- .../logpm/basicdata/mapper/BasicdataVehicleMapper.xml | 3 +++ .../basicdata/service/IBasicdataVehicleService.java | 2 +- .../service/impl/BasicdataVehicleServiceImpl.java | 8 ++++++-- .../service/impl/BasicdataWarehouseServiceImpl.java | 2 +- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java index cd8869478..efa88aa0e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataVehicleController.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -126,8 +127,12 @@ public class BasicdataVehicleController extends BladeController { @GetMapping("/dictionary") @ApiOperationSupport(order = 10) @ApiOperation(value = "车辆信息表",notes = "传入code") - public R> dictionary() { - List dictionary = basicdataVehicleService.selectBasicdataVehicleDictionary(); + public R> dictionary(@RequestParam(value = "vehicleNub",required = false) String vehicleNub) { + + + log.info(">>>>112 {}",vehicleNub); + + List dictionary = basicdataVehicleService.selectBasicdataVehicleDictionary(vehicleNub); return R.data(dictionary); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index de5335b82..0a3dad131 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java @@ -151,7 +151,8 @@ public class BasicdataWarehouseController extends BladeController { @GetMapping("/listName") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入warehouseWarehouse") - public R> listName(String name) { + public R> listName(@RequestParam("name") String name) { + log.info(">>>>>>>>>>>>>传入warehouseWarehouse name {}",name); List pages = warehouseService.pageListName(name); return R.data(pages); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java index f236a1cb7..03a894a10 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.java @@ -59,7 +59,7 @@ public interface BasicdataVehicleMapper extends BaseMapper selectBasicdataDictionary(); + List selectBasicdataDictionary(@Param("vehicleNub") String vehicleNub); List findCarListByName(@Param("carNumber") String carNumber); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml index 86f026e0c..f2a470fc5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataVehicleMapper.xml @@ -176,6 +176,9 @@ 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 5e6758180..cf62eb9a1 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 @@ -101,10 +101,13 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d 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} - or lawo.work_order_status in (80,100) and lap.processing_status = '4' and lap.business_id = #{param.warehouseId} - and lawo.warehouse_id = #{param.warehouseId} or lap.types_of = '2' and lap.business_id = #{param.warehouseId} - and lawo.work_order_status in( #{param.workOrderStatus }) or lap.types_of = '2' 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} 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 afa9f5c9c..9f0c2a3df 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 @@ -1618,11 +1618,17 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl collect = list.stream().map(AftersalesCompletionRecordEntity::getId).collect(Collectors.toList()); - completionRecordService.deleteLogic(collect); + if(!collect.isEmpty()){ + completionRecordService.deleteLogic(collect); + } completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities()); } //异常工单完结处理结果受款方 @@ -1641,11 +1649,26 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl collect = list.stream().map(AftersalesCompletionRecipientEntity::getId).collect(Collectors.toList()); - completionRecipientService.deleteLogic(collect); + if(!collect.isEmpty()){ + completionRecipientService.deleteLogic(collect); + } completionRecipientService.saveBatch(aftersalesWorkOrder.getCompletionRecipientEntities()); + } + AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity(); + if(ObjectUtils.isNotNull(aftersalesWorkOrder.getReasonArbitration())){ + + workOrderEntity.setId(aftersalesWorkOrder.getId()); + workOrderEntity.setReasonArbitration(aftersalesWorkOrder.getReasonArbitration()); } - return true; + //修改工单状态 + if(ObjectUtils.isNotNull(aftersalesWorkOrder.getTypesOf())){ + workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yiwanjei.getValue()); + return baseMapper.updateById(workOrderEntity) > 0; + } else { + return true; + } + } /** From 5bbc4e5972d1eb5d71b432d746afd5558f479825 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 10 Jan 2024 20:00:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1.=E6=A2=A6=E5=A4=A9=E7=9A=84=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../java/com/logpm/factory/TestService.java | 129 +++++++++++++++++- 2 files changed, 128 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-factory/src/main/resources/application-dev.yml b/blade-service/logpm-factory/src/main/resources/application-dev.yml index b70c1e123..3154bec1c 100644 --- a/blade-service/logpm-factory/src/main/resources/application-dev.yml +++ b/blade-service/logpm-factory/src/main/resources/application-dev.yml @@ -12,7 +12,7 @@ server: spring: #rabbitmq配置 rabbitmq: - host: 192.168.10.100 + host: 192.168.10.46 port: 5672 username: admin password: admin diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index 4695849e2..48384537e 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -413,7 +413,132 @@ public class TestService { - ahsv.add("{\"送货任务ID\":\"233441\",\"收货人\":\"刘华俊\",\"签收内容\":[{\"订单编号\":\"cqtkzs01DS-20463-0\",\"包条码\":\"CQTKZS01DS204630001\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230962\"},{\"订单编号\":\"cqtkzs01DS-20463-0\",\"包条码\":\"CQTKZS01DS204630002\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230962\"},{\"订单编号\":\"cqtkzs01DS-20463-0\",\"包条码\":\"CQTKZS01DS204630003\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230962\"},{\"订单编号\":\"cqtkzs01DS-20463-0\",\"包条码\":\"CQTKZS01DS204630004\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230962\"},{\"订单编号\":\"cqtkzs01DS-20463-0\",\"包条码\":\"CQTKZS01DS204630005\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230962\"},{\"订单编号\":\"cqtkzs01DS-20463-0\",\"包条码\":\"CQTKZS01DS204630006\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230962\"},{\"订单编号\":\"cqtkzs01DS-20463-0\",\"包条码\":\"CQTKZS01DS204630007\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230962\"},{\"订单编号\":\"cqxdzs01DS-20662-0\",\"包条码\":\"CQXDZS01DS206620001\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20127-0\",\"包条码\":\"SCLTSM03DS201270001\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231064\"},{\"订单编号\":\"scltsm03DS-20127-0\",\"包条码\":\"SCLTSM03DS201270002\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231064\"},{\"订单编号\":\"scltsm03DS-20127-0\",\"包条码\":\"SCLTSM03DS201270003\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231064\"},{\"订单编号\":\"scltsm03DS-20127-0\",\"包条码\":\"SCLTSM03DS201270004\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231064\"},{\"订单编号\":\"scltsm03DS-20127-0\",\"包条码\":\"SCLTSM03DS201270005\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231064\"},{\"订单编号\":\"scltsm03DS-20127-0\",\"包条码\":\"SCLTSM03DS201270006\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231064\"},{\"订单编号\":\"scltsm03DS-20127-0\",\"包条码\":\"SCLTSM03DS201270007\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231064\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290001\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290002\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290003\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290004\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290005\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290006\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290007\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20129-0\",\"包条码\":\"SCLTSM03DS201290008\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231075\"},{\"订单编号\":\"scltsm03DS-20153-0\",\"包条码\":\"SCLTSM03DS201530001\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-2311120\"},{\"订单编号\":\"scltsm03DS-20153-0\",\"包条码\":\"SCLTSM03DS201530002\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-2311120\"},{\"订单编号\":\"scltsm03DS-20153-0\",\"包条码\":\"SCLTSM03DS201530003\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-2311120\"},{\"订单编号\":\"scltsm03DS-20153-0\",\"包条码\":\"SCLTSM03DS201530004\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-2311120\"},{\"订单编号\":\"scltsm03DS-20153-0\",\"包条码\":\"SCLTSM03DS201530005\",\"签收时间\":\"2023-12-06 14:36:17\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-2311120\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/f5e9a20844a7d0d10bfae9b639caf0e7.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/f5e9a20844a7d0d10bfae9b639caf0e7.jpg\"}]}"); + ahsv.add("{\n" + + " \"送货任务ID\": \"238770\",\n" + + " \"收货人\": \"罗敏\",\n" + + " \"签收内容\": [\n" + + " \n" + + " \n" + + " {\n" + + " \"订单编号\": \"ggdzjj01DS-20374-0\",\n" + + " \"包条码\": \"02311132484\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " \n" + + " {\n" + + " \"订单编号\": \"ggdzjj01DS-20378-0\",\n" + + " \"包条码\": \"02311147430\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " \n" + + " \n" + + " {\n" + + " \"订单编号\": \"ggdzjj01DS-20388-0\",\n" + + " \"包条码\": \"02311132483\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"ggdzjj01DS-20390-0\",\n" + + " \"包条码\": \"02311147380\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " \n" + + " \n" + + " \n" + + " {\n" + + " \"订单编号\": \"HY0015-20514-0\",\n" + + " \"包条码\": \"02311164099\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"HY0015-20516-0\",\n" + + " \"包条码\": \"02311164098\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " {\n" + + " \"订单编号\": \"qjdszx01DS-20136-0\",\n" + + " \"包条码\": \"02311131018\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " {\n" + + " \"订单编号\": \"scltjj01DS-20559-0\",\n" + + " \"包条码\": \"02311137170\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"scltjj01DS-20561-0\",\n" + + " \"包条码\": \"02311137171\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " {\n" + + " \"订单编号\": \"scxblzs01DS-20241-0\",\n" + + " \"包条码\": \"02311123645\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " },\n" + + " \n" + + " {\n" + + " \"订单编号\": \"scxblzs01DS-20247-0\",\n" + + " \"包条码\": \"02311155718\",\n" + + " \"签收时间\": \"2024-01-03 08:38:06\",\n" + + " \"仓库编号\": \"CDZXC3\",\n" + + " \"作业仓库\": \"成都中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYJIASHAN-231125\"\n" + + " }\n" + + " \n" + + " ],\n" + + " \"签收图片\": [\n" + + " {\n" + + " \"image\": \"http://htys.oss-cn-chengdu.aliyuncs.com/htys/15fd7f5c6dd82c2678bc7d90cfab2c93.jpg\"\n" + + " },\n" + + " {\n" + + " \"image\": \"http://htys.oss-cn-chengdu.aliyuncs.com/htys/15fd7f5c6dd82c2678bc7d90cfab2c93.jpg\"\n" + + " }\n" + + " ]\n" + + "}"); @@ -434,7 +559,7 @@ public class TestService { // String data ="{\"送货任务ID\":\"209826\",\"收货人\":\"陈洁\",\"签收内容\":[{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780001\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780002\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780003\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780004\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780005\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780006\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780007\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780008\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"},{\"订单编号\":\"scxblzs01DS-20178-0\",\"包条码\":\"SCXBLZS01DS201780009\",\"签收时间\":\"2023-10-26 15:19:14\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231016\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/d087dde59e2d8bebe7e9190fb60ca895.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/9758dab686a42f895cd2fecab30cd33f.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/23b2075a896169601f3013e552d42b2b.jpg\"}]}"; - String token = "godvWfaLz1PCjyf8dSlBGPh6z/t/h3FNPKMc9+x9sW9IGTQsQJa6t/fpX15Dbw13Efs5taUbmoF7Pvla8N1dFMsaPKRG/N6bR2bBrpGppbQ="; + String token = "godvWfaLz1PCjyf8dSlBGPh6z/t/h3FNPKMc9+x9sW9IGTQsQJa6t/fpX15Dbw13jI99odr1yHxAoI4iaCaH3csaPKRG/N6bR2bBrpGppbQ="; //处理逻辑 String result = HttpRequest.post(url) .header("APPKEY", appkey)