diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java index 56b1b7b4f..f317c3605 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java @@ -72,6 +72,9 @@ public class TrunklineCarsLoadLineEntity extends TenantEntity { /** 卸车确认人名称 */ @ApiModelProperty(name = "卸车确认人名称",notes = "") private String unloadUserName ; + /** 卸车确认时间 */ + @ApiModelProperty(name = "卸车确认时间",notes = "") + private Date unloadDate ; /** 是否终止 */ @ApiModelProperty(name = "是否终止 0正常 1终止",notes = "") private String isTermination ; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListGoodsVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListGoodsVO.java new file mode 100644 index 000000000..6bd13ea10 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListGoodsVO.java @@ -0,0 +1,13 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class LoadingListGoodsVO implements Serializable { + + private String goodsName; + private Integer num; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListMainVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListMainVO.java new file mode 100644 index 000000000..e4045b220 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingListMainVO.java @@ -0,0 +1,30 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +public class LoadingListMainVO implements Serializable { + + + private String orderCode; + private String waybillNo; + private Integer type; + private Date createTime; + private String departureWarehouseName; + private String destinationWarehouseName; + private String shipper; + private String consignee; + private String consigneeName; + private String consigneeMobile; + private Integer unloadNum; + private Integer planNum; + private Integer smallTotal; + + private List goodsList = new ArrayList<>(); + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadLoadingListVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadLoadingListVO.java new file mode 100644 index 000000000..da3cef033 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineCarsLoadLoadingListVO.java @@ -0,0 +1,21 @@ +package com.logpm.trunkline.vo; + +import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +public class TrunklineCarsLoadLoadingListVO extends TrunklineCarsLoadEntity { + + private String stopoverStation; + + private Date unloadDate; + + private String unloadUserName; + + private List mainList = new ArrayList(); + +} diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 65f193e68..9a5ab7980 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -454,7 +454,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { log.info("############basicdataWarehouseEntity {}", basicdataWarehouseEntity); distributionStockArticleEntity.setCreateDept(basicdataWarehouseEntity.getDepartment()); - WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderSelfNum); + WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNoNum); if(Objects.isNull(wayBillEntity)){ @@ -515,8 +515,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setAdvanceId(advanceId); //--------------2023-07-06 新增字段处理 - //查询包条码对应的运单信息 - waybillNoNum = supplyData.get("logiBillNo"); +// //查询包条码对应的运单信息 +// waybillNoNum = supplyData.get("logiBillNo"); //存入运单信息 saveWaybillEntity(waybillNoNum ); @@ -794,6 +794,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { String agent = wayBillEntity.getAgent(); warehouseWaybill = new WarehouseWaybillEntity(); + warehouseWaybill.setTenantId(TenantNum.HUITONGCODE); + warehouseWaybill.setCreateUser(1714696768639311873L); + warehouseWaybill.setUpdateUser(1714696768639311873L); + warehouseWaybill.setCreateDept(1649331096241836033L); warehouseWaybill.setWaybillNo(waybillNo); warehouseWaybill.setDestinationWarehouseName(warehouseName); warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java index 4d6ec9bdf..14a2dc3b8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java @@ -77,4 +77,13 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findNotUnloadZeroList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + List findLoadingListDataMain(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + List findLoadingListGoods(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo); + + + List findUnloadListDataMain(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); + + List findUnloadGoods(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index f5725263a..6fa9fdd01 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -310,4 +310,94 @@ and final_node_id = #{warehouseId} + + + + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java index 1ae08a027..271640f43 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java @@ -74,4 +74,11 @@ public interface ITrunklineCarsLoadScanService extends BaseService findNotUnloadZeroList(Long loadId, Long warehouseId); + List findLoadingListDataMain(Long loadId, Long warehouseId); + + List findLoadingListGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo); + + List findUnloadListDataMain(Long loadId, Long warehouseId); + + List findUnloadGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java index 991eda556..c5d02cd7b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java @@ -177,4 +177,24 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl findLoadingListDataMain(Long loadId, Long warehouseId) { + return baseMapper.findLoadingListDataMain(loadId,warehouseId); + } + + @Override + public List findLoadingListGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo) { + return baseMapper.findLoadingListGoods(loadId,warehouseId,orderCode,waybillNo); + } + + @Override + public List findUnloadListDataMain(Long loadId, Long warehouseId) { + return baseMapper.findUnloadListDataMain(loadId,warehouseId); + } + + @Override + public List findUnloadGoods(Long loadId, Long warehouseId, String orderCode, String waybillNo) { + return baseMapper.findUnloadGoods(loadId,warehouseId,orderCode,waybillNo); + } + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 037c306ef..bf9ffd283 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -3349,13 +3349,74 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadingMainList = trunklineCarsLoadScanService.findLoadingListDataMain(loadId,warehouseId); + for (LoadingListMainVO loadingListMainVO : loadingMainList) { + Integer type = loadingListMainVO.getType(); + if(type.equals(1)){ + String orderCode = loadingListMainVO.getOrderCode(); + String waybillNo = loadingListMainVO.getWaybillNo(); + List goodsList = trunklineCarsLoadScanService.findLoadingListGoods(loadId,warehouseId,orderCode,waybillNo); + loadingListMainVO.setGoodsList(goodsList); + }else if(type.equals(2)){ + List goodsList = new ArrayList<>(); + LoadingListGoodsVO loadingListGoodsVO = new LoadingListGoodsVO(); + loadingListGoodsVO.setGoodsName("零担"); + loadingListGoodsVO.setNum(loadingListMainVO.getSmallTotal()); + goodsList.add(loadingListGoodsVO); + loadingListMainVO.setGoodsList(goodsList); + } + } - - return null; + List unloadMainList = trunklineCarsLoadScanService.findUnloadListDataMain(loadId,warehouseId); + for (LoadingListMainVO unloadMainVO : unloadMainList) { + Integer type = unloadMainVO.getType(); + if (type.equals(1)) { + String orderCode = unloadMainVO.getOrderCode(); + String waybillNo = unloadMainVO.getWaybillNo(); + List goodsList = trunklineCarsLoadScanService.findUnloadGoods(loadId, warehouseId, orderCode, waybillNo); + unloadMainVO.setGoodsList(goodsList); + } else if (type.equals(2)) { + List goodsList = new ArrayList<>(); + LoadingListGoodsVO loadingListGoodsVO = new LoadingListGoodsVO(); + loadingListGoodsVO.setGoodsName("零担"); + loadingListGoodsVO.setNum(unloadMainVO.getSmallTotal()); + goodsList.add(loadingListGoodsVO); + unloadMainVO.setGoodsList(goodsList); + } + } + loadingMainList.addAll(unloadMainList); + trunklineCarsLoadLoadingListVO.setMainList(loadingMainList); + return R.data(trunklineCarsLoadLoadingListVO); + }else{ + log.warn("#############findLoadingListData: 仓库信息不正确"); + return R.fail(405,"仓库信息不正确"); + } } @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java index 34f80e2ac..9b9b7fafb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java @@ -44,6 +44,10 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl updownGoodsList = new ArrayList<>(); for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){ WarehouseUpdownGoodsEntity updownGoodsEntity = new WarehouseUpdownGoodsEntity(); + updownGoodsEntity.setCreateUser(1714696768639311873L); + updownGoodsEntity.setUpdateUser(1714696768639311873L); + updownGoodsEntity.setCreateDept(1649331096241836033L); + updownGoodsEntity.setTenantId(TenantNum.HUITONGCODE); updownGoodsEntity.setUpdownTypeId(updownTypeEntity.getId()); updownGoodsEntity.setAreaId(updownTypeEntity.getAreaId()); updownGoodsEntity.setAreaTitle(updownTypeEntity.getAreaTitle()); @@ -2626,6 +2643,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl