diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionBusinessPreOrderClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionBusinessPreOrderClient.java index 244960d14..1f1db86d8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionBusinessPreOrderClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionBusinessPreOrderClient.java @@ -14,5 +14,5 @@ public interface IDistributionBusinessPreOrderClient { String API_PREFIX = "/client"; String INORDERBYORDERPACKAGECODE = API_PREFIX + "/inOrderByOrderPackageCode"; @GetMapping(INORDERBYORDERPACKAGECODE) - public Integer inOrderByOrderPackageCode(@RequestParam("orderPackageCode") String orderPackageCode, @RequestParam("carNum")String carNum); + Integer inOrderByOrderPackageCode(@RequestParam("orderPackageCode") String orderPackageCode, @RequestParam("carNum") String carNum); } diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/dto/OrderStatusDTO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/dto/OrderStatusDTO.java index ccc3d3129..121562701 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/dto/OrderStatusDTO.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/comfac/dto/OrderStatusDTO.java @@ -104,11 +104,8 @@ public class OrderStatusDTO implements Serializable { if(StringUtil.isBlank(status)){ return false; } - if(StringUtil.isBlank(distributionContactId)){ - return false; - } - return true; - } + return !StringUtil.isBlank(distributionContactId); + } } diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/BrandEnums.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/BrandEnums.java index a154a1252..bb50afe4a 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/BrandEnums.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/BrandEnums.java @@ -26,8 +26,8 @@ public enum BrandEnums implements Serializable { LINSY(10, "林氏家居"), ; - private Integer code; - private String value; + private final Integer code; + private final String value; BrandEnums(Integer code, String value) { this.code = code; diff --git a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/SignForStatusEnums.java b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/SignForStatusEnums.java index 209e6196c..b4142c4b2 100644 --- a/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/SignForStatusEnums.java +++ b/blade-service-api/logpm-factory-data-api/src/main/java/com/logpm/factorydata/enums/SignForStatusEnums.java @@ -17,8 +17,8 @@ public enum SignForStatusEnums implements Serializable { SIGN_FOR_ALL(1, "全部签收"), SIGN_FOR_SECTION(2, "部分签收"); - private Integer code; - private String value; + private final Integer code; + private final String value; SignForStatusEnums(Integer code, String value) { this.code = code; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingWaybillDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingWaybillDTO.java index 4848e303d..0e6d0a2a2 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingWaybillDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingWaybillDTO.java @@ -11,6 +11,6 @@ public class BillladingWaybillDTO implements Serializable { private Long billladingWaybillId; private Integer enterNum = 0;//输入件数 private BigDecimal enterWeight = BigDecimal.ZERO;//输入重量 - private BigDecimal enterVolume = BigDecimal.ZERO;;//输入体积 + private BigDecimal enterVolume = BigDecimal.ZERO;//输入体积 }