From 25741aa02eabb50fb2ffeff494a55d24813512ad Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 20 Mar 2024 18:30:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/vo/CarsLoadOrderInfoVO.java | 3 +- .../trunkline/vo/CarsLoadWaybillInfoVO.java | 3 ++ .../vo/TrunklineBillladingDetailListVO.java | 2 + .../impl/PanFactoryDataServiceImpl.java | 1 + .../impl/SyncOrderInfoServiceImpl.java | 46 +++++++++++-------- .../api/BillladingApiController.java | 5 +- .../mapper/TrunklineBillladingMapper.java | 3 +- .../mapper/TrunklineBillladingMapper.xml | 4 +- .../mapper/TrunklineCarsOrderMapper.xml | 27 +++++++++-- .../TrunklineCostShareRecordMapper.java | 2 + .../mapper/TrunklineCostShareRecordMapper.xml | 9 ++++ .../service/ITrunklineBillladingService.java | 2 +- .../ITrunklineCostShareRecordService.java | 2 + .../impl/TrunklineBillladingServiceImpl.java | 14 +++--- .../impl/TrunklineCarsLoadServiceImpl.java | 5 ++ .../TrunklineCostShareRecordServiceImpl.java | 5 ++ 16 files changed, 97 insertions(+), 36 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java index a5ca0b7e5..26206e4c3 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadOrderInfoVO.java @@ -14,7 +14,8 @@ public class CarsLoadOrderInfoVO implements Serializable { private Integer loadingNum; private Integer unloadNum; private BigDecimal unloadIncome; - private BigDecimal orderLineCost; + private BigDecimal costZhang; + private BigDecimal costPiece; private BigDecimal weight; private BigDecimal volume; private BigDecimal orderFreight; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java index 5b919baaa..0f6b96152 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadWaybillInfoVO.java @@ -32,6 +32,9 @@ public class CarsLoadWaybillInfoVO implements Serializable { private BigDecimal otherFee; private BigDecimal insuranceFee; private BigDecimal totalFee; + private BigDecimal costPiece; + private BigDecimal costZhang; + private Integer costNum; List carsLoadOrderInfoList = new ArrayList<>(); diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java index 3981d6b96..617d637f4 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingDetailListVO.java @@ -9,5 +9,7 @@ public class TrunklineBillladingDetailListVO implements Serializable { private String orderPackageCode; private String packageStatus; + private String materialName; + private String thirdPackName; } 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 61669f5ad..7af1a9bb5 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 @@ -737,6 +737,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { entity.setUpdateUser(1714696768639311873L); entity.setCreateDept(1649331096241836033L); entity.setTenantId(TenantNum.HUITONGCODE); + entity.setIsTransfer(0); if (StringUtil.isNoneBlank(entity.getMaterialName()) && StringUtil.isNoneBlank(entity.getMaterialCode())) { // 查询物料信息 String sku = ""; diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 63d9d5e9b..f5c9fcf32 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -1540,13 +1540,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}",unitNo); continue; } - String productName = null; - if(!Objects.isNull(inventoryId)){ - InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo,inventoryId); - if(!Objects.isNull(inventoryDetailEntity)){ - productName = inventoryDetailEntity.getProductname(); - } - } + Integer status = orderDetailEntity.getStatus(); Integer carsType = orderDetailEntity.getCarsType(); @@ -1589,21 +1583,37 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { // if(3==carsType||4 == carsType){ // entity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue()); // } - if(2 == signState){ - entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); + + String productName = null; + if(!Objects.isNull(inventoryId)){ + InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo,inventoryId); + if(!Objects.isNull(inventoryDetailEntity)){ + productName = inventoryDetailEntity.getProductname(); + entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); + }else{ + entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); + } + entity.setIsTransfer(0); }else{ - entity.setOrderPackageStatus(OrderPackageStatusConstant.zhongzhuanruku.getValue()); - if(!Objects.isNull(waybillEntity)){ - String warehouseName = waybillEntity.getWarehouseName();//目的仓 - BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); - Long endWarehouseId = endhouse.getId(); - if(endWarehouseId.equals(warehouseId)){ - entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); - }else{ - entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); + if(2 == signState){ + entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); + entity.setIsTransfer(0); + }else{ + entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); + if(!Objects.isNull(waybillEntity)){ + String warehouseName = waybillEntity.getWarehouseName();//目的仓 + BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName); + Long endWarehouseId = endhouse.getId(); + if(endWarehouseId.equals(warehouseId)){ + entity.setIsTransfer(0); + }else{ + entity.setIsTransfer(1); + } } } } + + entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue()); entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java index 901235716..09d6e0675 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/BillladingApiController.java @@ -17,6 +17,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; @Slf4j @@ -115,9 +116,9 @@ public class BillladingApiController { return R.fail(403,"订单号为空"); } - IPage pages = billladingService.findAdvanceDetailList(billladingDTO); + List ls = billladingService.findAdvanceDetailList(billladingDTO); - return R.data(pages); + return R.data(ls); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java index 8e182e739..abea12e70 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java @@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.Date; +import java.util.List; import java.util.Map; @Mapper @@ -25,7 +26,7 @@ public interface TrunklineBillladingMapper extends BaseMapper billladingList(IPage page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr); - IPage findAdvanceDetailList(IPage page, @Param("orderCode") String orderCode); + List findAdvanceDetailList(@Param("orderCode") String orderCode); Map billladingNum(@Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml index 12de149e3..31d82ef4a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml @@ -158,7 +158,9 @@ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml index 3b29cb6a8..4f88d361f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml @@ -131,15 +131,32 @@ + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java index e6f741d8b..cc771b06e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java @@ -43,5 +43,5 @@ public interface ITrunklineBillladingService extends BaseService findAdvanceDetailList(BillladingDTO billladingDTO); + List findAdvanceDetailList(BillladingDTO billladingDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java index 5ad4aa87b..8969f835a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCostShareRecordService.java @@ -15,4 +15,6 @@ public interface ITrunklineCostShareRecordService extends BaseService findUpdateWaybill(Long loadId); TrunklineCostShareRecordEntity sumTotalCost(String waybillNo); + + TrunklineCostShareRecordEntity findTotalUnloadNumByLoadAndWaybillNo(Long loadId, String waybillNo); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java index 8489778cf..7bc2dd9ae 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java @@ -547,15 +547,15 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl findAdvanceDetailList(BillladingDTO billladingDTO) { - Integer pageNum = billladingDTO.getPageNum(); - Integer pageSize = billladingDTO.getPageSize(); + public List findAdvanceDetailList(BillladingDTO billladingDTO) { +// Integer pageNum = billladingDTO.getPageNum(); +// Integer pageSize = billladingDTO.getPageSize(); String orderCode = billladingDTO.getOrderCode(); - IPage page = new Page<>(); - page.setCurrent(pageNum); - page.setSize(pageSize); +// IPage page = new Page<>(); +// page.setCurrent(pageNum); +// page.setSize(pageSize); - IPage ls = baseMapper.findAdvanceDetailList(page,orderCode); + List ls = baseMapper.findAdvanceDetailList(orderCode); return ls; } 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 bb2890647..5384b04c1 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 @@ -85,6 +85,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadCarsPageList(LoadCarsDTO loadCarsDTO) { @@ -2440,6 +2441,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl