修改发货明细

src/main/java/org/rcisoft/bus/custrecharge/service/impl/CustRechargeServiceImpl.java

@@ -57,8 +57,8 @@ public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository,
     @Override
     public CyPersistModel persist(CustRecharge custRecharge){
 
+        custRecharge.setStoreId(CyUserUtil.getAuthenDept());
         if(custRecharge.getOrderNumber() != null){
-            custRecharge.setStoreId(CyUserUtil.getAuthenDept());
             //根据id修改余额
             CustInfo custInfo = custInfoServiceImpl.findById(custRecharge.getCustomerId());
             BigDecimal newBalance = custInfo.getCustomerBalance().subtract(custRecharge.getConsumptionAmount());

src/main/java/org/rcisoft/bus/wmsgoodslog/entity/WmsGoodsLog.java

 package org.rcisoft.bus.wmsgoodslog.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;
 
@@ -18,5 +20,33 @@ public class WmsGoodsLog  extends CyIdIncreEntity<WmsGoodsLog> {
      private Integer goodsCounts;
      private Integer updateCounts;
      private Integer goodsId;
+     @TableField(exist = false)
+     private String goodsArtNumber;
+     @TableField(exist = false)
+     private String goodsStyle;
+     @TableField(exist = false)
+     private String goodsNorms;
+     @TableField(exist = false)
+     private String goodsSize;
+     @TableField(exist = false)
+     private String goodsBrand;
+     @TableField(exist = false)
+     private String outGoods;
+
+     @JsonIgnore
+     @TableField(exist = false)
+     private String beginTime;
+
+     @JsonIgnore
+     @TableField(exist = false)
+     private String endTime;
+     
+     @JsonIgnore
+     @TableField(exist = false)
+     private String maxNum;
+
+     @JsonIgnore
+     @TableField(exist = false)
+     private String minNum;
 }
 

src/main/resources/mapper/bus/wmsGoodsLog/WmsGoodsLogMapper.xml

@@ -53,24 +53,64 @@
     </select>
 
     <select id="queryWmsGoodsLogsPaged" resultMap="BaseResultMap">
-        select * from wms_goods_log
+        select * ,
+        wg.goods_art_number as goods_art_number,
+        wg.goods_brand as goods_brand,
+        wg.goods_style as goods_style,
+        wg.goods_norms as goods_norms,
+        wg.goods_size as goods_size,
+        wga.out_goods as out_goods
+        from wms_goods_log wgl
+        left join wms_goods wg on wgl.goods_id = wg.business_id
+        left join wms_goods_apply wga on wgl.apply_id = wga.business_id
         where 1=1
-            and del_flag = '0'
+            and wgl.del_flag = '0'
+            and wgl.io_type = '1'
             <if test="entity.flag !=null and entity.flag != '' ">
-                and flag = #{entity.flag}
+                and wgl.flag = #{entity.flag}
             </if>
             <if test="entity.ioType !=null and entity.ioType != '' ">
-                and io_type = #{entity.ioType}
+                and wgl.io_type = #{entity.ioType}
             </if>
             <if test="entity.goodsId !=null and entity.goodsId != '' ">
                 and goods_id = #{entity.goodsId}
             </if>
             <if test="entity.goodsName !=null and entity.goodsName != '' ">
-                and goods_name like concat('%',#{entity.goodsName},'%')
+                and wgl.goods_name like concat('%',#{entity.goodsName},'%')
             </if>
             <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
-                and goods_code like concat('%',#{entity.goodsCode},'%')
+                and wgl.goods_code like concat('%',#{entity.goodsCode},'%')
             </if>
-        ORDER BY business_id DESC
+            <if test="entity.outGoods !=null and entity.outGoods != '' ">
+                and wga.out_goods = #{entity.outGoods}
+            </if>
+            <if test="entity.goodsArtNumber !=null and entity.goodsArtNumber != '' ">
+                and wg.goods_art_number = #{entity.goodsArtNumber}
+            </if>
+            <if test="entity.goodsBrand !=null and entity.goodsBrand != '' ">
+                and wg.goods_brand = #{entity.goodsBrand}
+            </if>
+            <if test="entity.goodsStyle !=null and entity.goodsStyle != '' ">
+                and wg.goods_style = #{entity.goodsStyle}
+            </if>
+            <if test="entity.goodsNorms !=null and entity.goodsNorms != '' ">
+                and wg.goods_norms = #{entity.goodsNorms}
+            </if>
+            <if test="entity.goodsSize !=null and entity.goodsSize != '' ">
+                and wg.goods_size = #{entity.goodsSize}
+            </if>
+            <if test="entity.beginTime !=null and entity.beginTime != '' ">
+                and wgl.create_date &gt;=  #{entity.beginTime}
+            </if>
+            <if test="entity.endTime !=null and entity.endTime != '' ">
+                and wgl.create_date &lt;=   DATE_ADD(#{entity.endTime}, INTERVAL 1 DAY)
+            </if>
+            <if test="entity.maxNum !=null and entity.maxNum != '' ">
+                and wgl.goods_counts &lt;=  #{entity.maxNum}
+            </if>
+            <if test="entity.minNum !=null and entity.minNum != '' ">
+                and wgl.goods_counts &gt;=  #{entity.minNum}
+            </if>
+        ORDER BY wgl.business_id DESC
     </select>
 </mapper>