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 42defa89b..33112603b 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 @@ -113,6 +113,8 @@ public class DictBizConstant { public static final String OPEN_ORDER_URGENCY = "open_order_urgency"; public static final String OPEN_ORDER_RECEIPT = "open_order_receipt"; public static final String OPEN_ORDER_TRANSPORT_TYPE = "open_order_transport_type"; + public static final String OPEN_ORDER_CHARGE_TYPE = "open_order_charge_type"; + public static final String EDIT_WAYBILL_REASON_TYPE = "edit_waybill_reason_type"; /* 异常工单状态 */ public static final String PC_WORK_ORDER = "pc_work_order"; //PC工单异常类型 diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index e360f01b5..f9780a1df 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -76,9 +76,13 @@ public class OldSystemDataPushConfig { // 宜宾仓 warehourseIds.add("146"); + // 攀枝花 + warehourseIds.add("32"); + } + public static List getWarehourseIdList(){ return warehourseIds; diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java index d77bc9443..f59fbd0ac 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java @@ -16,11 +16,10 @@ */ package com.logpm.basicdata.vo; -import com.logpm.basicdata.enums.PriceBizTypeApiEnums; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -33,27 +32,25 @@ import java.io.Serializable; public class BasicdatPriceApiVO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 客户id - */ @NotEmpty(message = "客户id不能为空") + @ApiModelProperty(value = "客户id") private String clientId; - /** - * 品牌id - */ @NotEmpty(message = "品牌id不能为空") + @ApiModelProperty(value = "品牌id") private String brandId; - /** - * 发货单位id - */ + @ApiModelProperty(value = "发货单位id") private String sendOrgId; - /** - * 始发地 - */ - private String startAreaId; - /** - * 目的地 - */ - private String endAreaId; + @ApiModelProperty(value = "始发地省份id") + private Long startProvinceId; + @ApiModelProperty(value = "始发地城市id") + private Long startCityId; + @ApiModelProperty(value = "始发地区县id") + private Long startCountyId; + @ApiModelProperty(value = "目的地省份id") + private Long endProvinceId; + @ApiModelProperty(value = "目的地城市id") + private Long endCityId; + @ApiModelProperty(value = "目的地区县id") + private Long endCountyId; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java index b19577a77..b9f3e2261 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java @@ -49,4 +49,7 @@ public class BasicdataTrayVO extends BasicdataTrayEntity { @ApiModelProperty(value = "打托方式显示") private String trayTypeString; + @ApiModelProperty(value = "串货条件") + private String filterValue; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index c8a08bab3..e44b04a01 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -197,7 +197,7 @@ public class DistributionParcelListEntity extends TenantEntity { * 运单ID */ @ApiModelProperty(value = "运单ID") - private String waybillId; + private Long waybillId; /** * 客户id */ diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index c47812b5f..ab14c07b0 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -16,6 +16,8 @@ public class OpenOrderDTO implements Serializable { private String brand;//品牌 private String trainNumber;//客户车次号 private String waybillNo;//运单号 + private String departure;//发站 + private String departureCode; private Long departureWarehouseId;//发站仓id private String departureWarehouseName;//发站仓名称 private String destination;//到站 @@ -26,6 +28,8 @@ public class OpenOrderDTO implements Serializable { private List advanceIds;//暂存单ids private String orderCode;//订单号 private String openOrderDate;//开单时间 + private String dearCode;//商场编码 + private String dearName;//商场名称 private Long shipperId;//发货单位id private String shipper;//发货单位 diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java index b3465ce13..39fc53ee5 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java @@ -90,6 +90,9 @@ public class TrunklineAdvanceDetailEntity extends TenantEntity { /** 服务号 */ @ApiModelProperty(name = "服务号",notes = "") private String serviceNum ; + /** 运单id */ + @ApiModelProperty(name = "运单id",notes = "") + private Long waybillId ; /** 运单号 */ @ApiModelProperty(name = "运单号",notes = "") private String waybillNo ; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/EditOrderMsgVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/EditOrderMsgVO.java new file mode 100644 index 000000000..f91f46c00 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/EditOrderMsgVO.java @@ -0,0 +1,14 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EditOrderMsgVO implements Serializable { + + private String itemName; + private String oldValue; + private String newValue; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java new file mode 100644 index 000000000..87512aacf --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java @@ -0,0 +1,65 @@ +package com.logpm.trunkline.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class LoadingDetailExportVO implements Serializable { + + @ExcelProperty(value = "运单号") + private String waybillNo; + + @ExcelProperty(value = "配载批次") + private String carsNo; + + @ExcelProperty(value = "合同号") + private String orderCode; + + @ExcelProperty(value = "包条码-产品名称") + private String scanCode; + + @ExcelProperty(value = "装车人") + private String loadingUserName; + + @ExcelProperty(value = "装车仓库") + private String warehouseNname; + + @ExcelProperty(value = "计划目的仓库") + private String finalNodeName; + + @ExcelProperty(value = "装卸状态") + private String scanStatus; + + @ExcelProperty(value = "托盘名称") + private String trayName; + + @ExcelProperty(value = "托盘码") + private String trayCode; + + @ExcelProperty(value = "卸车仓库") + private String unloadNodeName; + + @ExcelProperty(value = "卸车人") + private String unloadUserName; + + @ExcelProperty(value = "类型") + private String type; + + @ExcelProperty(value = "数量") + private String num; + + @ExcelProperty(value = "有无数据") + private String isData; + + @ExcelProperty(value = "是否装车异常") + private String loadingAbnormal; + + @ExcelProperty(value = "是否卸车异常") + private String unloadAbnormal; + + @ExcelProperty(value = "是否补录") + private String isSupple; + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java index ed0f0e146..b44ff6c7a 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OpenOrderVO.java @@ -10,9 +10,12 @@ import java.util.List; @Data public class OpenOrderVO implements Serializable { + private Long brandId; private String brand; private String trainNumber; private String orderCode; + private String dealerCode; + private String dealerName; private List advanceIds = new ArrayList<>(); @@ -22,6 +25,10 @@ public class OpenOrderVO implements Serializable { private String destinationWarehouseName;//目的仓名称 private Long destinationWarehouseId;//目的仓Id + private String departure;//发站 + private String departureCode;//发站编码 + private List departureArray;//发站 + private String destination;//到站 private String destinationCode;//到站编码 private List destinationArray;//到站 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index c20ce5ff7..037ab761e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -445,4 +445,18 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "成本件数") private Integer costNum; + @ApiModelProperty(value = "发站") + private String departure; + + @ApiModelProperty(value = "发站编码") + private String departureCode; + + @ApiModelProperty(value = "商场编码") + private String dearCode; + + @ApiModelProperty(value = "商场名称") + private String dearName; + + + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java index b1cde7216..abf5bf291 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java @@ -39,4 +39,6 @@ public class WarehouseWaybillVO extends WarehouseWaybillEntity { private Integer handleNum; + private Long waybillId; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java index 2a7fc4efb..b6e9ac560 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java @@ -19,8 +19,10 @@ package com.logpm.basicdata.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.service.IBasicdataPriceService; +import com.logpm.basicdata.vo.BasicdatPriceApiVO; import com.logpm.basicdata.vo.BasicdataPriceBasicUpdateVO; import com.logpm.basicdata.vo.BasicdataPricePageVO; +import com.logpm.basicdata.vo.PriceClientVO; import com.logpm.basicdata.vo.PriceVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -113,13 +115,18 @@ public class BasicdataPriceController extends BladeController { @ApiImplicitParam(name = "file", value = "文件", dataType = "MultipartFile") }) public R upload(@RequestPart("file") MultipartFile file) { - try (InputStream inputStream = file.getInputStream()) { - String res = basicdataPriceService.upload(inputStream); - return R.data(res); - } catch (Exception e) { - e.printStackTrace(); - } - return R.data("上传失败"); + return R.data(basicdataPriceService.upload(file)); + } + + /** + * 基础价格表 指定查询 + */ + @GetMapping("/custom") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "指定条件查询", notes = "传入basicdataPrice") + public R custom(BasicdatPriceApiVO param) { + PriceClientVO detail = basicdataPriceService.price(param); + return R.data(detail); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java new file mode 100644 index 000000000..7001e55de --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +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 lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceCategoryBasicExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "发站", index = 2) + private String startName; + @ExcelProperty(value = "到站", index = 3) + private String endName; + @ExcelProperty(value = "发货单位", index = 4) + private String sendOrg; + @ExcelProperty(value = "服务类型", index = 5) + private String type; + @ExcelProperty(value = "计费类型", index = 6) + private String costType; + @ExcelProperty(value = "品类", index = 7) + private String category; + @ExcelProperty(value = "单价", index = 8) + private String price; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java new file mode 100644 index 000000000..9c8a6c51b --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +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 lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceCategoryDispatchExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "费用类型", index = 2) + private String type; + @ExcelProperty(value = "计价方式", index = 3) + private String costType; + @ExcelProperty(value = "品类", index = 4) + private String category; + @ExcelProperty(value = "单价", index = 5) + private Double price; + @ExcelProperty(value = "遗留单价", index = 6) + private Double leaveBehindPrice; + @ExcelProperty(value = "分货费", index = 7) + private Double sortPrice; + @ExcelProperty(value = "操作/装卸费", index = 8) + private Double handlingPrice; + @ExcelProperty(value = "平移费", index = 9) + private Double relocationPrice; + @ExcelProperty(value = "上楼费", index = 10) + private Double upstairsDeliveryPrice; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java new file mode 100644 index 000000000..310c986d8 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceCategoryWarehouseExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "计价方式", index = 2) + private String costType; + @ExcelProperty(value = "品类", index = 3) + private String category; + @ExcelProperty(value = "30天内", index = 4) + private String withinThirtyPrice; + @ExcelProperty(value = "30-60天", index = 5) + private String betweenThirtySixtyPrice; + @ExcelProperty(value = "60天外", index = 6) + private String beyondSixtyPrice; + @ExcelProperty(value = "上限价格", index = 7) + private String maximumPrice; + @ExcelProperty(value = "操作/装卸费", index = 8) + private String operatePrice; + @ExcelProperty(value = "仓储管理费", index = 9) + private String warehouseManagementPrice; + @ExcelProperty(value = "仓储分货费", index = 10) + private String warehouseSortPrice; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java new file mode 100644 index 000000000..a7eb045e4 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +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 lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称", index = 0) + private String client; + /** + * 品牌 + */ + @ExcelProperty(value = "品牌", index = 1) + private String brand; + /** + * 生效时间 + */ + @ExcelProperty(value = "生效时间", index = 2) + private String effectiveTime; + /** + * 到期时间 + */ + @ExcelProperty(value = "到期时间", index = 3) + private String expiryTime; + /** + * 模版名称 + */ + @ExcelProperty(value = "模版名称", index = 4) + private String templateName; + /** + * 向上判断件数 + */ + @ExcelProperty(value = "向上判断件数", index = 5) + private String dispatchUpwardJudgment; + + /** + * 向上判断件数 + */ + @ExcelProperty(value = "向上判断件数", index = 6) + private String dispatchUpwardJudgmentCost; + + /** + * 上楼费免费楼层 + */ + @ExcelProperty(value = "上楼费免费楼层", index = 7) + private String dispatchStairsCarryingCharge; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java new file mode 100644 index 000000000..262959caf --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +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 lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceFullVehicleExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + @ExcelProperty(value = "客户名称", index = 0) + private String client; + @ExcelProperty(value = "品牌", index = 1) + private String brand; + @ExcelProperty(value = "发站", index = 2) + private String startName; + @ExcelProperty(value = "到站", index = 3) + private String endName; + @ExcelProperty(value = "发货单位", index = 4) + private String sendOrg; + @ExcelProperty(value = "类型", index = 5) + private String type; + @ExcelProperty(value = "车型", index = 6) + private String vehicleType; + @ExcelProperty(value = "整车计费（元/车）", index = 7) + private String price; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java new file mode 100644 index 000000000..1cb171c38 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel.price; + + +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 lombok.Data; + +import java.io.Serializable; + + +/** + * 价格 Excel实体类 + * + * @author chao + * @since 2024-04-19 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataPriceGeneralExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称", index = 0) + private String client; + /** + * 品牌 + */ + @ExcelProperty(value = "品牌", index = 1) + private String brand; + /** + * 发站 + */ + @ExcelProperty(value = "发站", index = 2) + private String startName; + /** + * 到站 + */ + @ExcelProperty(value = "到站", index = 3) + private String endName; + /** + * 发货单位 + */ + @ExcelProperty(value = "发货单位", index = 4) + private String sendOrg; + /** + * 类型 + */ + @ExcelProperty(value = "类型", index = 5) + private String type; + /** + * 最低计费值 + */ + @ExcelProperty(value = "最低计费值", index = 6) + private String minCost; + /** + * 加算价格 + */ + @ExcelProperty(value = "加算价格", index = 7) + private String addCost; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 8c43cef07..a1eedfaeb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -61,7 +61,8 @@ tray.tray_status, warehouse.name AS warehouseName, tray.`type`, - lwtt.tray_type + lwtt.tray_type, + lwtt.filter_value FROM logpm_warehouse_tray AS tray left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id and lwtt.is_deleted=0 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java index b1d37d20e..3826bbbb7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java @@ -47,15 +47,6 @@ public interface IBasicdataPriceService extends BaseService selectBasicdataPricePage(IPage page, BasicdataPricePageVO basicdataPrice); - - /** - * 导出数据 - * - * @param queryWrapper - * @return - */ - List exportBasicdataPrice(Wrapper queryWrapper); - Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo); Boolean updatePrice(PriceVO vo); @@ -77,5 +68,5 @@ public interface IBasicdataPriceService extends BaseService exportBasicdataPrice(Wrapper queryWrapper) { - List basicdataPriceList = baseMapper.exportBasicdataPrice(queryWrapper); - return basicdataPriceList; - } - @Override public Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo) { if (DateUtil.compare(vo.getEffectiveTime(), vo.getExpiryTime()) > 0) { @@ -318,8 +314,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl routeEntities = basicdataPriceRouteService.list(Wrappers.lambdaQuery() .eq(BasicdataPriceRouteEntity::getPriceId, priceEntity.getId()) .eq(BasicdataPriceRouteEntity::getSendOrgId, param.getSendOrgId()) - .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartAreaId()) - .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndAreaId()) + .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartCountyId()) + .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndCountyId()) .eq(BasicdataPriceRouteEntity::getServiceType, ServiceTypeEnums.PICK_UP.getCode()) ); if (CollUtil.isNotEmpty(routeEntities)) { @@ -347,8 +343,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl routeEntities = basicdataPriceRouteService.list(Wrappers.lambdaQuery() .eq(BasicdataPriceRouteEntity::getPriceId, priceEntity.getId()) .eq(BasicdataPriceRouteEntity::getSendOrgId, param.getSendOrgId()) - .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartAreaId()) - .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndAreaId()) + .eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartCountyId()) + .eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndCountyId()) .eq(BasicdataPriceRouteEntity::getServiceType, ServiceTypeEnums.TRUNK_LINE.getCode()) ); if (CollUtil.isNotEmpty(routeEntities)) { @@ -378,14 +374,23 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl priceExcels = ExcelUtil.read(file, 0, BasicdataPriceExcel.class); + List basicExcels = ExcelUtil.read(file, 1, BasicdataPriceCategoryBasicExcel.class); + List dispatchExcels = ExcelUtil.read(file, 2, BasicdataPriceCategoryDispatchExcel.class); + List warehouseExcels = ExcelUtil.read(file, 3, BasicdataPriceCategoryWarehouseExcel.class); + List generalExcels = ExcelUtil.read(file, 4, BasicdataPriceGeneralExcel.class); + List fullVehicleExcels = ExcelUtil.read(file, 5, BasicdataPriceFullVehicleExcel.class); + // 校验数据 + if (CollUtil.isNotEmpty(priceExcels)) { - }catch (Exception e){ + } + // 保存数据 + + } catch (Exception e) { } return null; @@ -479,7 +484,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl { - Integer type = item.getServiceType(); + Integer type = item.getType(); List collect = categoryBasicMap.get(type); if (ObjectUtil.isEmpty(collect)) { collect = new ArrayList<>(); 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 11971f5d7..4595e72b0 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 @@ -503,24 +503,6 @@ public class DistributionStockupAppController extends BladeController { @ApiOperation(value = "零担备货") public R zeroStockUp(@RequestBody StockupZeroDTO stockupDTO) { log.debug("=====零担备货：{}", stockupDTO); - if (ObjectUtils.isNull(stockupDTO.getStockupId())) { - return R.fail(3002, "备货id不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getStockArticleId())) { - return R.fail(3002, "订单ID不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getOrderCode())) { - return R.fail(3002, "订单自编号不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getReservationId())) { - return R.fail(3002, "预约单号不能为空 !"); - } - if (ObjectUtils.isNull(stockupDTO.getTypeService())) { - return R.fail(3002, "备货业务类型不能为空 !"); - } -/* if (ObjectUtils.isNull(stockupDTO.getAllocationId())) { - return R.fail(3002, "库位信息不能为空 !"); - }*/ R b = distributionStockupService.zeroStockUp(stockupDTO); return b; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index f587d0e6f..26f5ea8d9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -98,7 +98,7 @@ ldl.signing_time signingTimes, ldl.signing_user signingUser, ldl.scan_user scanUser, - ldl.vehicle_name vehicleName, + lddl.vehicle_name vehicleName, ldsa.type_service typeService, ldbl.pickup_batch pickupBatch FROM @@ -109,7 +109,7 @@ LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id and ldrp.packet_bar_status in (1,3) LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id - LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.scan_status !=1 + LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.scan_status !=1 AND ldl.is_deleted = 0 LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = lds.delivery_id left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_distrilbution_bill_package AS ldbp ON ldbp.parce_list_id = ldpl.id and ldbp.packet_bar_status != 2 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 7e7d54eb4..33141b860 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1038,7 +1038,7 @@ LEFT JOIN logpm_distribution_loadscan AS ldl ON ldla.package_id = ldl.package_id LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldla.package_id = ldpl.id WHERE - ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId} AND ldl.scan_status != 1 + ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id = #{deliveryListId} AND ldl.scan_status != 1 AND ldl.is_deleted = 0 select GROUP_CONCAT(DISTINCT brand) brand, GROUP_CONCAT(DISTINCT train_number) trainNumber, - GROUP_CONCAT(DISTINCT order_code) orderCode + GROUP_CONCAT(DISTINCT order_code) orderCode, + GROUP_CONCAT(DISTINCT dealer_code) dealerCode, + GROUP_CONCAT(DISTINCT dealer_name) dealerName from logpm_trunkline_advance where is_deleted = 0 and id in @@ -138,19 +140,22 @@ - select lww.waybill_no waybillNo, + select lww.id waybillId, + lww.waybill_no waybillNo, lww.create_time createTime, lww.goods_name goodsName, lww.destination destination, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml index 0441a8ee0..4086707db 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml @@ -48,6 +48,7 @@ left join logpm_trunkline_billlading ltb on ltb.id = ltbw.billlading_id left join logpm_warehouse_waybill lww on lww.waybill_no = ltbw.waybill_no where ltbw.billlading_id = #{billladingId} + and ltbw.is_deleted = 0 diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index 548e321e6..340b96c30 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -17,6 +17,11 @@ import java.util.List; @Mapper public interface TrunklineCarsLoadMapper extends BaseMapper { + /** + * @param page + * @param loadCarsDTO + * @return + */ IPage loadCarsPageList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); IPage arriveCarsPageList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 1a5bc1364..7efe9e771 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -41,6 +41,7 @@ left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcl.id where ltcl.is_deleted = 0 and ltcl.load_type != '4' + and ltcl.load_status != '100' and ltcl.start_warehouse_id = #{param.warehouseId} @@ -375,6 +376,7 @@ and ltcl.load_status = '0' + and ltcl.load_status != '100' and ltcl.load_status != '0' 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 0c37661b2..d532bbce3 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 @@ -126,4 +126,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper findWaybillCarsLoadInfo(@Param("waybillId") Long waybillId); List findWaybillTransferInfo(@Param("waybillId") Long waybillId); + + List loadingDetailExport(@Param("param") LoadCarsDTO loadCarsDTO); } 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 06a1d48d1..a7f98ac9f 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 @@ -583,10 +583,42 @@ ltcl.remark remark from logpm_trunkline_cars_load_scan ltcls left join logpm_trunkline_cars_load ltcl on ltcl.id = ltcls.load_id - where ltcls.waybill_no = #{waybillNo} + where ltcls.waybill_id = #{waybillId} and ltcl.load_type = 4 group by ltcl.cars_no order By ltcl.start_time asc + + + 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 51bd8eabe..65870624b 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 @@ -122,4 +122,5 @@ public interface ITrunklineCarsLoadScanService extends BaseService findWaybillTransferInfo(Long waybillId); + List loadingDetailExport(LoadCarsDTO loadCarsDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 342f8c137..5cad80db2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -5,6 +5,7 @@ import com.logpm.trunkline.dto.BatchUnloadDTO; import com.logpm.trunkline.dto.LoadCarsDTO; import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; +import com.logpm.trunkline.vo.LoadingDetailExportVO; import com.logpm.trunkline.vo.TripartiteTransferVO; import com.logpm.trunkline.vo.TrunklineCarsLoadVO; import org.springblade.core.mp.base.BaseService; @@ -205,4 +206,5 @@ public interface ITrunklineCarsLoadService extends BaseService loadingDetailExport(LoadCarsDTO loadCarsDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index 3c3f7cd2a..df09c01c1 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -146,15 +146,15 @@ public class InComingServiceImpl implements IInComingService { } List ls = advanceService.findIncomingOrderList(inComingDTO); - for (TrunklineAdvanceVO advanceVO : ls) { - Long advanceId = advanceVO.getId(); - Integer num = advanceDetailService.findListByAdvanceIdAndPackageStatus(advanceId,"0"); - if(num > 0){ - advanceVO.setIsIncoming(1); - }else{ - advanceVO.setIsIncoming(0); - } - } +// for (TrunklineAdvanceVO advanceVO : ls) { +// Long advanceId = advanceVO.getId(); +// Integer num = advanceDetailService.findListByAdvanceIdAndPackageStatus(advanceId,"0"); +// if(num > 0){ +// advanceVO.setIsIncoming(1); +// }else{ +// advanceVO.setIsIncoming(0); +// } +// } return R.data(ls); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index ed8542c61..01efcd775 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -94,9 +94,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { page.setCurrent(advanceDTO.getPageNum()); page.setSize(advanceDTO.getPageSize()); - IPage pageList = advanceService.advancePageList(page, advanceDTO); - - return pageList; + return advanceService.advancePageList(page, advanceDTO); } @Override @@ -139,6 +137,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { OpenOrderVO infoByIds = advanceService.selectInfoByIds(advanceIds); BeanUtil.copy(infoByIds, openOrderVO); openOrderVO.setAdvanceIds(advanceIds); + BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + if(!Objects.isNull(basicdataBrandEntity)){ + openOrderVO.setBrandId(basicdataBrandEntity.getId()); + } //发站仓-----目前登录人的仓库 openOrderVO.setDepartureWarehouseName(basicdataWarehouseEntity.getName()); openOrderVO.setDepartureWarehouseId(warehouseId); @@ -303,13 +305,19 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId(); String brand = openOrderDTO.getBrand(); - BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + Long brandId = openOrderDTO.getBrandId(); + WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity(); waybillEntity.setWaybillNo(waybillNo); - if (!Objects.isNull(basicdataBrandEntity)) { - waybillEntity.setBrandId(basicdataBrandEntity.getId()); + if(Objects.isNull(brandId)){ + BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand); + if (!Objects.isNull(basicdataBrandEntity)) { + brandId = basicdataBrandEntity.getId(); + } } + + waybillEntity.setBrandId(brandId); waybillEntity.setBrand(brand); waybillEntity.setOrderNo(openOrderDTO.getOrderCode()); waybillEntity.setDepartureWarehouseId(departureWarehouseId); @@ -526,8 +534,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } //判断是否是开单及入库的配置 - Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, basicdataBrandEntity.getId()); - if (aBoolean) { + Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId); + if (Boolean.TRUE.equals(aBoolean)) { openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode()); } @@ -2823,7 +2831,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { entity.setOrderPackageStockupStatus("10"); entity.setOrderPackageReservationStatus("10"); entity.setOrderPackageLoadingStatus("10"); - entity.setWaybillId(warehouseWaybill.getId() + ""); + entity.setWaybillId(warehouseWaybill.getId()); entity.setWaybillNumber(warehouseWaybill.getWaybillNo()); entity.setIsZero("1"); entity.setWarehouseEntryTimeEnd(date); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 250e10208..ec09b09a2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -227,7 +227,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl pageList = baseMapper.pageList(page,billladingDTO); - - return pageList; + return baseMapper.pageList(page,billladingDTO); } @Override @@ -124,7 +123,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl pageList = baseMapper.pageInfoList(page,billladingDTO); - - return pageList; + return baseMapper.pageInfoList(page,billladingDTO); } @Override @@ -168,7 +165,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl 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); - List ls = baseMapper.findAdvanceDetailList(orderCode); + String orderCode = billladingDTO.getOrderCode(); - return ls; + return baseMapper.findAdvanceDetailList(orderCode); } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java index ab574ef14..2242d5bfe 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadLineServiceImpl.java @@ -31,7 +31,8 @@ public class TrunklineCarsLoadLineServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("load_id",loadId) - .eq("node_id",nodeId); + .eq("node_id",nodeId) + .eq("is_deleted",0); return baseMapper.selectOne(queryWrapper); } 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 3ad55de2b..058bc0b9a 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 @@ -298,4 +298,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl loadingDetailExport(LoadCarsDTO loadCarsDTO) { + return baseMapper.loadingDetailExport(loadCarsDTO); + } + } 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 0d7dd469c..b99432b5f 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 @@ -29,73 +29,11 @@ import com.logpm.factorydata.enums.BrandEnums; import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.trunkline.bean.Resp; -import com.logpm.trunkline.dto.BatchUnloadDTO; -import com.logpm.trunkline.dto.InComingDTO; -import com.logpm.trunkline.dto.LoadCarsDTO; -import com.logpm.trunkline.dto.LoadScanBrandDTO; -import com.logpm.trunkline.dto.LoadingPackageDTO; -import com.logpm.trunkline.dto.LoadingZeroDTO; -import com.logpm.trunkline.dto.ProductInfoDTO; -import com.logpm.trunkline.dto.TrunklineCarsLoadDTO; -import com.logpm.trunkline.dto.TrunklineCarsLoadLineDTO; -import com.logpm.trunkline.dto.TrunklineCarsOrderDTO; -import com.logpm.trunkline.dto.UnloadPackageDTO; -import com.logpm.trunkline.dto.UnloadZeroDTO; -import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadContractEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadFinanceEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadLineEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadLogEntity; -import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity; -import com.logpm.trunkline.entity.TrunklineCarsOrderEntity; -import com.logpm.trunkline.entity.TrunklineCostShareRecordEntity; -import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; -import com.logpm.trunkline.entity.TrunklineLoadSignPhotoEntity; +import com.logpm.trunkline.dto.*; +import com.logpm.trunkline.entity.*; import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; -import com.logpm.trunkline.service.ICarsLoadAsyncService; -import com.logpm.trunkline.service.IInComingService; -import com.logpm.trunkline.service.IOpenOrderAsyncService; -import com.logpm.trunkline.service.IPackageTrackLogAsyncService; -import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; -import com.logpm.trunkline.service.ITrunklineCarsLoadContractService; -import com.logpm.trunkline.service.ITrunklineCarsLoadFinanceService; -import com.logpm.trunkline.service.ITrunklineCarsLoadLineService; -import com.logpm.trunkline.service.ITrunklineCarsLoadLogService; -import com.logpm.trunkline.service.ITrunklineCarsLoadScanService; -import com.logpm.trunkline.service.ITrunklineCarsLoadService; -import com.logpm.trunkline.service.ITrunklineCarsLoadingLogService; -import com.logpm.trunkline.service.ITrunklineCarsOrderService; -import com.logpm.trunkline.service.ITrunklineCarsSignLogService; -import com.logpm.trunkline.service.ITrunklineCarsUnloadLogService; -import com.logpm.trunkline.service.ITrunklineCostShareRecordService; -import com.logpm.trunkline.service.ITrunklineLoadSignOrderService; -import com.logpm.trunkline.service.ITrunklineLoadSignPhotoService; -import com.logpm.trunkline.service.ITrunklineWaybillOrderService; -import com.logpm.trunkline.vo.CarsLoadAllOrderVO; -import com.logpm.trunkline.vo.CarsLoadOrderInfoVO; -import com.logpm.trunkline.vo.CarsLoadWaybillInfoVO; -import com.logpm.trunkline.vo.HasNotFinalNodeIdDataVO; -import com.logpm.trunkline.vo.LoadScanFinalNodeIdVO; -import com.logpm.trunkline.vo.LoadScanOrderVO; -import com.logpm.trunkline.vo.LoadZeroListVO; -import com.logpm.trunkline.vo.LoadingListGoodsVO; -import com.logpm.trunkline.vo.LoadingListMainVO; -import com.logpm.trunkline.vo.NodeNumDataVO; -import com.logpm.trunkline.vo.OrderScanDetailVO; -import com.logpm.trunkline.vo.SignOrderDetailVO; -import com.logpm.trunkline.vo.SignPackageVO; -import com.logpm.trunkline.vo.SignScanOrderVO; -import com.logpm.trunkline.vo.TripartiteTransferVO; -import com.logpm.trunkline.vo.TrunklineCarsLoadLoadingListVO; -import com.logpm.trunkline.vo.TrunklineCarsLoadScanVO; -import com.logpm.trunkline.vo.TrunklineCarsLoadVO; -import com.logpm.trunkline.vo.TrunklineLoadSignOrderVO; -import com.logpm.trunkline.vo.UnloadPackageVO; -import com.logpm.trunkline.vo.UnloadScanOrderVO; -import com.logpm.trunkline.vo.UnloadZeroVO; -import com.logpm.trunkline.vo.WaybillCarsLoadVO; -import com.logpm.trunkline.vo.ZeroSuppleVO; +import com.logpm.trunkline.service.*; +import com.logpm.trunkline.vo.*; import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; @@ -105,11 +43,7 @@ import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringEscapeUtils; -import org.springblade.common.constant.CodeNumConstant; -import org.springblade.common.constant.DictBizConstant; -import org.springblade.common.constant.IncomingTypeEnum; -import org.springblade.common.constant.RabbitConstant; -import org.springblade.common.constant.WorkNodeEnums; +import org.springblade.common.constant.*; import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; @@ -128,14 +62,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; +import java.util.stream.Collectors; @Slf4j @Service @@ -186,15 +114,24 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.loadCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); - for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { + //把records中的id封装成一个set + Set idsSet = records.stream() + .map(TrunklineCarsLoadVO::getId) // Assuming getId() method returns the id as an Integer + .collect(Collectors.toSet()); + //判空idsSet + if (idsSet.isEmpty()) { + return pageList; + } + //使用trunklineCarsLoadLineService通过idsSet关联loadId批量查询TrunklineCarsLoadLineEntity集合 + List loadLineList = trunklineCarsLoadLineService.list(new QueryWrapper().in("load_id", idsSet)); + //把loadLineList中对象通过loadId分组 + Map> loadLineMap = loadLineList.stream() + .collect(Collectors.groupingBy(TrunklineCarsLoadLineEntity::getLoadId)); + records.forEach(trunklineCarsLoadVO -> { Long loadId = trunklineCarsLoadVO.getId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_deleted", 0) - .eq("load_id", loadId) - .orderByAsc("sort"); - List list = trunklineCarsLoadLineService.list(queryWrapper); + List list = loadLineMap.get(loadId); trunklineCarsLoadVO.setCarsLoadLineList(list); - } + }); pageList.setRecords(records); return pageList; } @@ -207,15 +144,24 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.arriveCarsPageList(page, loadCarsDTO); List records = pageList.getRecords(); - for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { + //把records中的id封装成一个set + Set idsSet = records.stream() + .map(TrunklineCarsLoadVO::getId) // Assuming getId() method returns the id as an Integer + .collect(Collectors.toSet()); + //判空idsSet + if (idsSet.isEmpty()) { + return pageList; + } + //使用trunklineCarsLoadLineService通过idsSet关联loadId批量查询TrunklineCarsLoadLineEntity集合 + List loadLineList = trunklineCarsLoadLineService.list(new QueryWrapper().in("load_id", idsSet)); + //把loadLineList中对象通过loadId分组 + Map> loadLineMap = loadLineList.stream() + .collect(Collectors.groupingBy(TrunklineCarsLoadLineEntity::getLoadId)); + records.forEach(trunklineCarsLoadVO -> { Long loadId = trunklineCarsLoadVO.getId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("is_deleted", 0) - .eq("load_id", loadId) - .orderByAsc("sort"); - List list = trunklineCarsLoadLineService.list(queryWrapper); + List list = loadLineMap.get(loadId); trunklineCarsLoadVO.setCarsLoadLineList(list); - } + }); pageList.setRecords(records); return pageList; } @@ -786,7 +732,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadScanIdList = trunklineCarsLoadScanService.findAllIdListByLoadId(loadId); - removeCarsLoadScan(StringUtil.join(carsLoadScanIdList, ","), warehouseId); + //通过loadId更新carsOrder关联表中的所有订单startNum为0 + trunklineCarsOrderService.updateStartNumByLoadIdAndWarehouseId(loadId, warehouseId); + + if(CollUtil.isNotEmpty(carsLoadScanIdList)){ + removeCarsLoadScan(StringUtil.join(carsLoadScanIdList, ","), warehouseId); + } try { trunklineCarsLoadLogService.saveLog(carsLoadEntity, currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_CARS_LOAD.getValue()); @@ -2154,6 +2105,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl pageList = baseMapper.carsLoadPageList(page, loadCarsDTO); List records = pageList.getRecords(); + //循环records，获取字典值 for (TrunklineCarsLoadVO trunklineCarsLoadVO : records) { String loadStatus = trunklineCarsLoadVO.getLoadStatus(); String value = DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus); @@ -4478,6 +4431,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadingDetailExport(LoadCarsDTO loadCarsDTO) { + return trunklineCarsLoadScanService.loadingDetailExport(loadCarsDTO); + } + @Override public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) { log.info("##############loadingTrayInfo: 查询托盘的货物信息"); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index c44067c05..139197ba8 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -99,7 +99,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -146,11 +146,11 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单编号不能为空 orderCode={}",orderCode); return R.fail(403,"订单编号不能为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"订单编号不能为空 trayCode={}",trayCode); return R.fail(403,"订单编号不能为空"); } @@ -181,15 +181,15 @@ public class WarehouseTrayTypeApiController { String trayCode = trayTypeDTO.getTrayCode(); String orderPackageCode = trayTypeDTO.getOrderPackageCode();//包条码 - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayType={}",trayType); return R.fail(403,"打托方式不能为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(orderPackageCode)){ + if(StringUtil.isBlank(orderPackageCode)){ log.warn(method+"包条码不能为空 orderPackageCode={}",orderPackageCode); return R.fail(403,"包条码不能为空"); } @@ -223,11 +223,11 @@ public class WarehouseTrayTypeApiController { List orderPackageCodes = trayTypeDTO.getOrderPackageCodes(); String trayCode = trayTypeDTO.getTrayCode();//托盘码 - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(Objects.isNull(orderPackageCodes)||orderPackageCodes.size() == 0){ + if(Objects.isNull(orderPackageCodes)||orderPackageCodes.isEmpty()){ log.warn(method+"包条码不能为空 orderPackageCodes={}",orderPackageCodes); return R.fail(403,"包条码不能为空"); } @@ -262,11 +262,11 @@ public class WarehouseTrayTypeApiController { String orderCode = trayTypeDTO.getOrderCode(); String trayCode = trayTypeDTO.getTrayCode();//托盘码 - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单号不能为空 orderCode={}",orderCode); return R.fail(403,"订单号不能为空"); } @@ -345,7 +345,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -388,7 +388,7 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息不能为空"); return R.fail(403,"仓库信息不能为空"); } - if(!StringUtil.hasLength(waybillCode)){ + if(StringUtil.isBlank(waybillCode)){ log.warn(method+"运单号不能为空 waybillCode={}",waybillCode); return R.fail(403,"运单号不能为空"); } @@ -420,11 +420,11 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayCode={}",trayCode); return R.fail(403,"打托方式不能为空"); } @@ -455,11 +455,11 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单不能为空 trayCode={}",trayCode); return R.fail(403,"打托方式不能为空"); } @@ -480,9 +480,12 @@ public class WarehouseTrayTypeApiController { public R updateZeroOrderNumByTrayCode(@RequestBody TrayTypeDTO trayTypeDTO) { String method = "###########updateZeroOrderNumByTrayCode: "; log.info(method + "更新零担订单数量 trayTypeDTO={}", trayTypeDTO); - String orderCode = trayTypeDTO.getOrderCode();//订单自编码 - String trayCode = trayTypeDTO.getTrayCode();//托盘码 - Integer num = trayTypeDTO.getNum();//数量 + //订单自编码 + String orderCode = trayTypeDTO.getOrderCode(); + //托盘码 + String trayCode = trayTypeDTO.getTrayCode(); + //数量 + Integer num = trayTypeDTO.getNum(); try{ BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); @@ -490,11 +493,11 @@ public class WarehouseTrayTypeApiController { log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } - if(!StringUtil.hasLength(orderCode)){ + if(StringUtil.isBlank(orderCode)){ log.warn(method+"订单不能为空 orderCode={}",orderCode); return R.fail(403,"订单不能为空"); } @@ -524,10 +527,11 @@ public class WarehouseTrayTypeApiController { public R zeroOrderUpdateRemark(@RequestBody TrayTypeDTO trayTypeDTO) { String method = "###########updateZeroOrderNumByTrayCode: "; log.info(method + "更新零担订单数量 trayTypeDTO={}", trayTypeDTO); - String trayCode = trayTypeDTO.getTrayCode();//托盘码 + //托盘码 + String trayCode = trayTypeDTO.getTrayCode(); String remark = trayTypeDTO.getRemark(); try{ - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘号不能为空 trayCode={}",trayCode); return R.fail(403,"托盘号不能为空"); } @@ -597,7 +601,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -644,15 +648,15 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayType={}",trayType); return R.fail(403,"打托方式不能为空"); } - if(!StringUtil.hasLength(orderPackageCode)){ + if(StringUtil.isBlank(orderPackageCode)){ log.warn(method+"包条码不能为空 orderPackageCode={}",orderPackageCode); return R.fail(403,"包条码不能为空"); } @@ -777,7 +781,7 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } @@ -827,7 +831,7 @@ public class WarehouseTrayTypeApiController { log.warn(method+"商场id不能为空 marketId={}",marketId); return R.fail(403,"商场id不能为空"); } - if(!StringUtil.hasLength(materialCode)){ + if(StringUtil.isBlank(materialCode)){ log.warn(method+"物料编码不能为空 materialCode={}",materialCode); return R.fail(403,"物料编码不能为空"); } @@ -863,7 +867,7 @@ public class WarehouseTrayTypeApiController { log.warn(method+"商场id不能为空 marketId={}",marketId); return R.fail(403,"商场id不能为空"); } - if(!StringUtil.hasLength(materialName)){ + if(StringUtil.isBlank(materialName)){ log.warn(method+"物料名称不能为空 materialCode={}",materialName); return R.fail(403,"物料名称不能为空"); } @@ -898,19 +902,19 @@ public class WarehouseTrayTypeApiController { return R.fail(403,"仓库信息不能为空"); } - if(!StringUtil.hasLength(trayCode)){ + if(StringUtil.isBlank(trayCode)){ log.warn(method+"托盘码不能为空 trayCode={}",trayCode); return R.fail(403,"托盘码不能为空"); } - if(!StringUtil.hasLength(trayType)){ + if(StringUtil.isBlank(trayType)){ log.warn(method+"打托方式不能为空 trayType={}",trayType); return R.fail(403,"打托方式不能为空"); } - if(!StringUtil.hasLength(materialCode)){ + if(StringUtil.isBlank(materialCode)){ log.warn(method+"物料编码不能为空 materialCode={}",materialCode); return R.fail(403,"物料编码不能为空"); } - if(!StringUtil.hasLength(incomingBatch)){ + if(StringUtil.isBlank(incomingBatch)){ log.warn(method+"批次号不能为空 incomingBatch={}",incomingBatch); return R.fail(403,"批次号不能为空"); }