Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/java/org/rcisoft/bus/storegoodslog/controller/StoreGoodsLogController.java

@@ -121,6 +121,7 @@ public class StoreGoodsLogController extends CyPaginationController<StoreGoodsLo
         return getGridModelResponse();
     }
 
+    //@PreAuthorize("@cyPerm.hasPerm('sys:goodsLog:export')")
     @CyOpeLogAnno(title = "system-商品记录表管理-查询商品记录表", businessType = CyLogTypeEnum.EXPORT)
     @ApiOperation(value = "导出商品记录表信息", notes = "导出商品记录表信息")
     @GetMapping(value = "/export")

src/main/java/org/rcisoft/bus/storegoodslog/entity/StoreGoodsLog.java

 package org.rcisoft.bus.storegoodslog.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
 * Created with cy on 2024年5月29日 下午1:21:49.
@@ -16,7 +20,9 @@ import java.math.BigDecimal;
 public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
 
      private String ioType;
+     @Excel(name = "商品名称", orderNum = "1", width = 20)
      private String goodsName;
+     @Excel(name = "商品编码", orderNum = "2", width = 20)
      private String goodsCode;
      private Integer applyId;
      private Integer goodsCounts;
@@ -24,9 +30,11 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
      private Integer goodsId;
 
      @TableField(exist = false)
+     @Excel(name = "销售单号", orderNum = "3", width = 20)
      private String appCode;
 
      @TableField(exist = false)
+     @Excel(name = "门店", orderNum = "0", width = 20)
      private String storeName;
 
      @TableField(exist = false)
@@ -37,6 +45,7 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
       * @column original_price
       * @default
       */
+     @Excel(name = "原价", orderNum = "4", width = 20)
      private BigDecimal originalPrice;
 
      /**
@@ -44,6 +53,7 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
       * @column discount_price
       * @default
       */
+     @Excel(name = "折扣价", orderNum = "5", width = 20)
      private BigDecimal discountPrice;
 
      /**
@@ -51,6 +61,7 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
       * @column store_price
       * @default
       */
+     @Excel(name = "门店价", orderNum = "6", width = 20)
      private BigDecimal storePrice;
 
      /**
@@ -58,8 +69,19 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
       * @column total_price
       * @default
       */
+     @Excel(name = "总价", orderNum = "7", width = 20)
      private BigDecimal totalPrice;
 
+     /**
+      * @desc 销售日期
+      * @column update_date
+      * @default
+      */
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @Excel(name = "销售日期", orderNum = "8", width = 20, format = "yyyy-MM-dd")
+     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     private Date updateDate;
+
      /**
       * 销售开始时间
       */

src/main/resources/mapper/bus/storeGoodsLog/StoreGoodsLogMapper.xml

@@ -37,11 +37,19 @@
     </update>
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryWmsGoodsLogs" resultMap="BaseResultMap">
-        select * from store_goods_log
+        select *,dept_tb.dept_name as store_name,sga.app_code as app_code
+        from store_goods_log sgl
+        left join store_goods_apply sga on sgl.apply_id = sga.business_id
+        left join sys_dept as dept_tb on sga.store_id = dept_tb.business_id
         where 1=1
-        and del_flag = '0'
+        and sgl.del_flag = '0'
+        and sgl.io_type = '1'
+        and sgl.is_return = '0'
         <if test="entity.flag !=null and entity.flag != '' ">
-            and flag = #{entity.flag}
+            and sgl.flag = #{entity.flag}
+        </if>
+        <if test="entity.storeId !=null and entity.storeId != '' ">
+            and store_id = #{entity.storeId}
         </if>
         <if test="entity.ioType !=null and entity.ioType != '' ">
             and io_type = #{entity.ioType}
@@ -55,10 +63,16 @@
         <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
             and goods_code like concat('%',#{entity.goodsCode},'%')
         </if>
-        <if test="entity.applyId !=null and entity.applyId != '' ">
-            and apply_id = #{entity.applyId}
+        <if test="entity.appCode !=null and entity.appCode != '' ">
+            and app_code like concat('%',#{entity.appCode},'%')
+        </if>
+        <if test="entity.startTime !=null and entity.startTime != '' ">
+            and sgl.update_date &gt;=  #{entity.startTime}
         </if>
-        ORDER BY business_id DESC
+        <if test="entity.finishTime !=null and entity.finishTime != '' ">
+            and sgl.update_date &lt;=  DATE_ADD(#{entity.finishTime}, INTERVAL 1 DAY)
+        </if>
+        ORDER BY sgl.business_id DESC
     </select>
 
     <select id="queryWmsGoodsLogsPaged" resultMap="BaseResultMap">