From 821e46b64ed3296db7ec37d5469ab4c7bd616e27 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 13 Nov 2023 09:30:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=98=E7=9B=98=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/feign/IBasicdataTrayClient.java | 7 +++++++ .../vo/DistributionStockupOrderListVO.java | 4 +++- .../vo/DistributionStockupStockListVO.java | 1 + .../basicdata/feign/BasicdataTrayClient.java | 13 +++++++++++++ .../DistributionStockupAppController.java | 18 ++++++++++++------ 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java index 692add5a1..f79eced5b 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java @@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 托盘 Feign接口类 * @@ -38,6 +40,7 @@ public interface IBasicdataTrayClient { String API_PREFIX = "tray/client"; String TOP = API_PREFIX + "/top"; + String GETTRAYENTITY = API_PREFIX + "/getTrayEntity"; /** * 获取托盘列表 @@ -57,4 +60,8 @@ public interface IBasicdataTrayClient { @PostMapping(API_PREFIX+"/updateTrayStatus") void updateTrayStatus(@RequestParam("trayId") Long trayId, @RequestParam("trayStatus") int trayStatus); + + @GetMapping(GETTRAYENTITY) + List getTrayEntityList(@RequestParam("trayId") String trayId); + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java index 0f7f40d7b..f3362d9e9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java @@ -20,8 +20,10 @@ public class DistributionStockupOrderListVO implements Serializable { private String stockArticleId;//订单ID @ApiModelProperty(value = "托盘") private String pallet;//托盘 - @ApiModelProperty(value = "整托状态") + @ApiModelProperty(value = "托盘状态") private boolean trayLean;//整托状态 + @ApiModelProperty(value = "托盘名称") + private String trayLeanName;//整托状态 @ApiModelProperty(value = "货位配货状态") private boolean completeStact;//货位配货状态 @ApiModelProperty(value = "容器件数") diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java index f4060953d..3c08cc57e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java @@ -27,6 +27,7 @@ public class DistributionStockupStockListVO implements Serializable { private Integer realNum;//实际数量 private String trayName;//托盘信息 + private String trayNames;//托盘信息 private Boolean trayLean;//整托状态 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java index 324fe0700..34283d1c8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java @@ -19,6 +19,8 @@ package com.logpm.basicdata.feign; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.entity.BasicdataTrayEntity; import com.logpm.basicdata.service.IBasicdataTrayService; import lombok.AllArgsConstructor; @@ -29,6 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 托盘 Feign实现类 * @@ -79,4 +83,13 @@ public class BasicdataTrayClient implements IBasicdataTrayClient { basicdataTrayService.update(updateWrapper); } + + @Override + @GetMapping(GETTRAYENTITY) + public List getTrayEntityList(String trayId) { + return basicdataTrayService.list(Wrappers.query().lambda() + .in(ObjectUtils.isNotNull(trayId),BasicdataTrayEntity::getId,trayId.split(",")) + ); + } + } 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 f6d154676..403deaba6 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 @@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.entity.BasicdataTrayEntity; import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient; +import com.logpm.basicdata.feign.IBasicdataTrayClient; import com.logpm.distribution.bean.Resp; import com.logpm.distribution.config.RedissonConfig; @@ -32,10 +34,7 @@ import com.logpm.distribution.entity.*; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; -import com.logpm.warehouse.feign.IWarehouseGoodsAllocationClient; -import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; -import com.logpm.warehouse.feign.IWarehouseUpdownGoodsLogClient; -import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; +import com.logpm.warehouse.feign.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -82,7 +81,7 @@ public class DistributionStockupAppController extends BladeController { private final IDistributionReservationService distributionReservationService; private final IBasicdataGoodsAreaClient basicdataGoodsAreaClient; private final IDistrilbutionBillStockService distrilbutionBillStockService; - + private final IBasicdataTrayClient basicdataTrayClient; private final IDistributionStockService distributionStockService; private final IDistributionStockArticleService distributionStockArticleService; private final IDistributionParcelListService distributionParcelListService; @@ -215,8 +214,11 @@ public class DistributionStockupAppController extends BladeController { if(!list.isEmpty()){ List collect = list.stream().filter(i -> { // if (ObjectUtils.isNotNull(i.getTrayId()) && !i.getPallet().contains(",") && !i.isCompleteStact() && ObjectUtils.isNotNull( i.getAllocationId()) ) { - if (ObjectUtils.isNotNull(i.getTrayId()) && !i.isCompleteStact()) { + List trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId()); + if(ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull( trayEntityList.get(0))){ + i.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(","))); + } i.setTrayLean(distributionStockupService.getTrayBoot(i,stockupDTO.getTypeService())); } return true; @@ -258,6 +260,10 @@ public class DistributionStockupAppController extends BladeController { // vo.setTrayLean(aBoolean); // if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) { if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.isCompleteStact() ) { + List trayEntityList = basicdataTrayClient.getTrayEntityList(vo.getTrayId()); + if(ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull( trayEntityList.get(0))){ + vo.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(","))); + } //有没有可用整托配货的数据 vo.setTrayLean(distributionStockupService.getTrayBoot(vo,stockupDTO.getTypeService())); } From 9bf11b122ab50e9ec610f30fd1cdd6fce25166c2 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 13 Nov 2023 16:18:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0Ht=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=AC=A7=E6=B4=BE=E7=B3=BB=E7=BB=9F=20=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=8E=A8=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E8=A1=A8=E4=B8=ADht=5Fuse=5Fop=5Fshops=20key=20?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E8=BF=99=E4=BA=9Bkey=20value=20=20=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E8=BF=99=E5=AD=97=E5=85=B8=E8=A1=A8=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B0=86=E4=B8=8D=E4=BC=9A=E8=BF=9B=E8=A1=8C=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OuPaiFactoryServiceImpl.java | 35 ++- .../java/com/logpm/factory/TestService.java | 240 +++++++++++++++++- 2 files changed, 269 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 7578d5f60..18f9944f2 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -31,6 +31,8 @@ import org.springblade.core.oss.model.BladeFile; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springblade.resource.feign.IOssClient; +import org.springblade.system.cache.DictCache; +import org.springblade.system.entity.Dict; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -42,10 +44,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.io.OutputStream; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import java.util.*; @Slf4j @Service @@ -355,6 +354,12 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { return Resp.fail(400, "包条为干仓配的数据类型"); } + boolean isPushHtNomal = checkOpfactoryOrderBusinessModel(factoryOrder); + if(!isPushHtNomal){ + log.info("oupai- 该包条为汇通使用欧派系统进行作业类型型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel()); + return Resp.fail(400, "该包条为汇通使用欧派系统进行作业类型"); + } + // 通过仓库编码查询 ReceivingOrderEntity receivingOrderEntity = receivingOrderMapper.selectById(factoryOrder.getReceivingId()); @@ -411,6 +416,28 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { return Resp.success("物流状态传递成功"); } + /** + * 根据汇通业务提供是否操作欧派系统的商场 来决定是否会推数据 + * 如果需要使用欧派系统 这里就需要不进行回传 + * @param factoryOrder 工厂订单 + * @return true 匹配到维护的商场 就不需要进行回传 + */ + private boolean checkOpfactoryOrderBusinessModel(FactoryOrderEntity factoryOrder) { + + String shopCode = factoryOrder.getShopCode(); + // 获取字典上配置的不 + log.info(" >>>>>>>>>>>>>>>>>>>>>>> 传入的订单参数商场 {}",shopCode); + List htUseOpShops = DictCache.getList("ht_use_op_shops"); + log.info(" >>>>>>>>>>>>>>>>>>>>>>> 配置的使用欧派系统的商场 {}",htUseOpShops); + for (Dict htUseOpShop : htUseOpShops) { + if(shopCode.equals(htUseOpShop.getDictKey())){ + return true; + } + } + return false; + + } + private void handleSignBillData(String url, Integer event) { OpOrderStatusLogEntity opOrderStatusLogEntity = sendRequestData(url, event); 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 94e1d8653..85a1f8479 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 @@ -43,6 +43,8 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.resource.feign.IOssClient; +import org.springblade.system.cache.DictCache; +import org.springblade.system.entity.Dict; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; @@ -391,8 +393,238 @@ public class TestService { +// ahsv.add("{\"送货任务ID\":\"215750\",\"收货人\":\"李小飞\",\"签收内容\":[{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20507-0\",\"包条码\":\"CQTKZS01DS205070006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231011\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqtkzs01DS-20511-0\",\"包条码\":\"CQTKZS01DS205110006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231024\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530007\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530008\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20053-0\",\"包条码\":\"CQXDSMJ01DS200530009\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230939\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650001\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650002\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650003\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650004\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650005\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650006\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"},{\"订单编号\":\"cqxdsmj01DS-20065-0\",\"包条码\":\"CQXDSMJ01DS200650007\",\"签收时间\":\"2023-11-05 17:38:22\",\"仓库编号\":\"CQZXC\",\"作业仓库\":\"重庆中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230949\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/7d5d379d8150f763930d1a91d182b7d2.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/7d5d379d8150f763930d1a91d182b7d2.jpg\"}]}"); + ahsv.add("{\n" + + " \"送货任务ID\": \"218895\",\n" + + " \"收货人\": \"王舰\",\n" + + " \"签收内容\": [\n" + + " \n" + + " \n" + + " \n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + + " \"包条码\": \"CQTKZS01DS205310001\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + + " \"包条码\": \"CQTKZS01DS205310002\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + + " \"包条码\": \"CQTKZS01DS205310003\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + + " \"包条码\": \"CQTKZS01DS205310004\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + + " \"包条码\": \"CQTKZS01DS205310005\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + + " \"包条码\": \"CQTKZS01DS205310006\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20531-0\",\n" + + " \"包条码\": \"CQTKZS01DS205310007\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231064\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20563-0\",\n" + + " \"包条码\": \"CQTKZS01DS205630001\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231105\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760001\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760002\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760003\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760004\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760005\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760006\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760007\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760008\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760009\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20476-0\",\n" + + " \"包条码\": \"CQTKZS01DS204760010\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-230969\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390001\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390002\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390003\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390004\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390005\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390006\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390007\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " },\n" + + " {\n" + + " \"订单编号\": \"cqtkzs01DS-20539-0\",\n" + + " \"包条码\": \"CQTKZS01DS205390008\",\n" + + " \"签收时间\": \"2023-11-10 17:27:53\",\n" + + " \"仓库编号\": \"CQZXC\",\n" + + " \"作业仓库\": \"重庆中心仓(汇通)\",\n" + + " \"发货单编号\": \"HYLEJIA-231075\"\n" + + " }\n" + + " ],\n" + + " \"签收图片\": [\n" + + " {\n" + + " \"image\": \"http://htys.oss-cn-chengdu.aliyuncs.com/htys/a43ab13eb2502522d7554bfb2f87c016.jpg\"\n" + + " },\n" + + " {\n" + + " \"image\": \"http://htys.oss-cn-chengdu.aliyuncs.com/htys/f5beded80c8cec8bae63cd06ec02182e.jpg\"\n" + + " }\n" + + " ]\n" + + "}"); + + + //ahsv.add("{\"送货任务ID\":\"210315\",\"收货人\":\"李荣忠\",\"签收内容\":[{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750001\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750002\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750003\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750004\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750005\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750006\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750007\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750008\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750009\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750010\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/5675a6a2c99a47442995b45c7f700330.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/6e97901316c8854cb45260cae85d36e5.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/d3090f8e044bbc442331c4f04fe54c32.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/02fe82d8431d17969fac8e0747855a09.jpg\"}]}"); - ahsv.add("{\"送货任务ID\":\"215330\",\"收货人\":\"曹海静（美画）\",\"签收内容\":[{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930001\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930002\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930003\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930004\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930005\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/a7ead4403bc3f2407abd67da0ee78c09.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/6766998be765d6f1c8ba8e046ca46979.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/aeac81821a28de4391544f248e78cd21.jpg\"}]}"); + +// ahsv.add("{\"送货任务ID\":\"215330\",\"收货人\":\"曹海静（美画）\",\"签收内容\":[{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930001\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930002\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930003\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930004\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930005\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/a7ead4403bc3f2407abd67da0ee78c09.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/6766998be765d6f1c8ba8e046ca46979.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/aeac81821a28de4391544f248e78cd21.jpg\"}]}"); // ahsv.add("{\"送货任务ID\":\"210344\",\"收货人\":\"王思\",\"签收内容\":[{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200001\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200002\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200003\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200004\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200005\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200006\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200007\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200008\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200009\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200010\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/8b831a30d1eae33ed8b29ff95a86f4a9.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/1016c8a5453ee8b3e48410a8ac43dc34.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/f0f0c9a5ed932847a83a677069abe75b.jpg\"}]}"); // ahsv.add("{\"送货任务ID\":\"210336\",\"收货人\":\"家装事业部\",\"签收内容\":[{\"订单编号\":\"HY0015-20320-0\",\"包条码\":\"HY0015203200001\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"},{\"订单编号\":\"HY0015-20320-0\",\"包条码\":\"HY0015203200002\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"},{\"订单编号\":\"HY0015-20321-0\",\"包条码\":\"HY0015203210001\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"},{\"订单编号\":\"HY0015-20321-0\",\"包条码\":\"HY0015203210002\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/ac9f6f168243da22067747ebcc98bd94.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/8c26d72abd7b89a9c9ab65884582e67a.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/477ab33a0518d0fd3e6887656da2c342.jpg\"}]}"); // ahsv.add("{\"送货任务ID\":\"210320\",\"收货人\":\"陈蕾\",\"签收内容\":[{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660001\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660002\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660003\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660004\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660005\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660006\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/10f6b1ad8dab16a07222d56ac828d1b0.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/b1c62e225f1cd19d7056c39f84393a77.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/008f4892b39972a934b95167ebf74305.jpg\"}]}"); @@ -421,7 +653,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 = "AMiwQcwT33JksqEfDeRFbsYsDjx5fwi5KGGpKqoVn7qmCSiA3fxQ7eCz0ROrbISdPYQo+K6rUwoJ53u58Bv85A=="; + String token = "AMiwQcwT33JksqEfDeRFbrZl7/QQJUBnW4JG15rpt0RAjGQVZ1IikBGOdXFog0BUPYQo+K6rUwoJ53u58Bv85A=="; //处理逻辑 String result = HttpRequest.post(url) .header("APPKEY", appkey) @@ -727,6 +959,10 @@ public class TestService { @Test public void test16(){ + + // 获取字典上配置的不 + List htUseOpShops = DictCache.getList("ht_use_op_shops"); + System.out.println(htUseOpShops); } From 6de11ae85deffe9e299adb07f1ce46b6bc76c85b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 13 Nov 2023 16:20:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/oupai/service/impl/OuPaiFactoryServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 18f9944f2..e5e797f28 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -355,7 +355,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { } boolean isPushHtNomal = checkOpfactoryOrderBusinessModel(factoryOrder); - if(!isPushHtNomal){ + if(isPushHtNomal){ log.info("oupai- 该包条为汇通使用欧派系统进行作业类型型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel()); return Resp.fail(400, "该包条为汇通使用欧派系统进行作业类型"); } @@ -425,7 +425,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { private boolean checkOpfactoryOrderBusinessModel(FactoryOrderEntity factoryOrder) { String shopCode = factoryOrder.getShopCode(); - // 获取字典上配置的不 + // 获取字典上配置 log.info(" >>>>>>>>>>>>>>>>>>>>>>> 传入的订单参数商场 {}",shopCode); List htUseOpShops = DictCache.getList("ht_use_op_shops"); log.info(" >>>>>>>>>>>>>>>>>>>>>>> 配置的使用欧派系统的商场 {}",htUseOpShops);