订单同步表

sd-business/src/main/java/com/sd/business/controller/in/InOutStorageBomController.java

@@ -1,8 +1,21 @@
 package com.sd.business.controller.in;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
+import com.sd.business.entity.in.vo.InOutStorageBomExportVo;
+import com.sd.business.entity.in.vo.InOutStorageBomVo;
+import com.sd.business.service.in.InOutStorageBomService;
+import com.sd.framework.util.excel.util.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 
 /**
  * <p>
@@ -16,5 +29,26 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/inOutStorageBom")
 public class InOutStorageBomController {
 
+    @Autowired
+    private InOutStorageBomService inOutStorageBomService;
+
+    /**
+     * 出入库bom分页
+     */
+    @PostMapping("/page")
+    public Page<InOutStorageBomVo> page(@RequestBody InOutStorageBomSelectDto dto) {
+        return inOutStorageBomService.getPage(dto);
+    }
+
+    /**
+     * 出入库bom流水导出
+     */
+    @PostMapping("/exportExcelSummary")
+    public void exportExcelSummary(HttpServletResponse response, @RequestBody InOutStorageBomSelectDto dto) {
+        dto.setSearchAll(true);
+        Page<InOutStorageBomVo> page = inOutStorageBomService.getPage(dto);
+        List<InOutStorageBomExportVo> exportList = BeanUtil.copyToList(page.getRecords(), InOutStorageBomExportVo.class);
+        ExcelUtil.export(response, "出入库流水表", "导出数据", exportList, InOutStorageBomExportVo.class);
+    }
 
 }

sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageBomSelectDto.java

@@ -14,4 +14,46 @@ import lombok.Setter;
 @Setter
 public class InOutStorageBomSelectDto extends BaseSelectDto {
 
+
+    /**
+     * 出入库单号
+     */
+    private String code;
+
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 产品规格品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * 产品规格品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 类型 1入库 0出库
+     */
+    private Integer type;
+
+    /**
+     * 出入库明细
+     */
+    private Integer detailType;
+
+
 }

sd-business/src/main/java/com/sd/business/entity/in/vo/InOutStorageBomExportVo.java

@@ -0,0 +1,113 @@
+package com.sd.business.entity.in.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.sd.business.entity.in.emums.InDetailTypeEnum;
+import com.sd.business.entity.in.emums.OutDetailTypeEnum;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 出入库流水导出实体
+ *
+ * @author
+ * @since 2023-10-08
+ */
+@Getter
+@Setter
+@ExcelIgnoreUnannotated
+public class InOutStorageBomExportVo {
+    /**
+     * 出入库单号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "出入库单号", index = 0)
+    private String code;
+
+    /**
+     * 事业部名称
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "归属事业部", index = 1)
+    private String departmentName;
+
+    /**
+     * 仓库名称
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "仓库", index = 2)
+    private String warehouseName;
+
+    /**
+     * 类型 1入库 0出库
+     */
+    private Integer type;
+
+    /**
+     * 出入库明细
+     */
+    private Integer detailType;
+
+    /**
+     * 出入库明细类型值
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "出入库类型", index = 3)
+    private String detailTypeValue;
+
+    /**
+     * 产品规格品号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "品号", index = 4)
+    private String bomSpecCode;
+
+    /**
+     * 产品规格品名
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "品名", index = 5)
+    private String bomSpecName;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty(value = "数量", index = 6)
+    private BigDecimal quantity;
+
+    /**
+     * 结存库存数量
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "库存数量", index = 7)
+    private BigDecimal balanceInventoryQuantity;
+
+    /**
+     * 出入库时间
+     */
+    @ColumnWidth(20)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelProperty(value = "操作时间", index = 8)
+    private Date inOutStorageTime;
+
+    /**
+     * 申请人
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "操作人", index = 9)
+    private String applicant;
+
+
+    public String getDetailTypeValue() {
+        if (Objects.equals(type, 1)) {
+            return InDetailTypeEnum.getInDetailType(detailType).getValue();
+        }
+        return OutDetailTypeEnum.getOutDetailType(detailType).getValue();
+    }
+}

sd-business/src/main/java/com/sd/business/entity/in/vo/InOutStorageBomVo.java

@@ -4,6 +4,8 @@ import com.sd.business.entity.in.po.InOutStorageBom;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 出入库bom列表查询返回值实体
  *
@@ -14,4 +16,74 @@ import lombok.Setter;
 @Setter
 public class InOutStorageBomVo extends InOutStorageBom {
 
+    /**
+     * 类型 1入库 0出库
+     */
+    private Integer type;
+
+    /**
+     * 出入库明细
+     */
+    private Integer detailType;
+
+    /**
+     * 出入库单号
+     */
+    private String code;
+
+    /**
+     * 申请人
+     */
+    private String applicant;
+
+    /**
+     * 仓库类型 字典:warehouse_type
+     */
+    private String warehouseType;
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+    /**
+     * 仓库编号
+     */
+    private String warehouseCode;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+    /**
+     * 事业部名称
+     */
+    private String departmentName;
+
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 产品规格品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * 产品规格品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 出入库时间
+     */
+    private Date inOutStorageTime;
+
 }

sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventoryFinishedOrderSelectDto.java

@@ -14,4 +14,44 @@ import lombok.Setter;
 @Setter
 public class InventoryFinishedOrderSelectDto extends BaseSelectDto {
 
+    /**
+     * sku规格品名
+     */
+    private String skuSpecId;
+
+    /**
+     * sku规格品号
+     */
+    private String skuSpecCode;
+
+    /**
+     * sku规格品名
+     */
+    private String skuSpecName;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 订单万里牛编号
+     */
+    private String orderWlnCode;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+    /**
+     * 出入库单号
+     */
+    private String code;
+
 }

sd-business/src/main/java/com/sd/business/entity/inventory/po/InventoryFinishedOrder.java

@@ -1,5 +1,6 @@
 package com.sd.business.entity.inventory.po;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
@@ -43,6 +44,7 @@ public class InventoryFinishedOrder extends BasePo {
     /**
      * 数量
      */
+    @ExcelProperty(value = "数量", index = 3)
     private BigDecimal quantity;
 
     /**

sd-business/src/main/java/com/sd/business/entity/inventory/vo/InventoryFinishedOrderVo.java

@@ -1,9 +1,13 @@
 package com.sd.business.entity.inventory.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.sd.business.entity.inventory.po.InventoryFinishedOrder;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 成品仓库订单列表查询返回值实体
  *
@@ -12,6 +16,62 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ExcelIgnoreUnannotated
 public class InventoryFinishedOrderVo extends InventoryFinishedOrder {
 
+    /**
+     * sku规格品号
+     */
+    @ExcelProperty(value = "sku品号", index = 1)
+    private String skuSpecCode;
+
+    /**
+     * sku规格品名
+     */
+    @ExcelProperty(value = "sku品名", index = 2)
+    private String skuSpecName;
+
+    /**
+     * 订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    private String orderCode;
+
+    /**
+     * 万里牛订单号
+     */
+    @ExcelProperty(value = "万里牛单号", index = 5)
+    private String orderWlnCode;
+
+    /**
+     * 事业部名称
+     */
+    @ExcelProperty(value = "事业部", index = 6)
+    private String departmentName;
+
+    /**
+     * 操作类型 1入库 2出库
+     */
+    private Integer operationType;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "时间", index = 7)
+    private Date createTime;
+
+
+    /**
+     * 操作类型
+     */
+    @ExcelProperty(value = "状态", index = 8)
+    private String operationTypeStr;
+
+    /**
+     * 单号
+     */
+    @ExcelProperty(value = "出入库单号", index = 0)
+    private String code;
+
+
 }

sd-business/src/main/java/com/sd/business/service/in/InOutStorageBomService.java

@@ -1,7 +1,10 @@
 package com.sd.business.service.in;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
 import com.sd.business.entity.in.po.InOutStorageBom;
+import com.sd.business.entity.in.vo.InOutStorageBomVo;
 
 
 /**
@@ -14,4 +17,9 @@ import com.sd.business.entity.in.po.InOutStorageBom;
  */
 public interface InOutStorageBomService extends BaseService<InOutStorageBom> {
 
+    /**
+     * 出入库bom分页
+     */
+    Page<InOutStorageBomVo> getPage(InOutStorageBomSelectDto dto);
+
 }

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -1,11 +1,22 @@
 package com.sd.business.service.in.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.department.po.Department;
+import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
+import com.sd.business.entity.in.po.InOutStorage;
 import com.sd.business.entity.in.po.InOutStorageBom;
+import com.sd.business.entity.in.vo.InOutStorageBomVo;
+import com.sd.business.entity.purchase.po.Purchase;
+import com.sd.business.entity.warehouse.po.Warehouse;
 import com.sd.business.mapper.in.InOutStorageBomMapper;
 import com.sd.business.service.in.InOutStorageBomService;
+import com.sd.framework.util.sql.Sql;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -18,4 +29,60 @@ import org.springframework.stereotype.Service;
 @Service
 public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMapper, InOutStorageBom> implements InOutStorageBomService {
 
+    @Override
+    public Page<InOutStorageBomVo> getPage(InOutStorageBomSelectDto dto) {
+
+        Page<InOutStorageBomVo> page = Sql.create(InOutStorageBomVo.class)
+                .selectAll(InOutStorageBom.class)
+                .select(InOutStorage::getInOutStorageTime,
+                        InOutStorage::getDepartmentId,
+                        InOutStorage::getType,
+                        InOutStorage::getDetailType,
+                        InOutStorage::getCode,
+                        InOutStorage::getApplicant,
+                        InOutStorage::getRemark)
+                .selectAs(BomSpec::getCode, InOutStorageBomVo::getBomSpecCode)
+                .selectAs(BomSpec::getName, InOutStorageBomVo::getBomSpecName)
+                .selectAs(Warehouse::getType, InOutStorageBomVo::getWarehouseType)
+                .selectAs(Warehouse::getName, InOutStorageBomVo::getWarehouseName)
+                .selectAs(Warehouse::getCode, InOutStorageBomVo::getWarehouseCode)
+                .selectAs(Department::getName, InOutStorageBomVo::getDepartmentName)
+                .selectAs(Purchase::getCode, InOutStorageBomVo::getPurchaseCode)
+
+                .from(InOutStorageBom.class)
+                .leftJoin(InOutStorage.class, InOutStorage::getId, InOutStorageBom::getInOutStorageId)
+                .leftJoin(BomSpec.class, BomSpec::getId, InOutStorageBom::getBomSpecId)
+                .leftJoin(Warehouse.class, Warehouse::getId, InOutStorage::getWarehouseId)
+                .leftJoin(Department.class, Department::getId, InOutStorage::getDepartmentId)
+                .leftJoin(Purchase.class, Purchase::getId, InOutStorage::getPurchaseId)
+
+                .orderByDesc(InOutStorageBom::getId)
+                .like(InOutStorage::getCode, dto.getCode())
+                .eq(InOutStorage::getDepartmentId, dto.getDepartmentId())
+                .eq(InOutStorage::getType, dto.getType())
+                .eq(InOutStorage::getDetailType, dto.getDetailType())
+                .ge(InOutStorage::getInOutStorageTime, dto.getBeginTime())
+                .le(InOutStorage::getInOutStorageTime, dto.getEndTime())
+                .like(BomSpec::getCode, dto.getBomSpecCode())
+                .like(BomSpec::getName, dto.getBomSpecName())
+                .notIn(BomSpec::getCode, "40904003", "409001", "40101010") // 筛选吊牌、不干胶、彩纸出入库记录
+                .like(Purchase::getCode, dto.getPurchaseCode())
+                .eq(Warehouse::getId, dto.getWarehouseId())
+
+                .page(dto);
+
+        List<InOutStorageBomVo> records = page.getRecords();
+        if (records.isEmpty()) {
+            return page;
+        }
+
+        records.forEach(item -> {
+            if (item.getDepartmentId() == 0L) {
+                item.setDepartmentName("胜德体育");
+            }
+        });
+
+        return page;
+    }
+
 }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryFinishedOrderServiceImpl.java

@@ -3,14 +3,18 @@ package com.sd.business.service.inventory.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.StatusConstant;
+import com.ruoyi.common.core.domain.BaseIdPo;
 import com.sd.business.entity.department.constant.DepartmentConstant;
+import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.inventory.dto.InventoryFinishedOrderDto;
 import com.sd.business.entity.inventory.dto.InventoryFinishedOrderSelectDto;
 import com.sd.business.entity.inventory.enums.FinishedOperationTypeEnum;
 import com.sd.business.entity.inventory.po.InventoryFinishedOrder;
 import com.sd.business.entity.inventory.po.InventoryFinishedOrderDetail;
 import com.sd.business.entity.inventory.vo.InventoryFinishedOrderVo;
+import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.po.OrderSku;
+import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.mapper.inventory.InventoryFinishedOrderMapper;
 import com.sd.business.service.inventory.InventoryFinishedOrderDetailService;
 import com.sd.business.service.inventory.InventoryFinishedOrderService;
@@ -41,9 +45,31 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
     public Page<InventoryFinishedOrderVo> getPage(InventoryFinishedOrderSelectDto dto) {
 
         Page<InventoryFinishedOrderVo> page = Sql.create(InventoryFinishedOrderVo.class)
-                .selectAll(InventoryFinishedOrder.class)
-                .from(InventoryFinishedOrder.class)
-                .orderByDesc(InventoryFinishedOrder::getId)
+                .select(InventoryFinishedOrderDetail::getQuantity,
+                        InventoryFinishedOrderDetail::getCreateTime,
+                        InventoryFinishedOrderDetail::getOperationType,
+                        InventoryFinishedOrderDetail::getCode)
+                .selectAs(SkuSpec::getCode, InventoryFinishedOrderVo::getSkuSpecCode)
+                .selectAs(SkuSpec::getName, InventoryFinishedOrderVo::getSkuSpecName)
+                .selectAs(OrderInfo::getCode, InventoryFinishedOrderVo::getOrderCode)
+                .selectAs(OrderInfo::getWlnCode, InventoryFinishedOrderVo::getOrderWlnCode)
+                .selectAs(Department::getName, InventoryFinishedOrderVo::getDepartmentName)
+
+                .from(InventoryFinishedOrderDetail.class)
+                .leftJoin(SkuSpec.class, SkuSpec::getId, InventoryFinishedOrderDetail::getSkuSpecId)
+                .leftJoin(OrderInfo.class, BaseIdPo::getId, InventoryFinishedOrderDetail::getOrderInfoId)
+                .leftJoin(Department.class, Department::getId, OrderInfo::getDepartmentId)
+
+                .orderByDesc(InventoryFinishedOrderDetail::getId)
+                .like(InventoryFinishedOrderDetail::getCode, dto.getCode())
+                .eq(SkuSpec::getId, dto.getSkuSpecId())
+                .like(SkuSpec::getCode, dto.getSkuSpecCode())
+                .like(SkuSpec::getName, dto.getSkuSpecName())
+                .eq(OrderInfo::getId, dto.getOrderId())
+                .like(OrderInfo::getCode, dto.getOrderCode())
+                .like(OrderInfo::getWlnCode, dto.getOrderWlnCode())
+
+                .eq("d", Department::getId, dto.getDepartmentId())
                 .page(dto);
 
         return page;

sd-framework/src/main/java/com/sd/framework/util/sql/From.java

@@ -31,6 +31,24 @@ public class From<T> extends Where<T> {
         return this;
     }
 
+    public <K, V> From<T> leftJoin(Class<K> cls1, SFunction<V, ?> on2) {
+        return leftJoin(sql.getTableAlias(cls1), cls1, sql.getTableAlias(on2), on2);
+    }
+
+    public <K, V> From<T> leftJoin(Class<K> cls1, String as2, SFunction<V, ?> on2) {
+        return leftJoin(sql.getTableAlias(cls1), cls1, as2, on2);
+    }
+
+    public <K, V> From<T> leftJoin(String as1, Class<K> cls1, SFunction<V, ?> on2) {
+        return leftJoin(as1, cls1, sql.getTableAlias(on2), on2);
+    }
+
+    public <K, V> From<T> leftJoin(String as1, Class<K> cls1, String as2, SFunction<V, ?> on2) {
+        sql.fromList.add(" LEFT JOIN " + Sql.getTableName(cls1) + StringPool.SPACE + as1 + " ON " +
+                as1 + ".id = " + sql.getSqlFieldName(as2, on2));
+        return this;
+    }
+
     public <K, V> From<T> rightJoin(Class<K> cls1, SFunction<K, ?> on1, SFunction<V, ?> on2) {
         return rightJoin(sql.getTableAlias(cls1), cls1, on1, sql.getTableAlias(on2), on2);
     }
@@ -49,6 +67,24 @@ public class From<T> extends Where<T> {
         return this;
     }
 
+    public <K, V> From<T> rightJoin(Class<K> cls1, SFunction<V, ?> on2) {
+        return rightJoin(sql.getTableAlias(cls1), cls1, sql.getTableAlias(on2), on2);
+    }
+
+    public <K, V> From<T> rightJoin(Class<K> cls1, String as2, SFunction<V, ?> on2) {
+        return rightJoin(sql.getTableAlias(cls1), cls1, as2, on2);
+    }
+
+    public <K, V> From<T> rightJoin(String as1, Class<K> cls1, SFunction<V, ?> on2) {
+        return rightJoin(as1, cls1, sql.getTableAlias(on2), on2);
+    }
+
+    public <K, V> From<T> rightJoin(String as1, Class<K> cls1, String as2, SFunction<V, ?> on2) {
+        sql.fromList.add(" RIGHT JOIN " + Sql.getTableName(cls1) + StringPool.SPACE + as1 + " ON " +
+                as1 + ".id = " + sql.getSqlFieldName(as2, on2));
+        return this;
+    }
+
     public <K, V> From<T> innerJoin(Class<K> cls1, SFunction<K, ?> on1, SFunction<V, ?> on2) {
         return innerJoin(sql.getTableAlias(cls1), cls1, on1, sql.getTableAlias(on2), on2);
     }
@@ -67,4 +103,22 @@ public class From<T> extends Where<T> {
         return this;
     }
 
+    public <K, V> From<T> innerJoin(Class<K> cls1, SFunction<V, ?> on2) {
+        return innerJoin(sql.getTableAlias(cls1), cls1, sql.getTableAlias(on2), on2);
+    }
+
+    public <K, V> From<T> innerJoin(Class<K> cls1, String as2, SFunction<V, ?> on2) {
+        return innerJoin(sql.getTableAlias(cls1), cls1, as2, on2);
+    }
+
+    public <K, V> From<T> innerJoin(String as1, Class<K> cls1, SFunction<V, ?> on2) {
+        return innerJoin(as1, cls1, sql.getTableAlias(on2), on2);
+    }
+
+    public <K, V> From<T> innerJoin(String as1, Class<K> cls1, String as2, SFunction<V, ?> on2) {
+        sql.fromList.add(" INNER JOIN " + Sql.getTableName(cls1) + StringPool.SPACE + as1 + " ON " +
+                as1 + ".id = " + sql.getSqlFieldName(as2, on2));
+        return this;
+    }
+
 }

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -104,7 +104,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             List<JSONObject> wlnOrderList = getWlnOrderList(warehouseCode);
 
             // 万里牛订单数量若为0，结束同步任务
-            if (ObjectUtil.isEmpty(wlnOrderList)) {
+            if (wlnOrderList.isEmpty()) {
                 continue;
             }