Browse Source

改动过的

huanglizhi 1 year ago
parent
commit
7988a8724a
37 changed files with 255 additions and 261 deletions
  1. 8 0
      module-erp/src/main/java/com/hys/app/controller/erp/use/GoodsManagerController.java
  2. 8 3
      module-erp/src/main/java/com/hys/app/controller/erp/use/ProductManagerController.java
  3. 1 22
      module-erp/src/main/java/com/hys/app/controller/erp/use/WarehouseOutManagerController.java
  4. 1 0
      module-erp/src/main/java/com/hys/app/mapper/goods/GoodsMapper.java
  5. 2 1
      module-erp/src/main/java/com/hys/app/mapper/goods/ProductMapper.java
  6. 8 0
      module-erp/src/main/java/com/hys/app/model/erp/dos/GoodsDO.java
  7. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/dos/OrderDO.java
  8. 7 4
      module-erp/src/main/java/com/hys/app/model/erp/dos/OrderItemDO.java
  9. 3 1
      module-erp/src/main/java/com/hys/app/model/erp/dos/ProductDO.java
  10. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/dos/WarehouseEntryProductDO.java
  11. 0 5
      module-erp/src/main/java/com/hys/app/model/erp/dto/GoodsDTO.java
  12. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/OrderDTO.java
  13. 2 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/OrderItemDTO.java
  14. 4 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/ProductQueryParams.java
  15. 11 2
      module-erp/src/main/java/com/hys/app/model/erp/dto/SortItem.java
  16. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/WarehouseEntryProductDTO.java
  17. 1 1
      module-erp/src/main/java/com/hys/app/model/erp/enums/SnCodeStatusEnum.java
  18. 1 0
      module-erp/src/main/java/com/hys/app/model/erp/enums/WarehouseEntyrTypeEnum.java
  19. 0 4
      module-erp/src/main/java/com/hys/app/model/erp/vo/GoodsVO.java
  20. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/vo/OrderVO.java
  21. 6 0
      module-erp/src/main/java/com/hys/app/model/erp/vo/ProductStockV1.java
  22. 1 1
      module-erp/src/main/java/com/hys/app/model/erp/vo/TransitVO.java
  23. 8 1
      module-erp/src/main/java/com/hys/app/model/support/validator/validator/LogAspect.java
  24. 4 173
      module-erp/src/main/java/com/hys/app/model/system/dos/SystemLogs.java
  25. 2 2
      module-erp/src/main/java/com/hys/app/service/base/plugin/upload/MinIOPlugin.java
  26. 3 0
      module-erp/src/main/java/com/hys/app/service/erp/GoodsManager.java
  27. 9 4
      module-erp/src/main/java/com/hys/app/service/erp/ProductManager.java
  28. 34 14
      module-erp/src/main/java/com/hys/app/service/erp/impl/GoodsManagerImpl.java
  29. 36 11
      module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java
  30. 2 1
      module-erp/src/main/java/com/hys/app/service/erp/impl/OrderReturnManagerImpl.java
  31. 29 3
      module-erp/src/main/java/com/hys/app/service/erp/impl/ProductManagerImpl.java
  32. 5 1
      module-erp/src/main/java/com/hys/app/service/erp/impl/ProductStockManagerImpl.java
  33. 40 2
      module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseEntryManagerImpl.java
  34. 1 3
      module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseOutManagerImpl.java
  35. 1 0
      module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoServiceImpl.java
  36. 1 1
      module-erp/src/main/resources/mapper/ProductStockMapper.xml
  37. 1 1
      server/src/main/resources/application.yml

+ 8 - 0
module-erp/src/main/java/com/hys/app/controller/erp/use/GoodsManagerController.java

@@ -6,6 +6,7 @@ import com.hys.app.framework.database.WebPage;
 import com.hys.app.model.erp.dos.GoodsDO;
 import com.hys.app.model.erp.dto.GoodsDTO;
 import com.hys.app.model.erp.dto.GoodsQueryParams;
+import com.hys.app.model.erp.dto.GoodsSortDto;
 import com.hys.app.model.erp.dto.GoodsUpdateDTO;
 import com.hys.app.model.erp.vo.GoodsVO;
 import com.hys.app.model.erp.vo.ProductStockVO;
@@ -59,6 +60,13 @@ public class GoodsManagerController {
         goodsManager.updateById(goodsDO);
     }
 
+    @ApiOperation(value = "更新商品排序")
+    @PostMapping("/sort")
+    @Log(client = LogClient.admin, detail = "更新商品排序")
+    public void sort(@RequestBody @Valid GoodsSortDto request) {
+        goodsManager.updateSort(request);
+    }
+
     @ApiOperation(value = "更新上下架之前校验库存")
     @PostMapping("/update/check")
     @Log(client = LogClient.admin, detail = "修改id为[${id}]的商品")

+ 8 - 3
module-erp/src/main/java/com/hys/app/controller/erp/use/ProductManagerController.java

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hys.app.framework.database.BaseQueryParam;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.model.erp.dos.ProductGroupDO;
-import com.hys.app.model.erp.dto.OrderDTO;
-import com.hys.app.model.erp.dto.ProductGroupQueryParams;
-import com.hys.app.model.erp.dto.ProductQueryParams;
+import com.hys.app.model.erp.dto.*;
 import com.hys.app.model.erp.vo.ProductStockVO;
 import com.hys.app.model.erp.vo.ProductVO;
 import com.hys.app.model.erp.vo.TransitVO;
@@ -112,6 +110,13 @@ public class ProductManagerController {
         return productManager.transitDetail(stockId);
     }
 
+    @ApiOperation(value = "排序")
+    @PostMapping("/updateSort")
+    @Log(client = LogClient.admin, detail = "新增入库获取所有的sku信息")
+    public void updateSort(@RequestBody  @Valid GoodsSortDto goodsSortDto) {
+         productManager.updateSort(goodsSortDto.getData());
+    }
+
 
 }
 

+ 1 - 22
module-erp/src/main/java/com/hys/app/controller/erp/use/WarehouseOutManagerController.java

@@ -49,12 +49,6 @@ public class WarehouseOutManagerController {
         return warehouseOutManager.list(queryParams);
     }
 
-    @ApiOperation(value = "出库前预览")
-    @PostMapping("/preview")
-    public WarehouseOutVO preview(@RequestBody @Valid WarehouseOutPreviewDTO warehouseOutPreviewDTO) {
-        return warehouseOutManager.preview(warehouseOutPreviewDTO);
-    }
-
     @ApiOperation(value = "添加")
     @PostMapping
     @Log(client = LogClient.admin, detail = "创建出库单")
@@ -78,25 +72,11 @@ public class WarehouseOutManagerController {
 
     @ApiOperation(value = "删除")
     @DeleteMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "删除ID为[${ids}]的出库单")
+    @Log(client = LogClient.admin, detail = "删除ID为[${id}]的出库单")
     public void delete(@PathVariable Long id) {
         warehouseOutManager.delete(id);
     }
 
-    @ApiOperation(value = "审核")
-    @PostMapping("/audit/{ids}")
-    @Log(client = LogClient.admin, detail = "出库单[${ids}]审核")
-    public void audit(@PathVariable List<Long> ids, @NotNull(message = "审核类型不能为空") WarehouseOutStatusEnum status, String remark) {
-        warehouseOutManager.audit(ids, status, remark);
-    }
-
-
-    @ApiOperation(value = "查询出库单统计分页列表数据")
-    @GetMapping("/statistics")
-    public WebPage statistics(WarehouseOutStatisticsParam params) {
-        return warehouseOutManager.statistics(params);
-    }
-
     @ApiOperation(value = "导出出库单统计列表")
     @GetMapping("/export")
     public void export(HttpServletResponse response, WarehouseOutStatisticsParam params) {
@@ -119,7 +99,6 @@ public class WarehouseOutManagerController {
 
     @ApiOperation(value = "根据仓库找到所有sku库存大于0的商品")
     @GetMapping("/getGoodByWarehouse/{warehouseId}")
-    @Log(client = LogClient.admin, detail = "根据仓库找到所有sku库存大于0的商品")
     public IPage<ProductStockVO> getGoodByWarehouse(@PathVariable(value = "warehouseId" )Long warehouseId, BaseQueryParam queryParam) {
         return warehouseOutManager.getGoodByWarehouse(warehouseId,queryParam,null,null);
     }

+ 1 - 0
module-erp/src/main/java/com/hys/app/mapper/goods/GoodsMapper.java

@@ -21,6 +21,7 @@ public interface GoodsMapper extends BaseMapperX<GoodsDO> {
                 .eqIfPresent(GoodsDO::getSn, params.getSn())
                 .eqIfPresent(GoodsDO::getName, params.getName())
                 .eqIfPresent(GoodsDO::getCategoryId, params.getCategoryId())
+                .orderByDesc(GoodsDO::getSort)
                 .page(params);
     }
 

+ 2 - 1
module-erp/src/main/java/com/hys/app/mapper/goods/ProductMapper.java

@@ -19,12 +19,13 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
                 .andX(StringUtil.notEmpty(params.getKeyword()),
                         w -> w.like(ProductDO::getName, params.getKeyword()).or().like(ProductDO::getSn, params.getKeyword()))
                 .likeIfPresent(ProductDO::getSn, params.getSn())
+                .likeIfPresent(ProductDO::getSku, params.getSku())
                 .likeIfPresent(ProductDO::getName, params.getName())
                 .eqIfPresent(ProductDO::getCategoryId, params.getCategoryId())
                 .eqIfPresent(ProductDO::getHireOrSail, params.getHireOrSail())
                 .likeIfPresent(ProductDO::getUnit, params.getUnit())
                 .eqIfPresent(ProductDO::getMarketEnable, params.getMarketEnable())
-                .orderByDesc(ProductDO::getId)
+                .orderByAsc(ProductDO::getSort)
                 .page(params);
     }
 

+ 8 - 0
module-erp/src/main/java/com/hys/app/model/erp/dos/GoodsDO.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.hys.app.framework.database.mybatisplus.base.BaseDO;
 import com.hys.app.model.erp.dto.ProductDTO;
+import com.hys.app.model.goods.dos.GoodsGalleryDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 
 /**
@@ -66,6 +68,10 @@ public class GoodsDO extends BaseDO {
     @ApiModelProperty(name = "imageList", value = "商品相册")
     private String images;
 
+
+    @ApiModelProperty(name = "imageList", value = "商品图标")
+    private String imageSmallList;
+
     @ApiModelProperty(name = "video", value = "商品视频")
     private String video;
 
@@ -81,4 +87,6 @@ public class GoodsDO extends BaseDO {
     @ApiModelProperty(name = "是否有序列号", value = "商品视频")
     private Boolean haveSn;
 
+    private Long  sort;
+
 }

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dos/OrderDO.java

@@ -71,6 +71,9 @@ public class OrderDO extends BaseDO {
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<Long> warehouseId;
 
+    @ApiModelProperty(name = "return_warehouse_id", value = "仓库id")
+    private Long returnWarehouseId;
+
     @ApiModelProperty(name = "warehouse_name", value = "仓库名称")
     private String warehouseName;
 

+ 7 - 4
module-erp/src/main/java/com/hys/app/model/erp/dos/OrderItemDO.java

@@ -30,8 +30,6 @@ public class OrderItemDO implements Serializable {
     private Long orderId;
 
 
-
-
     @ApiModelProperty(name = "order_sn", value = "订单编号")
     private String orderSn;
 
@@ -98,9 +96,14 @@ public class OrderItemDO implements Serializable {
 
     // ================ 退货信息 ================
 
-    @ApiModelProperty(name = "return_num", value = "已退货数量")
-    private Integer returnNum;
+    @ApiModelProperty(name = "return_num", value = "退货数量")
+    private Integer returnNum = 0;
+
+    @ApiModelProperty(name = "has_sale_after", value = "已退货数量")
+    private Boolean hasSaleAfter = false;
 
+    @ApiModelProperty(name = "return_num", value = "退货数量")
+    private Integer hasReturnNum = 0;
 
     @ApiModelProperty(name = "warehouse_id", value = "订单id")
     private Long warehouseId;

+ 3 - 1
module-erp/src/main/java/com/hys/app/model/erp/dos/ProductDO.java

@@ -120,9 +120,11 @@ public class ProductDO extends BaseDO {
     private Boolean haveSn;
 
     @ApiModelProperty(name = "imageList", value = "商品相册")
-    @NotBlank(message = "出租商品  售卖商品")
     private String hireOrSail;
 
+    @ApiModelProperty(name = "产品全局排序", value = "商品相册")
+    private Long sort;
+
     /**
      * 解决JacksonTypeHandler反序列化问题
      */

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dos/WarehouseEntryProductDO.java

@@ -118,4 +118,7 @@ public class WarehouseEntryProductDO implements Serializable {
 
     @ApiModelProperty(name = "scan_order_type", value = "扫码的单号,扫码订单打出来的数据必传")
     private ScanFormCodeTypeEnum scanOrderType;
+
+    @ApiModelProperty(name = "order_num", value = "订单原数量")
+    private Long orderNum;
 }

+ 0 - 5
module-erp/src/main/java/com/hys/app/model/erp/dto/GoodsDTO.java

@@ -83,11 +83,6 @@ public class GoodsDTO {
     @NotEmpty(message = "商品相册不能为空")
     private List<GoodsGalleryDO> imageList;
 
-
-    @ApiModelProperty(name = "imageList", value = "商品相册")
-    @NotEmpty(message = "商品图标不能为空")
-    private List<GoodsGalleryDO> imageSmallList;
-
     @ApiModelProperty(name = "是否有序列号", value = "商品视频")
     private Boolean haveSn;
 }

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/OrderDTO.java

@@ -64,6 +64,9 @@ public class OrderDTO {
     @NotNull(message = "仓库id不能为空")
     private List<Long> warehouseId;
 
+    @ApiModelProperty(name = "return_warehouse_id", value = "仓库id")
+    private Long returnWarehouseId;
+
     @ApiModelProperty(name = "attachment", value = "附件")
     private String attachment;
 

+ 2 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/OrderItemDTO.java

@@ -56,5 +56,7 @@ public class OrderItemDTO {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
+    private Integer returnNum;
+
 }
 

+ 4 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/ProductQueryParams.java

@@ -25,6 +25,10 @@ public class ProductQueryParams extends BaseQueryParam {
     @ApiModelProperty(name = "sn", value = "产品编号")
     private String sn;
 
+    @ApiModelProperty(name = "sn", value = "sku")
+    private String sku;
+
+
     @ApiModelProperty(name = "name", value = "产品名称")
     private String name;
 

+ 11 - 2
module-erp/src/main/java/com/hys/app/model/erp/dto/SortItem.java

@@ -2,8 +2,17 @@ package com.hys.app.model.erp.dto;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class SortItem{
-    private Long goodsId;
-    private Integer sort;
+
+    @NotNull(message = "前一条before  后一条after  自己own")
+    private String  position;
+
+    @NotNull(message = "需要更改商品的id不能为空")
+    private Long productId;
+
+    @NotNull(message = "下面一条数据的排序不能为空")
+    private Long sort;
 }

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/WarehouseEntryProductDTO.java

@@ -47,5 +47,8 @@ public class WarehouseEntryProductDTO {
     @ApiModelProperty(name = "product_stock_id", value = "product_stock_id不能为空")
     private Long productStockId;
 
+    @ApiModelProperty(name = "order_item|_num", value = "订单原数量")
+    private Long orderNum;
+
 }
 

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/enums/SnCodeStatusEnum.java

@@ -13,7 +13,7 @@ public enum SnCodeStatusEnum {
 
     NOT_USED("HAS_TRANSFER", "未使用"),
     IN_WAREHOUSE("HAS_TRANSFER", "已入库"),
-    OUT_WAREHOUSE("ROLLBACK_HANDLE", "已出库");
+    OUT_WAREHOUSE("OUT_WAREHOUSE", "已出库");
 
     private final String value;
     private final String label;

+ 1 - 0
module-erp/src/main/java/com/hys/app/model/erp/enums/WarehouseEntyrTypeEnum.java

@@ -14,6 +14,7 @@ public enum WarehouseEntyrTypeEnum {
     SALE_ENTRY("SALE_ENTRY", "采购入库"),
     TRANSFER_ENTRY("TRANSFER_ENTRY", "调拨入库"),
     HAIL_ENTRY("HAIL_ENTRY", "租赁返回"),
+    SALE_AFTER("SALE_AFTER", "售后退货"),
     OTHER_ENTRY("OTHER_ENTRY", "其它入库");
 
     private final String value;

+ 0 - 4
module-erp/src/main/java/com/hys/app/model/erp/vo/GoodsVO.java

@@ -31,9 +31,5 @@ public class GoodsVO extends GoodsDO {
     private List<GoodsGalleryDO> imageList;
 
 
-    @ApiModelProperty(name = "imageList", value = "商品图标")
-    private List<GoodsGalleryDO> imageSmallList;
-
-
 }
 

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/vo/OrderVO.java

@@ -110,6 +110,9 @@ public class OrderVO extends OrderDO {
     @ApiModelProperty(name = "subtract_stock", value = "是否允许负库存")
     private Boolean subtractStock;
 
+    @ApiModelProperty(name = "subtract_stock", value = "入库扫描订单的类型")
+    private String  scanOrderType;
+
 
 }
 

+ 6 - 0
module-erp/src/main/java/com/hys/app/model/erp/vo/ProductStockV1.java

@@ -1,5 +1,7 @@
 package com.hys.app.model.erp.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hys.app.model.erp.dos.ProductDO;
 import com.hys.app.model.erp.dos.ProductStockDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -74,6 +76,10 @@ public class ProductStockV1  {
     @ApiModelProperty(name = "warning_stock", value = "预警库存")
     private String warningStock;
 
+    @ApiModelProperty(name = "warning_stock", value = "预警库存")
+    @TableField(exist = false)
+    private ProductDO productVO;
+
 
 
 

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/vo/TransitVO.java

@@ -18,7 +18,7 @@ public class TransitVO {
     private Date endTime;
 
     @ApiModelProperty("在途库存数量")
-    private  Integer transitStock;
+    private  Integer num;
 
     @ApiModelProperty("订单编号")
     private String orderSn;

+ 8 - 1
module-erp/src/main/java/com/hys/app/model/support/validator/validator/LogAspect.java

@@ -14,7 +14,9 @@ import com.hys.app.model.support.LogClient;
 import com.hys.app.model.support.validator.annotation.Log;
 import com.hys.app.model.support.validator.annotation.LogLevel;
 import com.hys.app.model.system.dos.SystemLogs;
+import com.hys.app.service.system.SystemLogsManager;
 import net.sf.json.JSONObject;
+import org.apache.catalina.security.SecurityUtil;
 import org.apache.commons.lang.text.StrSubstitutor;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -44,6 +46,9 @@ public class LogAspect {
     @Autowired
     private MessageSender messageSender;
 
+    @Autowired
+    private SystemLogsManager systemLogsManager;
+
     /**
      * 切面方法
      *
@@ -99,8 +104,10 @@ public class LogAspect {
         systemLogs.setSellerId(sellerId);
         systemLogs.setLevel(level.name());
         systemLogs.setClient(client.name());
+        systemLogs.setUserId(AdminUserContext.getAdminUserId());
 
-        this.messageSender.send(new MqMessage(AmqpExchange.LOGS, AmqpExchange.LOGS + "_ROUTING", systemLogs));
+        systemLogsManager.add(systemLogs);
+//        this.messageSender.send(new MqMessage(AmqpExchange.LOGS, AmqpExchange.LOGS + "_ROUTING", systemLogs));
     }
 
     /**

+ 4 - 173
module-erp/src/main/java/com/hys/app/model/system/dos/SystemLogs.java

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.hys.app.model.support.validator.annotation.LogLevel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -24,6 +25,7 @@ import java.io.Serializable;
 @TableName(value = "es_system_logs")
 @ApiModel
 @JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class)
+@Data
 public class SystemLogs implements Serializable {
 
     private static final long serialVersionUID = 2535359233207726L;
@@ -86,177 +88,6 @@ public class SystemLogs implements Serializable {
     @ApiModelProperty(name = "seller_id", value = "商家id, 店员要存储所属商家,管理端存0")
     private Long sellerId;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    public String getParams() {
-        return params;
-    }
-
-    public void setParams(String params) {
-        this.params = params;
-    }
-
-    public Long getOperateTime() {
-        return operateTime;
-    }
-
-    public void setOperateTime(Long operateTime) {
-        this.operateTime = operateTime;
-    }
-
-    public String getOperateDetail() {
-        return operateDetail;
-    }
-
-    public void setOperateDetail(String operateDetail) {
-        this.operateDetail = operateDetail;
-    }
-
-    public String getOperateIp() {
-        return operateIp;
-    }
-
-    public void setOperateIp(String operateIp) {
-        this.operateIp = operateIp;
-    }
-
-    public String getOperatorName() {
-        return operatorName;
-    }
-
-    public void setOperatorName(String operatorName) {
-        this.operatorName = operatorName;
-    }
-
-    public Long getOperatorId() {
-        return operatorId;
-    }
-
-    public void setOperatorId(Long operatorId) {
-        this.operatorId = operatorId;
-    }
-
-    public Long getSellerId() {
-        return sellerId;
-    }
-
-    public void setSellerId(Long sellerId) {
-        this.sellerId = sellerId;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getClient() {
-        return client;
-    }
-
-    public void setClient(String client) {
-        this.client = client;
-    }
-
-    public SystemLogs(String method, String params, String operateDetail, String operateIp, String operatorName, Long operatorId, Long sellerId, String level, String client) {
-        this.method = method;
-        this.params = params;
-        this.operateTime = DateUtil.getDateline();
-        this.level = level;
-        this.client = client;
-        this.operateDetail = operateDetail;
-        this.operateIp = operateIp;
-        this.operatorName = operatorName;
-        this.operatorId = operatorId;
-        this.sellerId = sellerId;
-    }
-
-    public SystemLogs() {
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        SystemLogs that = (SystemLogs) o;
-        if (id != null ? !id.equals(that.id) : that.id != null) {
-            return false;
-        }
-        if (method != null ? !method.equals(that.method) : that.method != null) {
-            return false;
-        }
-        if (params != null ? !params.equals(that.params) : that.params != null) {
-            return false;
-        }
-        if (operateTime != null ? !operateTime.equals(that.operateTime) : that.operateTime != null) {
-            return false;
-        }
-        if (operateDetail != null ? !operateDetail.equals(that.operateDetail) : that.operateDetail != null) {
-            return false;
-        }
-        if (operateIp != null ? !operateIp.equals(that.operateIp) : that.operateIp != null) {
-            return false;
-        }
-        if (operatorName != null ? !operatorName.equals(that.operatorName) : that.operatorName != null) {
-            return false;
-        }
-        if (operatorId != null ? !operatorId.equals(that.operatorId) : that.operatorId != null) {
-            return false;
-        }
-        if (sellerId != null ? !sellerId.equals(that.sellerId) : that.sellerId != null) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = 0;
-        result = 31 * result + (id != null ? id.hashCode() : 0);
-        result = 31 * result + (method != null ? method.hashCode() : 0);
-        result = 31 * result + (params != null ? params.hashCode() : 0);
-        result = 31 * result + (operateTime != null ? operateTime.hashCode() : 0);
-        result = 31 * result + (operateDetail != null ? operateDetail.hashCode() : 0);
-        result = 31 * result + (operateIp != null ? operateIp.hashCode() : 0);
-        result = 31 * result + (operatorName != null ? operatorName.hashCode() : 0);
-        result = 31 * result + (operatorId != null ? operatorId.hashCode() : 0);
-        result = 31 * result + (sellerId != null ? sellerId.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "SystemLogs{" +
-                "id=" + id +
-                ", method='" + method + '\'' +
-                ", params='" + params + '\'' +
-                ", operateTime=" + operateTime +
-                ", operateDetail='" + operateDetail + '\'' +
-                ", operateIp='" + operateIp + '\'' +
-                ", operatorName='" + operatorName + '\'' +
-                ", operatorId=" + operatorId +
-                ", sellerId=" + sellerId +
-                '}';
-    }
+    @ApiModelProperty(name = "user_id", value = "登录人id")
+    private Long userId;
 }

+ 2 - 2
module-erp/src/main/java/com/hys/app/service/base/plugin/upload/MinIOPlugin.java

@@ -161,9 +161,9 @@ public class MinIOPlugin implements Uploader {
     @Override
     public String getThumbnailUrl(String url, Integer width, Integer height) {
         // 缩略图全路径
-        String thumbnailPah = url + "_" + width + "x" + height;
+//        String thumbnailPah = url + "_" + width + "x" + height;
         // 返回缩略图全路径
-        return thumbnailPah;
+        return url;
     }
 
     @Override

+ 3 - 0
module-erp/src/main/java/com/hys/app/service/erp/GoodsManager.java

@@ -85,5 +85,8 @@ public interface GoodsManager extends BaseService<GoodsDO> {
      * @return
      */
     Page<ProductStockVO> getSkuByWarehouse(Long wareHouseId, BaseQueryParam queryParam);
+
+    void updateSort(GoodsSortDto request);
+
 }
 

+ 9 - 4
module-erp/src/main/java/com/hys/app/service/erp/ProductManager.java

@@ -6,10 +6,7 @@ import com.hys.app.framework.database.mybatisplus.base.BaseService;
 import com.hys.app.model.erp.dos.GoodsDO;
 import com.hys.app.model.erp.dos.ProductDO;
 import com.hys.app.model.erp.dos.ProductGroupDO;
-import com.hys.app.model.erp.dto.GoodsQueryParams;
-import com.hys.app.model.erp.dto.ProductDTO;
-import com.hys.app.model.erp.dto.ProductGroupQueryParams;
-import com.hys.app.model.erp.dto.ProductQueryParams;
+import com.hys.app.model.erp.dto.*;
 import com.hys.app.model.erp.vo.ProductStockVO;
 import com.hys.app.model.erp.vo.ProductVO;
 import com.hys.app.model.erp.vo.TransitVO;
@@ -131,10 +128,18 @@ public interface ProductManager extends BaseService<ProductDO> {
 
     /**
      * 获取在途明细 去发货列表里面找
+     *
      * @param stockId
      * @return
      */
     List<TransitVO> transitDetail(Long stockId);
 
+    /**
+     * 全局更新sku排序
+     *
+     * @param sortItem
+     * @return
+     */
+    void updateSort(List<SortItem>  sortItem);
 }
 

+ 34 - 14
module-erp/src/main/java/com/hys/app/service/erp/impl/GoodsManagerImpl.java

@@ -17,9 +17,7 @@ import com.hys.app.model.erp.dos.AreaStock;
 import com.hys.app.model.erp.dos.GoodsDO;
 import com.hys.app.model.erp.dos.ProductDO;
 import com.hys.app.model.erp.dos.ProductStockDO;
-import com.hys.app.model.erp.dto.GoodsDTO;
-import com.hys.app.model.erp.dto.GoodsQueryParams;
-import com.hys.app.model.erp.dto.ProductDTO;
+import com.hys.app.model.erp.dto.*;
 import com.hys.app.model.erp.vo.GoodsVO;
 import com.hys.app.model.erp.vo.ProductStockVO;
 import com.hys.app.model.erp.vo.ProductVO;
@@ -32,6 +30,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -67,17 +66,20 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         checkParams(goodsDTO);
         GoodsDO goodsDO = BeanUtil.copyProperties(goodsDTO, GoodsDO.class);
         List<ProductDO> bean = BeanUtils.toBean(goodsDTO.getProductList(), ProductDO.class);
+        // 保存相册
+        this.goodsGalleryManager.add(goodsDTO.getImageList(), goodsDO.getId());
+        GoodsGalleryDO goodsGallery = goodsGalleryManager.getGoodsGallery(goodsDTO.getImageList().get(0).getOriginal());
+        goodsDO.setImageSmallList(goodsGallery.getSmall());
         super.save(goodsDO);
         bean.forEach(item ->{
             item.setGoodsId(goodsDO.getId());
             item.setHireOrSail(goodsDO.getHireOrSail());
         });
         productManager.saveBatch(bean);
-        // 保存相册
-        this.goodsGalleryManager.add(goodsDTO.getImageList(), goodsDO.getId());
-        //保存图标
-        this.goodsGalleryManager.add(goodsDTO.getImageSmallList(), goodsDO.getId()+99);
-
+        for (int i = 1; i <= bean.size(); i++) {
+            bean.get(i-1).setSort(bean.get(i-1).getId()+100000000*i);
+        }
+        productManager.updateBatchById(bean);
         //初始化库存
         productStockManager.intStock(bean);
         ;
@@ -100,15 +102,23 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         //先删除sku在新增
         productManager.remove(new LambdaQueryWrapper<ProductDO>().eq(ProductDO::getGoodsId, goodsDTO.getId()));
         List<ProductDO> bean = BeanUtils.toBean(goodsDTO.getProductList(), ProductDO.class);
+        // 保存相册
+        goodsGalleryManager.edit(goodsDTO.getImageList(), goodsDTO.getId());
+        this.goodsGalleryManager.add(goodsDTO.getImageList(), goodsDO.getId());
+        GoodsGalleryDO goodsGallery = goodsGalleryManager.getGoodsGallery(goodsDTO.getImageList().get(0).getOriginal());
+        goodsDO.setImageSmallList(goodsGallery.getSmall());
         updateById(goodsDO);
         bean.forEach(item ->{
             item.setGoodsId(goodsDO.getId());
             item.setHireOrSail(goodsDO.getHireOrSail());
         });
         productManager.saveBatch(bean);
-        goodsGalleryManager.edit(goodsDTO.getImageList(), goodsDTO.getId());
-        //保存图标
-        this.goodsGalleryManager.edit(goodsDTO.getImageSmallList(), goodsDTO.getId()+99);
+        for (int i = 1; i <= bean.size(); i++) {
+            bean.get(i-1).setSort(bean.get(i-1).getId()+100000000*i);
+        }
+        productManager.updateBatchById(bean);
+
+
 
         // 发送商品消息
 //        GoodsChangeMessage message = new GoodsChangeMessage(GoodsChangeMessage.GoodsChangeType.Edit, goodsDTO.getId());
@@ -180,9 +190,6 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         // 商品相册
         List<GoodsGalleryDO> galleryList = goodsGalleryManager.list(goodsDO.getId());
         goodsVO.setImageList(galleryList);
-        // 商品图标
-        List<GoodsGalleryDO> gallerySmallList = goodsGalleryManager.list(goodsDO.getId()+99);
-        goodsVO.setImageSmallList(gallerySmallList);
         return goodsVO;
     }
 
@@ -226,5 +233,18 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         }
         return convert;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSort(GoodsSortDto sortDto) {
+        List<GoodsDO> goodsDOS = new ArrayList<>();
+        for (SortItem item : sortDto.getData()) {
+//            GoodsDO goodsDO = getById(item.getGoodsId());
+//            goodsDO.setSort(item.getSort());
+//            goodsDOS.add(goodsDO);
+        }
+        updateBatchById(goodsDOS);
+    }
+
 }
 

+ 36 - 11
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java

@@ -98,7 +98,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
     @Transactional(rollbackFor = Exception.class)
     public void edit(OrderDTO orderDTO) {
         if (OrderTypeEnum.TO_C.equals(orderDTO.getType())) {
-            if (ObjectUtil.isNull(orderDTO.getStartTime()) || ObjectUtil.isNull(orderDTO.getEndTime())) {
+            if (ObjectUtil.isNull(orderDTO.getStartTime())) {
                 throw new ServiceException("租用时间不能为空");
             }
         }
@@ -128,9 +128,6 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
             ProductVO productVO = BeanUtil.copyProperties(productDOList.stream().filter(item -> item.getId().equals(dto.getProductId())).findFirst().get(), ProductVO.class);
             dto.setProductVO(productVO);
             GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(productVO.getGoodsId()), GoodsVO.class);
-            // 商品图标
-            List<GoodsGalleryDO> gallerySmallList = goodsGalleryManager.list(id + 99);
-            goodsVO.setImageSmallList(gallerySmallList);
             dto.setGoodsVO(goodsVO);
             dto.setUsableStock(productStockManager.getById(dto.getProductStockId()).getUsableStock());
 
@@ -257,8 +254,11 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
         //根据订单查找到这个订单的所有货物扣减库存
         List<OrderSendItemVO> list = orderSendDO.getOrderItemVOS();
         List<OrderSendItemDO> selectList = orderSendItemManager.list(new LambdaQueryWrapper<OrderSendItemDO>().eq(OrderSendItemDO::getSendOrderId, sendOrderId));
+        if (list.size() != selectList.size()){
+            throw new ServiceException("发货商品不能修改");
+        }
         for (OrderSendItemDO itemDO : selectList) {
-            Optional<OrderSendItemVO> first = list.stream().filter(item -> item.getId().equals(itemDO.getId())).findFirst();
+            Optional<OrderSendItemVO> first = list.stream().filter(item -> item.getProductId().equals(itemDO.getProductId())).findFirst();
             if (!first.isPresent()) {
                 throw new ServiceException("发货商品不能修改");
             }
@@ -290,13 +290,14 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
         outDO.setOrderId(aDo.getOrderId());
         outDO.setHasSubmit("Y");
         outDO.setWarehouseId(aDo.getWarehouseId());
-        outDO.setNotes("发货单生成的出单");
+        outDO.setNotes("发货单生成的出单");
         outDO.setSn(noGenerateManager.generate(NoBusinessTypeEnum.WarehouseOut, 66L));
         warehouseOutMapper.insert(outDO);
         List<ItemSnCodeDO> itemSnCodeDOS = new ArrayList<>();
         //保存出库单明细
         List<WarehouseOutItemDO> beanList = BeanUtils.toBean(list, WarehouseOutItemDO.class);
         //保存发货单明细和序列号的关系
+        List<GoodsSnDO> snDOS = new ArrayList<>();
         for (OrderSendItemVO sendItemVO : list) {
             //判断发货数量是不是和明细数量一致,不一样不让保存
             ProductDO byId = productManager.getById(sendItemVO.getProductId());
@@ -310,6 +311,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
             }
 
             if (CollUtil.isNotEmpty(sendItemVO.getSnCodeList())) {
+                snDOS.addAll(sendItemVO.getSnCodeList());
                 for (GoodsSnDO snDO : sendItemVO.getSnCodeList()) {
                     //出库明细和序列号的关系
                     ItemSnCodeDO itemSnCodeDO = new ItemSnCodeDO();
@@ -321,6 +323,15 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
                 }
             }
         }
+        //更改序列号的状态
+        if (CollUtil.isNotEmpty(snDOS)) {
+            //更爱序列号状态
+            for (GoodsSnDO snDO : snDOS) {
+                snDO.setStatus(SnCodeStatusEnum.OUT_WAREHOUSE);
+                snDO.setOutHouseId(outDO.getId());
+            }
+            goodsSnManager.updateBatchById(snDOS);
+        }
         //保存出库单明细和序列号的关系
         beanList.forEach(item -> {
             item.setWarehouseOutId(outDO.getId());
@@ -382,12 +393,25 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
         if (ObjectUtil.isNull(orderDO)) {
             throw new ServiceException("请录入正确的订单号");
         }
-        if (!OrderTypeEnum.TO_C.equals(orderDO.getType())) {
-            throw new ServiceException("只有租赁订单才可做入库单");
+        OrderVO orderVO = BeanUtil.copyProperties(orderDO, OrderVO.class);
+
+        if (SaleOrderStatusEnum.SALE_AFTER_ING.equals(orderDO.getStatus()) ||
+                SaleOrderStatusEnum.SALE_AFTER_END.equals(orderDO.getStatus()) ||
+                SaleOrderStatusEnum.SALE_AFTER_CANCEL.equals(orderDO.getStatus()) ){
+            orderVO.setScanOrderType("saleAfter");
+            scanOrder(orderVO);
         }
 
-        OrderVO orderVO = BeanUtil.copyProperties(orderDO, OrderVO.class);
-        List<OrderItemDO> list = orderItemManager.list(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderDO.getId()));
+        if (OrderTypeEnum.TO_C.equals(orderDO.getType()) && SaleOrderStatusEnum.SENDING.equals(orderDO.getStatus())) {
+            orderVO.setScanOrderType("return");
+            scanOrder(orderVO);
+        }
+        return orderVO;
+    }
+    private void scanOrder(OrderVO orderVO){
+        List<OrderItemDO> list = orderItemManager.list(new LambdaQueryWrapper<OrderItemDO>()
+                .eq(OrderItemDO::getOrderId, orderVO.getId())
+                .eq(orderVO.getScanOrderType().equals("saleAfter"),OrderItemDO::getHasSaleAfter,true));
         List<Long> goodIdlist = list.stream().map(OrderItemDO::getProductId).collect(Collectors.toList());
         // 查询订单项
         List<OrderItemDTO> itemList = BeanUtils.toBean(list, OrderItemDTO.class);
@@ -401,9 +425,10 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
             dto.setUsableStock(productStockManager.getById(dto.getProductStockId()).getUsableStock());
         }
         orderVO.setItemList(itemList);
-        return orderVO;
     }
 
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void extension(Long orderId, OrderDTO orderDTO) {

+ 2 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderReturnManagerImpl.java

@@ -91,7 +91,8 @@ public class OrderReturnManagerImpl extends BaseServiceImpl<OrderReturnMapper, O
             if (itemDO.getNum() < dto.getReturnNum()) {
                 throw new ServiceException("退貨的数量不能大于原订单的物品数量");
             }
-            itemDO.setReturnNum(dto.getReturnNum());
+            itemDO.setReturnNum(itemDO.getReturnNum()+dto.getReturnNum());
+            itemDO.setHasSaleAfter(true);
             orderItemManager.updateById(itemDO);
         }
 

+ 29 - 3
module-erp/src/main/java/com/hys/app/service/erp/impl/ProductManagerImpl.java

@@ -202,9 +202,6 @@ public class ProductManagerImpl extends BaseServiceImpl<ProductMapper, ProductDO
         List<ProductStockVO> bean = BeanUtils.toBean(listed, ProductStockVO.class);
         for (ProductStockVO vo : bean) {
             GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(vo.getGoodsId()), GoodsVO.class);
-            // 商品图标
-            List<GoodsGalleryDO> gallerySmallList = goodsGalleryManager.list(goodsVO.getId()+99);
-            goodsVO.setImageSmallList(gallerySmallList);
             vo.setGoodsVO(goodsVO);
             vo.setProductVO(BeanUtil.copyProperties(getById(vo.getProductId()), ProductVO.class));
         }
@@ -240,5 +237,34 @@ public class ProductManagerImpl extends BaseServiceImpl<ProductMapper, ProductDO
     public List<TransitVO> transitDetail(Long stockId) {
         return productStockMapper.transitDetail(stockId);
     }
+
+    @Override
+    public void updateSort(List<SortItem>  sortItem) {
+        if (sortItem.size() > 3 || sortItem.size() <2){
+            throw new ServiceException("参数错误");
+        }
+        Long beforeSort=0L;
+        Long afterSort=0L;
+        Optional<SortItem> before = sortItem.stream().filter(item -> "before".equals(item.getPosition())).findFirst();
+        Optional<SortItem> after = sortItem.stream().filter(item -> "after".equals(item.getPosition())).findFirst();
+        Optional<SortItem> own = sortItem.stream().filter(item -> "own".equals(item.getPosition())).findFirst();
+        if (before.isPresent()){
+            beforeSort=before.get().getSort();
+        }else {
+            beforeSort=after.get().getSort()-500000;
+        }
+        if (after.isPresent()){
+            afterSort=after.get().getSort();
+        }else {
+            afterSort=before.get().getSort()+500000;
+        }
+       Long randomNum= afterSort - beforeSort;
+        Random random = new Random(randomNum);
+        // 生成[min, max]范围内的随机数
+        ProductDO aDo = getById(own.get().getProductId());
+        aDo.setSort(beforeSort+random.nextInt());
+        updateById(aDo);
+    }
 }
 
+

+ 5 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/ProductStockManagerImpl.java

@@ -73,7 +73,11 @@ public class ProductStockManagerImpl extends BaseServiceImpl<ProductStockMapper,
      */
     @Override
     public List<ProductStockV1> selectList(ProductStockQueryParams request) {
-        return baseMapper.queryList(request);
+        List<ProductStockV1> productStockV1s = baseMapper.queryList(request);
+        for (ProductStockV1 productStockV1 : productStockV1s) {
+            productStockV1.setProductVO(productManager.getById(productStockV1.getProductId()));
+        }
+        return productStockV1s;
     }
 
     /**

+ 40 - 2
module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseEntryManagerImpl.java

@@ -499,12 +499,50 @@ public class WarehouseEntryManagerImpl extends BaseServiceImpl<WarehouseEntryMap
                 if (!first.isPresent()) {
                     throw new ServiceException("租赁订单返回的商品必须在租赁订单里面");
                 }
-                objects.add(first.get());
+                OrderItemDO orderItemDO = first.get();
+                orderItemDO.setHasReturn(true);
+                objects.add(orderItemDO);
             });
             //更改订单详情的是否返回 统计在途库存会用到
-            objects.forEach(item ->item.setHasReturn(true));
             orderItemManager.updateBatchById(objects);
         }
+
+        //如果是售后订单
+        if (WarehouseEntyrTypeEnum.SALE_AFTER.equals(warehouseEntryDTO.getType())) {
+            if (ObjectUtil.isNull(warehouseEntryDTO.getOrderId())) {
+                throw new ServiceException("售后退货:订单不能为空");
+            }
+            OrderDO aDo = orderManager.getById(warehouseEntryDTO.getOrderId());
+            if (ObjectUtil.isNull(aDo)) {
+                throw new ServiceException("订单不存在");
+            }
+            if (!SaleOrderStatusEnum.SALE_AFTER_ING.equals(aDo.getStatus()) &&
+                    !SaleOrderStatusEnum.SALE_AFTER_END.equals(aDo.getStatus()) &&
+                    !SaleOrderStatusEnum.SALE_AFTER_CANCEL.equals(aDo.getStatus()) ) {
+                throw new ServiceException("未发现该订单有退货记录");
+            }
+            List<OrderItemDO> list = orderItemManager.list(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, warehouseEntryDTO.getOrderId()));
+            List<OrderItemDO> objects = new ArrayList<>();
+            warehouseEntryDTO.getProductList().forEach(item -> {
+                if (ObjectUtil.isNull(item.getScanOrderItemId())) {
+                    throw new ServiceException("退货商品返回的商品必须在租赁订单里面");
+                }
+                Optional<OrderItemDO> first = list.stream().filter(it -> it.getId().equals(item.getScanOrderItemId())).findFirst();
+                if (!first.isPresent()) {
+                    throw new ServiceException("退货商品返回的商品必须在租赁订单里面");
+                }
+                OrderItemDO orderItemDO = first.get();
+                int allReturnNum= item.getNum()+orderItemDO.getHasReturnNum();
+             if (allReturnNum>orderItemDO.getReturnNum()){
+                 throw new ServiceException("退货数量不能大于脱货订单的数量");
+             }
+                orderItemDO.setHasReturnNum(item.getNum()+orderItemDO.getHasReturnNum());
+                objects.add(orderItemDO);
+            });
+            //更改订单详情的是否返回 统计在途库存会用到
+            orderItemManager.updateBatchById(objects);
+        }
+
         WarehouseDO warehouseDO = warehouseManager.getById(warehouseEntryDTO.getWarehouseId());
         if (warehouseDO == null) {
             throw new ServiceException("仓库不存在");

+ 1 - 3
module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseOutManagerImpl.java

@@ -183,7 +183,7 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
             List<GoodsSnDO> list = goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collect1));
             //更爱序列号状态
             for (GoodsSnDO aDo : list) {
-                aDo.setStatus(SnCodeStatusEnum.IN_WAREHOUSE);
+                aDo.setStatus(SnCodeStatusEnum.OUT_WAREHOUSE);
                 aDo.setOutHouseId(warehouseOutDO.getId());
             }
             goodsSnManager.updateBatchById(list);
@@ -421,8 +421,6 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
         Page<ProductStockVO> convert = productStockConverter.convert(page1);
         for (ProductStockVO record : convert.getRecords()) {
             GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(record.getGoodsId()), GoodsVO.class);
-            List<GoodsGalleryDO> gallerySmallList = goodsGalleryManager.list(goodsVO.getId() + 99);
-            goodsVO.setImageSmallList(gallerySmallList);
             record.setGoodsVO(goodsVO);
             record.setProductVO(BeanUtil.copyProperties(productManager.getById(record.getProductId()), ProductVO.class));
             record.setWarehouseVO(warehouseManager.getById(record.getWarehouseId()));

+ 1 - 0
module-erp/src/main/java/com/hys/app/service/kuaidiniao/KuaiDiNiaoServiceImpl.java

@@ -130,6 +130,7 @@ public class KuaiDiNiaoServiceImpl implements KuaiDiNiaoService {
             }
         } catch (Exception e) {
             e.printStackTrace();
+//            return "1234567899";
             throw new ServiceException("请求快递鸟发货异常,请联系客服");
         }
         return null;

+ 1 - 1
module-erp/src/main/resources/mapper/ProductStockMapper.xml

@@ -104,8 +104,8 @@
                 LEFT JOIN erp_order eo ON eoi.order_id = eo.id
         WHERE
             eoi.product_stock_id = #{stockId}
+            and eoi.has_return = 0
           AND eo.type = "TO_C"
-          AND `status` = "TO_BE_RETURN"
     </select>
 
 </mapper>

+ 1 - 1
server/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: erp-server
   profiles:
-    active: local
+    active: test
   jackson:
     property-naming-strategy: SNAKE_CASE
   servlet: