From 6472c2a65c8cd7af5b711484dccdbcb9acab70c5 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Tue, 15 Aug 2023 21:20:08 +0800 Subject: [PATCH] =?UTF-8?q?tips:=201.=E5=A2=9E=E5=8A=A0=E6=A2=A6=E5=A4=A9?= =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E7=9A=84=E6=9F=A5=E8=AF=A2=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E5=8F=91=E8=BF=90=E8=BD=A6=E6=AC=A1=E7=9A=84?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8E=A8=E9=80=81=203.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=B9=E8=AE=A2=E5=8D=95=E7=9A=84=E6=8E=A8=E9=80=81=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/DictBizConstant.java | 10 ++--- .../common/constant/ModuleNameConstant.java | 2 +- .../factory/mt/entity/MtFactoryOrderMain.java | 2 + .../factory/mt/vo/MtPackageInfoDetailVO.java | 2 +- .../factory/snm/feign/IMtOrderMainClinet.java | 2 +- .../snm/vo/MTOrderPackageRelationVO.java | 2 +- .../feign/IAdvanceDetailClient.java | 2 +- .../DistributionDeliveryListController.java | 4 +- .../DistributionDeliveryListServiceImpl.java | 2 +- .../MtFactoryOrderMainController.java | 20 ++++++++- .../controller/MtPackageInfoController.java | 1 - .../mt/mapper/MtFactoryOrderMainMapper.java | 3 +- .../mt/mapper/MtFactoryOrderMainMapper.xml | 5 ++- .../mt/mapper/MtPackageInfoMapper.java | 2 +- .../service/IMtFactoryOrderMainService.java | 14 +++--- .../mt/service/IMtPackageInfoService.java | 2 +- .../impl/MtFactoryDataServiceImpl.java | 20 +++++++-- .../impl/MtFactoryOrderMainServiceImpl.java | 43 +++++++++++++++++-- .../impl/MtPackageInfoServiceImpl.java | 5 +-- .../factory/receiver/UnloadCarComHandler.java | 23 ++-------- .../java/com/logpm/factory/TestService.java | 6 +-- doc/dpm/物流租户系统.pdma.json | 4 +- 22 files changed, 116 insertions(+), 60 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index 9908a5e11..64b5bdd5a 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -20,14 +20,14 @@ public class DictBizConstant { public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态 - public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态 - public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包间备货状态 - public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包间上架状态 + public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包件冻结状态 + public static final String ORDER_PACKAGE_STOCKUP_STATUS = "order_package_stockup_status";//包件备货状态 + public static final String ORDER_PACKAGE_GROUNDING_STATUS = "order_package_grounding_status";//包件上架状态 public static final String ORDER_PACKAGE_RESERVATION_STATUS = "order_package_reservation_status";//包件预约状态 - public static final String STOCK_ALLOCATION = "stock_assign_status";//包间上架状态 + public static final String STOCK_ALLOCATION = "stock_assign_status";//包件上架状态 public static final String CERTIFICATE_TYPE = "certificate_type";//证件类型 public static final String DELIVERY_COST = "delivery_cost";//证件类型 - public static final String LOGPM_UNIT = "logpm_unit";//包间上架状态 + public static final String LOGPM_UNIT = "logpm_unit";//包件上架状态 diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 301dcc0d5..1e2dbc087 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-pref"; /** * 工厂对接服务名称 diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java index 02b7c129f..3ab22e5be 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java @@ -1,5 +1,6 @@ package com.logpm.factory.mt.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; @@ -62,6 +63,7 @@ public class MtFactoryOrderMain extends BaseEntity { //@JsonProperty("反馈梦天状态") @ApiModelProperty(value = "反馈梦天状态") + @TableField(exist = false) private Integer pushStatus; // // //@JsonProperty("推送时间") diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoDetailVO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoDetailVO.java index 27dd39824..8c3748639 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoDetailVO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoDetailVO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.List; /** - * 梦天包间详情 + * 梦天包件详情 */ @Data public class MtPackageInfoDetailVO extends MtPackageInfoVO { diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java index 7773a34ec..24d269e4a 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/feign/IMtOrderMainClinet.java @@ -20,7 +20,7 @@ public interface IMtOrderMainClinet { /** - * 获取梦天工厂订单 包间 主订单 的关系 + * 获取梦天工厂订单 包件 主订单 的关系 * * @return */ diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/MTOrderPackageRelationVO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/MTOrderPackageRelationVO.java index fcb223229..302fa4fe7 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/MTOrderPackageRelationVO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/MTOrderPackageRelationVO.java @@ -6,7 +6,7 @@ import java.io.Serializable; /** - * 梦天 订单 主订单 包间 关系 用于判断车次中的订单是否包含 + * 梦天 订单 主订单 包件 关系 用于判断车次中的订单是否包含 */ @Data public class MTOrderPackageRelationVO implements Serializable { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java index 444bda54a..5b36a3e00 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java @@ -81,7 +81,7 @@ public interface IAdvanceDetailClient { /** - * 根据卸车车次 查询老系统中 这个车次中装的包间 + * 根据卸车车次 查询老系统中 这个车次中装的包件 * @param unloadCarNum * @return */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index be82145b0..44a990633 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -81,11 +81,11 @@ public class DistributionDeliveryListController extends BladeController { } /** - * 查看包间明细 详情 + * 查看包件明细 详情 */ @GetMapping("/wrapdetail") @ApiOperationSupport(order = 1) - @ApiOperation(value = "查看包间详情", notes = "传入distributionDeliveryList") + @ApiOperation(value = "查看包件详情", notes = "传入distributionDeliveryList") public R> wrapdetail(DistributionDeliveryInfoDTO distributionDeliveryInfoDTO, Query query) { IPage pages = distributionDeliveryInfoService.selectDistributionDeliveryInfowrapPage(Condition.getPage(query), distributionDeliveryInfoDTO); return R.data(pages); 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 480f0c885..7ad549989 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 @@ -646,7 +646,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl> listBySendData(@ApiIgnore @RequestParam Map mtfactoryOrderMain, Query query) { - IPage pages = mtfactoryOrderMainService.selectMtFactoryOrderMainByPushType(Condition.getPage(query), Condition.getQueryWrapper(mtfactoryOrderMain, MtFactoryOrderMainVO.class)); + MtFactoryOrderMainVO mainVO + = JSON.parseObject(JSON.toJSONString(mtfactoryOrderMain), MtFactoryOrderMainVO.class); + + IPage pages = mtfactoryOrderMainService.selectMtFactoryOrderMainByPushType(Condition.getPage(query), mainVO); return R.data(pages); } @@ -121,7 +128,18 @@ public class MtFactoryOrderMainController extends BladeController { return R.status(mtfactoryOrderMainService.deleteLogic(Func.toLongList(ids))); } + /** + * 梦天车次推送 + */ + @PostMapping("/beachPush") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "梦天车次推送", notes = "传入ids") + public R beachPush(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,@ApiParam(value = "推送时间", required = false)String data ) { + + List longs = Func.toLongList(ids); + return R.status(mtfactoryOrderMainService.beachPush(longs,data)); + } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtPackageInfoController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtPackageInfoController.java index 730fef7bd..702376ac4 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtPackageInfoController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtPackageInfoController.java @@ -166,7 +166,6 @@ public class MtPackageInfoController extends BladeController { List longs = Func.toLongList(ids); - return R.status(mtpackageInfoService.beachPush(longs,data)); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.java index cdf1fd45f..359577078 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.factory.mt.entity.MtFactoryOrderMain; import com.logpm.factory.mt.vo.MtFactoryOrderMainVO; import com.logpm.factory.snm.vo.MTOrderPackageRelationVO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +24,6 @@ public interface MtFactoryOrderMainMapper extends BaseMapper List selectMtFactoryOrderMainPage(IPage page, MtFactoryOrderMainVO mtfactoryOrderMain); - List selectMtFactoryOrderMainByPushType(IPage page, QueryWrapper mtFactoryOrderMain); + List selectMtFactoryOrderMainByPushType(IPage page, @Param("mtFactoryOrderMain") MtFactoryOrderMainVO mtFactoryOrderMain); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml index b1905c545..214989502 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml @@ -38,7 +38,6 @@ - @@ -74,7 +73,9 @@ where mfom.push_status is null mpd.push_status from mt_factory_order_main mfo LEFT JOIN mt_push_data mpd on mpd.ref_id= mfo.id - + + and mfo.invoice_order_code= #{mtFactoryOrderMain.invoiceOrderCode} + diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.java index ffdb2c5fd..42d1d0429 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.java @@ -24,7 +24,7 @@ public interface MtPackageInfoMapper extends BaseMapper { List listBySendData(IPage page,@Param("mtPackageInfoVO") MtPackageInfoVO mtPackageInfoVO); /** - * 查询单个包间信息对象 + * 查询单个包件信息对象 * @param mtpackageInfo * @return */ diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryOrderMainService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryOrderMainService.java index 27085326c..13a027c42 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryOrderMainService.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtFactoryOrderMainService.java @@ -30,12 +30,14 @@ public interface IMtFactoryOrderMainService extends BaseService selectMtFactoryOrderMainPage(IPage page, MtFactoryOrderMainVO mtfactoryOrderMain); - IPage selectMtFactoryOrderMainByPushType(IPage page, QueryWrapper mtFactoryOrderMain); - - - - - + IPage selectMtFactoryOrderMainByPushType(IPage page, MtFactoryOrderMainVO mtFactoryOrderMain); + /** + * 推送车次 + * @param longs + * @param data + * @return + */ + Boolean beachPush(List longs, String data); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtPackageInfoService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtPackageInfoService.java index a9548899c..260fe008e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtPackageInfoService.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtPackageInfoService.java @@ -26,7 +26,7 @@ public interface IMtPackageInfoService extends BaseService { Boolean beachPush(List toLongList, String data); /** - * 查询 包间详情 + * 查询 包件详情 * @param mtpackageInfo * @return */ diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java index 9074baaef..6c563c7e9 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java @@ -497,11 +497,23 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { //推送数据到梦天 //请求参数 - logger.info(">>>>>>sendUnloadCarNum tag ={}", 1); R r =sendMtFactoryData(mtFactoryProperties.getUrl() + "/ZXCFaHuoDan/QueRenShouHuo", s, 4,unloadCarNum); - logger.info(">>>>>>sendUnloadCarNum r ={}", r); - - logger.info(">>>>>>sendUnloadCarNum tag ={}", 2); + if (r.getCode() == ResultCode.SUCCESS.getCode()) { + log.info("##################{} 梦天确认签收数据推送2", unloadCarNum); + MtPushData mtPushData = new MtPushData(); + mtPushData.setPushTime(new Date()); + mtPushData.setPushStatus(1);// 推送状态 + mtPushData.setRefCode(unloadCarNum); + mtPushData.setRefType(1);// 订单主表 + // todo 这里需要查询主推送单的 ID + List mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(unloadCarNum); + if (mtFactoryOrderMainList.size() > 0) { + mtFactoryOrderMainList.get(0); + mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId()); + } + // 插入推送数据 + mtPushDataService.save(mtPushData); + } return r; diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java index b84b4892d..89ded4836 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java @@ -2,24 +2,39 @@ package com.logpm.factory.mt.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.fasterxml.jackson.core.JsonProcessingException; import com.logpm.factory.mt.entity.MtFactoryOrderMain; import com.logpm.factory.mt.mapper.MtFactoryOrderMainMapper; +import com.logpm.factory.mt.service.IMtFactoryDataService; import com.logpm.factory.mt.service.IMtFactoryOrderMainService; import com.logpm.factory.mt.vo.MtFactoryOrderMainVO; import com.logpm.factory.mt.wrapper.MtFactoryOrderMainWrapper; import com.logpm.factory.snm.vo.MTOrderPackageRelationVO; import lombok.AllArgsConstructor; +import lombok.val; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.security.NoSuchAlgorithmException; +import java.text.ParseException; +import java.util.Date; import java.util.List; -@AllArgsConstructor @Service public class MtFactoryOrderMainServiceImpl extends BaseServiceImpl implements IMtFactoryOrderMainService { - private final MtFactoryOrderMainMapper mtFactoryOrderMainMapper; + @Autowired + private MtFactoryOrderMainMapper mtFactoryOrderMainMapper; + + @Autowired + @Lazy + private IMtFactoryDataService mtFactoryDataService; + @Override public List mtOrderPackageRelation() { @@ -41,10 +56,32 @@ public class MtFactoryOrderMainServiceImpl extends BaseServiceImpl selectMtFactoryOrderMainByPushType(IPage page, QueryWrapper mtFactoryOrderMain) { + public IPage selectMtFactoryOrderMainByPushType(IPage page, MtFactoryOrderMainVO mtFactoryOrderMain) { List ls = baseMapper.selectMtFactoryOrderMainByPushType(page, mtFactoryOrderMain); page.setRecords(MtFactoryOrderMainWrapper.build().listVO(ls)) ; return page; } + + @Override + public Boolean beachPush(List longs, String data) { + + if(StringUtils.isNotEmpty(data)){ + data = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + + for (Long aLong : longs) { + MtFactoryOrderMain mtFactoryOrderMain = baseMapper.selectById(aLong); + try { + mtFactoryDataService.sendUnloadCarNum(mtFactoryOrderMain.getInvoiceOrderCode(),data); + } catch (ParseException e) { + e.printStackTrace(); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + } + return true; + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java index 674438d2b..3050c2e1d 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java @@ -70,7 +70,7 @@ public class MtPackageInfoServiceImpl extends BaseServiceImpl t = stringListMap.get(s); - //得到这个批次下面所有的包间 + //得到这个批次下面所有的包件 List strs = t.stream().map(MTOrderPackageRelationVO::getPackageCode).collect(Collectors.toList()); - // 当前批次的包间 在 这个配载计划中存在一个 则进行通知 + // 当前批次的包件 在 这个配载计划中存在一个 则进行通知 for (String mtStr : carNumList) { if (strs.contains(mtStr)) { carNum = s; @@ -140,22 +140,7 @@ public class UnloadCarComHandler { } R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate); log.info("##################{} 梦天确认签收数据推送1", carNum); - if (r.getCode() == ResultCode.SUCCESS.getCode()) { - log.info("##################{} 梦天确认签收数据推送2", carNum); - MtPushData mtPushData = new MtPushData(); - mtPushData.setPushTime(new Date()); - mtPushData.setPushStatus(1);// 推送状态 - mtPushData.setRefCode(carNum); - mtPushData.setRefType(1);// 订单主表 - // todo 这里需要查询主推送单的 ID - List mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(carNum); - if (mtFactoryOrderMainList.size() > 0) { - mtFactoryOrderMainList.get(0); - mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId()); - } - // 插入推送数据 - mtPushDataService.save(mtPushData); - } + } 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 495771f01..dc0fa2e52 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 @@ -68,7 +68,7 @@ // 2. 需要判断这个车次是否市梦天的 // 3. 查询这个车次上的运单是否市梦天的 // -// 4.查询包间对应的梦天发给我们的批次号 +// 4.查询包件对应的梦天发给我们的批次号 // */ // UnloadCarDTO unloadCarDTO = new UnloadCarDTO(); // unloadCarDTO.setCompleteDate("2023-08-08 15:39:40"); @@ -91,9 +91,9 @@ // String carNum = null; // // 得到某个工厂运输批次的集合 // List t = stringListMap.get(s); -// //得到这个批次下面所有的包间 +// //得到这个批次下面所有的包件 // List strs = t.stream().map(MTOrderPackageRelationVO::getPackageCode).collect(Collectors.toList()); -// // 当前批次的包间 在 这个配载计划中存在一个 则进行通知 +// // 当前批次的包件 在 这个配载计划中存在一个 则进行通知 // for (String mtStr : carNumList) { // if (strs.contains(mtStr)) { // carNum = s; diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index 151ba3c15..cf8a0c23a 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -13849,7 +13849,7 @@ } }, "defKey": "logpm_mainline_temporary_order", - "defName": "包间表", + "defName": "包件表", "comment": "", "properties": { "partitioned by": "(date string)", @@ -58659,4 +58659,4 @@ } } ] -} \ No newline at end of file +}