完善出库

src/main/java/org/rcisoft/bus/storegoodsapply/dto/AddStoreGoodsApplyDTO.java

@@ -3,6 +3,7 @@ package org.rcisoft.bus.storegoodsapply.dto;
 import lombok.Data;
 import org.rcisoft.bus.wmsgoods.entity.WmsGoods;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -23,5 +24,41 @@ public class AddStoreGoodsApplyDTO {
     private  String goodsNumber;
 
     private String remarks;
+
+    private String storeId;
+    /**
+     * @desc 原价
+     * @column original_price
+     * @default
+     */
+    private BigDecimal originalPrice;
+
+    /**
+     * @desc 折扣价
+     * @column discount_price
+     * @default
+     */
+    private BigDecimal discountPrice;
+
+    /**
+     * @desc 门店价
+     * @column store_price
+     * @default
+     */
+    private BigDecimal storePrice;
+
+    /**
+     * @desc 总价
+     * @column total_price
+     * @default
+     */
+    private BigDecimal totalOutPrice;
+
+    /**
+     * @desc 销售备注
+     * @column sales_categories
+     * @default
+     */
+    private BigDecimal salesCategories;
 }
 

src/main/java/org/rcisoft/bus/storegoodsapply/entity/StoreGoodsApply.java

@@ -137,7 +137,7 @@ public class StoreGoodsApply extends CyIdIncreEntity<StoreGoodsApply> {
       * @column total_price
       * @default
       */
-     private BigDecimal totalPrice;
+     private BigDecimal totalOutPrice;
 
      /**
       * @desc 销售备注

src/main/java/org/rcisoft/bus/storegoodsapply/service/impl/StoreGoodsApplyServiceImpl.java

@@ -168,6 +168,10 @@ public class StoreGoodsApplyServiceImpl extends ServiceImpl<StoreGoodsApplyRepos
             log.setGoodsCounts(box.getOutCounts());
             log.setIoType("1");
             log.setUpdateCounts(goodsStock.getGoodsCounts());
+            log.setStorePrice(box.getStorePrice());
+            log.setTotalPrice(box.getTotalPrice());
+            log.setOriginalPrice(box.getOriginalPrice());
+            log.setDiscountPrice(box.getDiscountPrice());
             logList.add(log);
         }
         // 批量插入日志

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;
 
+import java.math.BigDecimal;
+
 /**
 * Created with cy on 2024年5月29日 下午1:21:49.
 */
@@ -18,5 +20,33 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
      private Integer goodsCounts;
      private Integer updateCounts;
      private Integer goodsId;
+     private String storeId;
+     /**
+      * @desc 原价
+      * @column original_price
+      * @default
+      */
+     private BigDecimal originalPrice;
+
+     /**
+      * @desc 折扣价
+      * @column discount_price
+      * @default
+      */
+     private BigDecimal discountPrice;
+
+     /**
+      * @desc 门店价
+      * @column store_price
+      * @default
+      */
+     private BigDecimal storePrice;
+
+     /**
+      * @desc 总价
+      * @column total_price
+      * @default
+      */
+     private BigDecimal totalPrice;
 }
 

src/main/java/org/rcisoft/bus/wmsgoods/entity/WmsGoods.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import org.rcisoft.core.entity.CyIdIncreEntity;
 import org.rcisoft.sys.ossInfo.entity.OssInfo;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -129,5 +130,43 @@ public class WmsGoods  extends CyIdIncreEntity<WmsGoods> {
      // = 查询
      @TableField(exist = false)
      private String actualGoodsCode;
+
+     @TableField(exist = false)
+     private Integer logId;
+
+     @TableField(exist = false)
+     private Integer applyId;
+
+     /**
+      * @desc 原价
+      * @column original_price
+      * @default
+      */
+     @TableField(exist = false)
+     private BigDecimal originalPrice;
+
+     /**
+      * @desc 折扣价
+      * @column discount_price
+      * @default
+      */
+     @TableField(exist = false)
+     private BigDecimal discountPrice;
+
+     /**
+      * @desc 门店价
+      * @column store_price
+      * @default
+      */
+     @TableField(exist = false)
+     private BigDecimal storePrice;
+
+     /**
+      * @desc 总价
+      * @column total_price
+      * @default
+      */
+     @TableField(exist = false)
+     private BigDecimal totalPrice;
 }
 

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

@@ -20,10 +20,14 @@
     </resultMap>
     <insert id="batchPersist" parameterType="java.util.List">
         insert into
-        store_goods_log(flag,del_flag,create_by,create_date,update_by,update_date,io_type,goods_name,goods_id,goods_code,apply_id,goods_counts,update_counts)
+        store_goods_log(flag,del_flag,create_by,create_date,update_by,update_date,io_type,
+                        goods_name,goods_id,goods_code,apply_id,goods_counts,update_counts,
+                        original_price,discount_price,store_price,total_price)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.flag},#{item.delFlag},#{item.createBy},#{item.createDate},#{item.updateBy},#{item.updateDate},#{item.ioType},#{item.goodsName},#{item.goodsId},#{item.goodsCode},#{item.applyId},#{item.goodsCounts},#{item.updateCounts})
+            (#{item.flag},#{item.delFlag},#{item.createBy},#{item.createDate},#{item.updateBy},#{item.updateDate},#{item.ioType},
+             #{item.goodsName},#{item.goodsId},#{item.goodsCode},#{item.applyId},#{item.goodsCounts},#{item.updateCounts},
+             #{item.originalPrice},#{item.discountPrice},#{item.storePrice},#{item.totalPrice})
         </foreach>
     </insert>
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->

src/main/resources/mapper/bus/wmsGoods/WmsGoodsMapper.xml

@@ -220,7 +220,13 @@
                sdd_goods_style.dict_label AS goods_style,
                sdd_goods_colour.dict_label AS goods_colour,
                sdd_goods_norms.dict_label AS goods_norms,
-               sdd_goods_size.dict_label AS goods_size
+               sdd_goods_size.dict_label AS goods_size,
+               log.business_id as log_id,
+               log.apply_id as apply_id,
+               log.store_price as store_price,
+               log.discount_price as discount_price,
+               log.original_price as original_price,
+               log.total_price as total_price
         FROM store_goods_log log
                  LEFT JOIN wms_goods wg ON log.goods_id = wg.business_id
                  LEFT JOIN
@@ -249,6 +255,7 @@
                                                                                          wg.goods_size AND sdd_goods_size.del_flag = '0'
 
         where log.apply_id = #{entity.businessId}
+        and log.del_flag = '0'
 
     </select>
     <select id="findByIdGoods" resultMap="BaseResultMap">