添加库内箱号字段并更新到库存总账中

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/TWhgenleg.java

@@ -3,8 +3,6 @@ package com.ruoyi.reportManagement.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -211,6 +209,10 @@ public class TWhgenleg extends BaseEntity {
     @Excel(name = "原始入库日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fOriginalbilldate;
 
+    /** 库内箱号 */
+    @Excel(name = "库内箱号")
+    private String fLocalcntrno;
+
     /**
      * 查询时间区间
      */
@@ -534,6 +536,14 @@ public class TWhgenleg extends BaseEntity {
         this.timeEndBsdate = timeEndBsdate;
     }
 
+    public String getfLocalcntrno() {
+        return fLocalcntrno;
+    }
+
+    public void setfLocalcntrno(String fLocalcntrno) {
+        this.fLocalcntrno = fLocalcntrno;
+    }
+
     @Override
     public String toString() {
         return "TWhgenleg{" +
@@ -570,6 +580,7 @@ public class TWhgenleg extends BaseEntity {
                 ", fBusinessType=" + fBusinessType +
                 ", fMarks='" + fMarks + '\'' +
                 ", fOriginalbilldate=" + fOriginalbilldate +
+                ", fLocalcntrno='" + fLocalcntrno + '\'' +
                 ", orgStorageDate=" + orgStorageDate +
                 ", fLocation=" + fLocation +
                 ", isCntrno=" + isCntrno +

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -450,6 +450,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 原始单号
             tWhgenleg.setfOriginalbillno(warehouseBills.getfMblno());
         }
+        // 库内箱号
+        if (StringUtils.isNotEmpty(warehousebillsitems.getfLocalcntrno())) {
+            tWhgenleg.setfLocalcntrno(warehousebillsitems.getfLocalcntrno());
+        }
         // 明细类型
         tWhgenleg.setfBusinessType(warehousebillsitems.getfBusinessType());
         // 仓库

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -42,10 +42,14 @@
         <result property="remark" column="remark"/>
         <result property="fBusinessType" column="f_business_type"/>
         <result property="fOriginalbilldate" column="f_originalbilldate"/>
+        <result property="fLocalcntrno" column="f_localcntrno"/>
     </resultMap>
 
     <sql id="selectTWhgenlegVo">
-        select f_id, f_accyear, f_accmonth, f_corpid, f_mblno, f_originalbillno, f_warehouse_locationid, f_goodsid, f_trademodeid, f_preqty, f_pregrossweight, f_warehouseid, f_prenetweight, f_chargedate, f_volumnD, f_qtyD, f_billingway, f_grossweightD, f_netweightD, f_volumnC, f_qtyC, f_grossweightC, f_qtyblc, f_grossweightblc, f_netweightC, f_netweightblc, f_cntrno, f_status, del_flag, f_marks, create_by, create_time, update_by, f_volumnblc, update_time, remark, f_business_type, f_originalbilldate from t_whgenleg
+        select f_id, f_accyear, f_accmonth, f_corpid, f_mblno, f_originalbillno, f_warehouse_locationid, f_goodsid, f_trademodeid, f_preqty,
+         f_pregrossweight, f_warehouseid, f_prenetweight, f_chargedate, f_volumnD, f_qtyD, f_billingway, f_grossweightD, f_netweightD, f_volumnC,
+          f_qtyC, f_grossweightC, f_qtyblc, f_grossweightblc, f_netweightC, f_netweightblc, f_cntrno, f_status, del_flag, f_marks, create_by,
+           create_time, update_by, f_volumnblc, update_time, remark, f_business_type, f_originalbilldate, f_localcntrno from t_whgenleg
     </sql>
 
     <select id="selectTWhgenlegList" parameterType="TWhgenleg" resultMap="TWhgenlegResult">
@@ -143,6 +147,7 @@
             <if test="remark != null">remark,</if>
             <if test="fBusinessType != null">f_business_type,</if>
             <if test="fOriginalbilldate != null">f_originalbilldate,</if>
+            <if test="fLocalcntrno != null">f_localcntrno,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fAccyear != null">#{fAccyear},</if>
@@ -182,6 +187,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="fBusinessType != null">#{fBusinessType},</if>
             <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
+            <if test="fLocalcntrno != null">#{fLocalcntrno},</if>
         </trim>
     </insert>
 
@@ -225,6 +231,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="fBusinessType != null">f_business_type = #{fBusinessType},</if>
             <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
+            <if test="fLocalcntrno != null">f_localcntrno = #{fLocalcntrno},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -490,6 +497,7 @@
             leg.f_chargedate AS fChargedate,
             leg.f_grossweightblc AS fGrossweightblc,
             leg.f_netweightblc AS fNetweightblc,
+            leg.f_localcntrno AS fLocalcntrno,
             dict.dict_label AS fBusinessTypes,
             leg.f_marks AS fMarks,
             DATE_FORMAT( leg.create_time, '%Y-%m-%d' ) AS createTime,