diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java index 9cc654405..ecb45b6f5 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java @@ -56,6 +56,10 @@ public interface RabbitConstant { String OUPAI_RECEIVING_EXCHANGE = "oupai_receiving_exchange"; String OUPAI_RECEIVING_ROUTING = "oupai_receiving_routing"; + String OUPAI_SIGN_QUEUE = "oupai_sign_queue"; + String OUPAI_SIGN_EXCHANGE = "oupai_sign_exchange"; + String OUPAI_SIGN_ROUTING = "oupai_sign_routing"; + //----------------------distribution--------------------- //备货消费失败队列 String DISTRIBUTION_ERROR_QUEUE = "distribution_error_queue"; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java index 88dfaed67..5efd39625 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryChargeEntity.java @@ -18,14 +18,14 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; +import java.math.BigDecimal; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.math.BigDecimal; - /** * 提货费用记录 实体类 * diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java index 475261150..e94bfe3f9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryDetailsEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java index f546f2fbd..c2ada7530 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryTripartiteEntity.java @@ -17,14 +17,14 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; +import java.math.BigDecimal; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; -import java.math.BigDecimal; - /** * 外协配送信息列表 实体类 * diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java index 14a51ecac..53a373f1b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionPackagereceiptEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java index 4bd211886..aae4607b9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationPackageEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java index 181623079..18b97c913 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java index eb476fdde..a61725b25 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java index 033866baf..790f1bfcd 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionUnpackingDetailsEntity.java @@ -17,10 +17,12 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.License; import lombok.AllArgsConstructor; import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java index 25ba20251..df6b8b929 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistrilbutionCallDeliveryEntity.java @@ -17,9 +17,10 @@ package com.logpm.distribution.entity; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java index f8603fe95..0da3c8370 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java @@ -10,8 +10,8 @@ import lombok.Data; **/ @Data public class DistributionParcelTrayVO { - private String trayId; //托盘id + private Long trayId; //托盘id private String trayCode; //托盘名称 - private String trayPackNum; //托盘名称 + private Integer trayPackNum; //托盘名称 } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index b0f219018..6d5dae340 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -34,6 +34,7 @@ public class DistributionStockupVO extends DistributionStockupEntity { private static final long serialVersionUID = 1L; private String headline; + private String cargoUnit; //数量 private String groupName; private String warehouseName; //仓库名称 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java index 24a837d50..99e2ab942 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionPrintWrapper.java @@ -16,11 +16,10 @@ */ package com.logpm.distribution.wrapper; -import com.logpm.distribution.entity.DistributionPrintEntity; -import com.logpm.distribution.vo.DistributionPrintVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; - +import com.logpm.distribution.entity.DistributionPrintEntity; +import com.logpm.distribution.vo.DistributionPrintVO; import java.util.Objects; /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java index 42cc60813..b5057ab61 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/wrapper/DistributionStockListInfoWrapper.java @@ -16,11 +16,10 @@ */ package com.logpm.distribution.wrapper; -import com.logpm.distribution.entity.DistributionStockListInfoEntity; -import com.logpm.distribution.vo.DistributionStockListInfoVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; - +import com.logpm.distribution.entity.DistributionStockListInfoEntity; +import com.logpm.distribution.vo.DistributionStockListInfoVO; import java.util.Objects; /** diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryOrderEntity.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryOrderEntity.java index ab41659d9..c6792de06 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryOrderEntity.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryOrderEntity.java @@ -249,4 +249,17 @@ public class FactoryOrderEntity extends BaseEntity { */ @ApiModelProperty(name = "转发状态 1转送 0未转送", notes = "") private Integer turnStatus; + + /** + * 商场编码 + */ + @ApiModelProperty(name = "商场编码", notes = "") + private String shopCode; + + /** + * 商场名称 + */ + @ApiModelProperty(name = "商场名称", notes = "") + private String shopName; + } diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpOutGoingOrderEntity.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpOutGoingOrderEntity.java new file mode 100644 index 000000000..796f6a55f --- /dev/null +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpOutGoingOrderEntity.java @@ -0,0 +1,73 @@ +package com.logpm.factory.oupai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.util.Date; + +@Data +@TableName("op_out_going_order") +@ApiModel(value = "OpOutGoingOrder对象", description = "欧派工厂配送单") +@EqualsAndHashCode(callSuper = true) +public class OpOutGoingOrderEntity extends BaseEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + + /** 配送单编码 */ + @ApiModelProperty(name = "配送单编码",notes = "") + private String code ; + /** 配送单状态 */ + @ApiModelProperty(name = "配送单状态",notes = "") + private Integer outGoingOrderStatus ; + /** 配送仓库编码 */ + @ApiModelProperty(name = "配送仓库编码",notes = "") + private String warehouseCode ; + /** 配送仓库名称 */ + @ApiModelProperty(name = "配送仓库名称",notes = "") + private String warehouseName ; + /** 配送仓库地址 */ + @ApiModelProperty(name = "配送仓库地址",notes = "") + private String warehouseAddress ; + /** 配送车牌号 */ + @ApiModelProperty(name = "配送车牌号",notes = "") + private String truckPlate ; + /** 配送日期 */ + @ApiModelProperty(name = "配送日期",notes = "") + private Date deliveryDate ; + /** 创建者 */ + @ApiModelProperty(name = "创建者",notes = "") + private String creator ; + /** 创建时间 */ + @ApiModelProperty(name = "创建时间",notes = "") + private Date createTime ; + @ApiModelProperty(name = "门店编码",notes = "") + private String storeCode; + @ApiModelProperty(name = "门店名称",notes = "") + private String storeName; + @ApiModelProperty(name = "商场编码",notes = "") + private String shopCode; + @ApiModelProperty(name = "商场名称",notes = "") + private String shopName; + /** 发货时间 */ + @ApiModelProperty(name = "发货时间",notes = "") + private Date sendTime ; + +} diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpSignBillEntity.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpSignBillEntity.java new file mode 100644 index 000000000..cea482740 --- /dev/null +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpSignBillEntity.java @@ -0,0 +1,89 @@ +package com.logpm.factory.oupai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("op_sign_bill") +@ApiModel(value = "OpSignBill对象", description = "欧派工厂签收单") +@EqualsAndHashCode(callSuper = true) +public class OpSignBillEntity extends BaseEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + + @ApiModelProperty(name = "配送单id",notes = "") + private Long outGoingOrderId ; + @ApiModelProperty(name = "签收单号",notes = "") + private String code ; + /** + * 新建:0 + * + * 已签收:1 + * + * 部分签收:2 + */ + @ApiModelProperty(name = "状态",notes = "") + private Integer signBillStatus ; + @ApiModelProperty(name = "签收人",notes = "") + private String signPerson ; + @ApiModelProperty(name = "签收人电话",notes = "") + private String signPhone ; + @ApiModelProperty(name = "签收人地址",notes = "") + private String signAddress ; + @ApiModelProperty(name = "签收时间",notes = "") + private Date signTime ; + @ApiModelProperty(name = "签收说明",notes = "") + private String remark; + @ApiModelProperty(name = "配送单号",notes = "") + private String outGoingOrderCode; + @ApiModelProperty(name = "再投原因",notes = "") + private String againsendReason; + @ApiModelProperty(name = "再投描述",notes = "") + private String description; + @ApiModelProperty(name = "是否再投",notes = "") + private Integer isAgainsend;//0否1是 + @ApiModelProperty(name = "创建者",notes = "") + private String creator; + @ApiModelProperty(name = "创建时间",notes = "") + private Date createTime ; + @ApiModelProperty(name = "顾客评分",notes = "") + private BigDecimal customerRate ; + @ApiModelProperty(name = "顾客反馈",notes = "") + private String customerFeedback; + @ApiModelProperty(name = "门店编码",notes = "") + private String storeCode; + @ApiModelProperty(name = "门店名称",notes = "") + private String storeName; + @ApiModelProperty(name = "商场编码",notes = "") + private String shopCode; + @ApiModelProperty(name = "商场名称",notes = "") + private String shopName; + @ApiModelProperty(name = "司机电话",notes = "") + private String driverPhone; + @ApiModelProperty(name = "司机名称",notes = "") + private String driverName; + @ApiModelProperty(name = "配送日期",notes = "") + private Date deliveryTime; + +} diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpSignPackageEntity.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpSignPackageEntity.java new file mode 100644 index 000000000..88a4e20da --- /dev/null +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpSignPackageEntity.java @@ -0,0 +1,44 @@ +package com.logpm.factory.oupai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +@Data +@TableName("op_sign_package") +@ApiModel(value = "OpSignPackage对象", description = "欧派工厂签收包件") +@EqualsAndHashCode(callSuper = true) +public class OpSignPackageEntity extends BaseEntity { + + /** 预留1 */ + @ApiModelProperty(name = "预留1",notes = "") + private String reserve1 ; + /** 预留2 */ + @ApiModelProperty(name = "预留2",notes = "") + private String reserve2 ; + /** 预留3 */ + @ApiModelProperty(name = "预留3",notes = "") + private String reserve3 ; + /** 预留4 */ + @ApiModelProperty(name = "预留4",notes = "") + private String reserve4 ; + /** 预留5 */ + @ApiModelProperty(name = "预留5",notes = "") + private String reserve5 ; + + + private Long signBillId; + /** 包件码 */ + @ApiModelProperty(name = "包件码",notes = "") + private String orderPackageCode ; + /** 签收状态 */ + @ApiModelProperty(name = "签收状态",notes = "") + private Integer packageStatus ; + /** 是否是库存品 */ + @ApiModelProperty(name = "是否是库存品",notes = "") + private Integer isInventory ;//0否 1是 + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java new file mode 100644 index 000000000..3bfd4e30b --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java @@ -0,0 +1,52 @@ +/* + * 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.warehouse.feign; + +import com.alibaba.fastjson.JSONObject; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.tool.api.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * 上下架 Feign接口类 + * + * @author zhy + * @since 2023-08-15 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME +) +public interface IWarehouseUpdownTypeClient { + + String API_PREFIX = "warehouseUpdownTypeLog/client"; + String TOP = API_PREFIX + "/top"; + + @GetMapping(TOP + "/downPackage") + R downPackage(@RequestParam("orderPackageCodes") String orderPackageCodes); + + @PostMapping(TOP + "/downZeroOrder") + R downZeroOrder(@RequestBody List zeroOrders); + + @PostMapping(TOP + "/downStock") + R downStock(@RequestBody List stockLists); +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java index 8a8db9aa4..73805b6a1 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java @@ -72,14 +72,15 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl data) { - log.info("传入参数>>>>>>>>>>>>>>>>{},>>>>>>>>{}",data); + log.info("传入参数>>>>>>>>>>>>>>>>,>>>>>>>>{}",data); ArrayList arrayList = new ArrayList<>(); for (BasicMaterialExcel datum : data) { //去重 List basicMaterialEntities = baseMapper.selectList(new QueryWrapper().lambda().eq(BasicMaterialEntity::getProductCode,datum.getProductCode())); - if (basicMaterialEntities.size()>0){continue;} + if (!basicMaterialEntities.isEmpty()){continue;} BasicMaterialEntity copy = BeanUtil.copy(datum, BasicMaterialEntity.class); - copy.setHide(1); + assert copy != null; + copy.setHide(1); arrayList.add(copy); } // 根据对象的value属性进行去重 diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java index c870dde50..2bcf2d66f 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java @@ -26,6 +26,7 @@ import com.logpm.basic.mapper.BasicPrintTemplateMapper; import com.logpm.basic.service.IBasicPrintTemplateService; import com.logpm.basic.vo.BasicPrintTemplateVO; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -45,6 +46,7 @@ import java.util.List; */ @Service @AllArgsConstructor +@Slf4j public class BasicPrintTemplateServiceImpl extends BaseServiceImpl implements IBasicPrintTemplateService { private BasicPrintTemplateMapper printTemplateMapper; @@ -67,13 +69,13 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl>>> {}", basicPrintTemplateDTO); + return false; } + boolean result = false; BasicPrintTemplateEntity basicPrintTemplateEntity = new BasicPrintTemplateEntity(); - BeanUtils.copyProperties(basicPrintTemplateDTO,basicPrintTemplateEntity); + BeanUtils.copyProperties(basicPrintTemplateDTO, basicPrintTemplateEntity); BladeUser user = AuthUtil.getUser(); Date date = new Date(); basicPrintTemplateEntity.setTenantId(user.getTenantId()); @@ -92,12 +94,13 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl goodsAllocationVOIPage = goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation); - return goodsAllocationVOIPage; + return goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation); } @@ -203,7 +201,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl select sum(lddd.quantity) wholeNum , ( - select COUNT(1) + select COUNT(DISTINCT ldbls.id) from logpm_distribution_delivery_details ldd LEFT JOIN logpm_distribution_bill_lading_scan ldbls on ldd.stock_list_id = ldbls.stock_list_id - where lddd.bill_lading_id = #{id} and ldd.is_deleted = 0 + where ldbls.bill_lading_id = #{id} and ldd.is_deleted = 0 ) esauNum from logpm_distribution_delivery_details lddd where lddd.bill_lading_id = #{id} and lddd.is_deleted = 0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 6225fc6cd..f763f9c6f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -234,7 +234,8 @@ +