出入库流水

bladex/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -40,7 +40,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos dev 地址
 	 */
-	String NACOS_DEV_ADDR = "127.0.0.1:8848";
+	String NACOS_DEV_ADDR = "36.134.91.96:8848";
 
 	/**
 	 * nacos prod 地址

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/stock/StockJournal.java

@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class StockJournal extends BaseEntity {
 
-
     /**
      * 出入库类型 0出库 1入库
      */
@@ -73,4 +72,40 @@ public class StockJournal extends BaseEntity {
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer delFlag;
+
+    /**
+     * 操作人名称
+     */
+    @TableField(exist = false)
+    private String createName;
+
+    /**
+     * 物品类型
+     */
+    @TableField(exist = false)
+    private String goodsType;
+
+    /**
+     * 物品名称
+     */
+    @TableField(exist = false)
+    private String goodsName;
+
+    /**
+     * 物品单位
+     */
+    @TableField(exist = false)
+    private String goodsUnit;
+
+    /**
+     * 物流单号
+     */
+    @TableField(exist = false)
+    private String logisticsInfoCode;
+
+    /**
+     * 仓库名称
+     */
+    @TableField(exist = false)
+    private String warehouseName;
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockJournalMapper.java

@@ -1,7 +1,10 @@
 package com.fjhx.mapper.stock;
 
-import com.fjhx.entity.stock.StockJournal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.stock.StockJournal;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StockJournalMapper extends BaseMapper<StockJournal> {
 
+    Page<StockJournal> getPage(@Param("page") Page<StockJournal> page, @Param("ew") IWrapper<StockJournal> wrapper);
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockJournalMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.mapper.stock.StockJournalMapper">
 
+    <select id="getPage" resultType="com.fjhx.entity.stock.StockJournal">
+        SELECT
+            t1.id,
+            t1.type,
+            t1.details_type,
+            t1.goods_id,
+            t1.warehouse_id,
+            t1.change_quantity,
+            t1.actual_quantity,
+            t1.is_in_stock,
+            t1.remarks,
+            t1.create_user,
+            t1.create_time,
+            t2.`type` goodsType,
+            t2.`name` goodsName,
+            t2.`unit` goodsUnit,
+            t3.logistics_info_code,
+            t4.`name` warehouseName
+        FROM
+            stock_journal t1
+            LEFT JOIN product_info t2 ON t1.goods_id = t2.id
+            LEFT JOIN logistics_details t3 ON t1.business_id = t3.id
+            LEFT JOIN warehouse t4 on t1.warehouse_id = t4.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockJournalServiceImpl.java

@@ -1,14 +1,14 @@
 package com.fjhx.service.stock.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.stock.StockJournal;
 import com.fjhx.mapper.stock.StockJournalMapper;
 import com.fjhx.params.stock.StockJournalVo;
 import com.fjhx.service.stock.StockJournalService;
-import com.fjhx.utils.WrapperUtil;
+import com.fjhx.utils.UserClientUtil;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,12 +28,26 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
     @Override
     public Page<StockJournal> getPage(Map<String, String> condition) {
 
-        QueryWrapper<StockJournal> wrapper = Wrappers.query();
+        IWrapper<StockJournal> wrapper = IWrapper.getWrapper(condition);
+        wrapper.eq("t1", StockJournal::getWarehouseId)
+                .eq("t1", StockJournal::getType)
+                .eq("t1", StockJournal::getDetailsType)
+                .ge("t1", StockJournal::getCreateTime, condition.get("startTime"))
+                .le("t1", StockJournal::getCreateTime, condition.get("endTime"))
+                .apply(Func.isNotEmpty(condition.get("logisticsInfoCode")), "instr(t3.logistics_info_code, '" + condition.get("logisticsInfoCode") + "') > 0")
+                .orderByDesc("t1", StockJournal::getId);
 
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
+        Page<StockJournal> page = baseMapper.getPage(createPage(condition), wrapper);
+        if (Func.isNotEmpty(page.getRecords())) {
+            //操作人名称map
+            Map<Long, String> userNameMap = UserClientUtil.getUserNameMap(page.getRecords(), StockJournal::getCreateUser);
 
-        Page<StockJournal> page = page(condition, wrapper);
+            for (StockJournal record : page.getRecords()) {
+                if (Func.isNotEmpty(userNameMap) && Func.isNotEmpty(userNameMap.get(record.getCreateUser()))) {
+                    record.setCreateName(userNameMap.get(record.getCreateUser()));
+                }
+            }
+        }
         return page;
     }