1.为商品数据增加账册号、账册序号、商品编码、申报单位、法定单位字段以及功能

2.更改单票分析结余件数、结余毛重逻辑

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TGoods.java

@@ -74,6 +74,31 @@ public class TGoods extends BaseEntity {
     @Excel(name = "包装类型，存储id 显示名称 下拉选择类型，一个商品名称对应一个包装类型，对应t_package的f_id")
     private Long fPackageid;
 
+    /**
+     * 账册号
+     */
+    private String fEmsNo;
+
+    /**
+     * 账册序号
+     */
+    private String fEmsSeqNo;
+
+    /**
+     * 商品编码
+     */
+    private String fGoodsTs;
+
+    /**
+     * 申报单位（申报计量单位）
+     */
+    private String fWmsDclUnit;
+
+    /**
+     * 法定单位（法定计量单位）
+     */
+    private String fWmsLawUnit;
+
     /** 是否按箱号统计 */
     @Excel(name = "是否按箱号统计")
     private String ifCntrno;
@@ -98,6 +123,46 @@ public class TGoods extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    public String getfGoodsTs() {
+        return fGoodsTs;
+    }
+
+    public void setfGoodsTs(String fGoodsTs) {
+        this.fGoodsTs = fGoodsTs;
+    }
+
+    public String getfEmsNo() {
+        return fEmsNo;
+    }
+
+    public void setfEmsNo(String fEmsNo) {
+        this.fEmsNo = fEmsNo;
+    }
+
+    public String getfEmsSeqNo() {
+        return fEmsSeqNo;
+    }
+
+    public void setfEmsSeqNo(String fEmsSeqNo) {
+        this.fEmsSeqNo = fEmsSeqNo;
+    }
+
+    public String getfWmsDclUnit() {
+        return fWmsDclUnit;
+    }
+
+    public void setfWmsDclUnit(String fWmsDclUnit) {
+        this.fWmsDclUnit = fWmsDclUnit;
+    }
+
+    public String getfWmsLawUnit() {
+        return fWmsLawUnit;
+    }
+
+    public void setfWmsLawUnit(String fWmsLawUnit) {
+        this.fWmsLawUnit = fWmsLawUnit;
+    }
+
     public void setfId(Long fId) {
         this.fId = fId;
     }

ruoyi-warehouse/src/main/resources/mapper/basicData/TGoodsMapper.xml

@@ -15,6 +15,11 @@
         <result property="fColor"    column="f_color"    />
         <result property="fHscode"    column="f_hscode"    />
         <result property="fPackageid"    column="f_packageid"    />
+        <result property="fEmsNo"    column="f_ems_no"    />
+        <result property="fEmsSeqNo"    column="f_ems_seq_no"    />
+        <result property="fGoodsTs"    column="f_goods_ts"    />
+        <result property="fWmsDclUnit"    column="f_wms_dcl_unit"    />
+        <result property="fWmsLawUnit"    column="f_wms_law_unit"    />
         <result property="ifCntrno"    column="if_cntrno"    />
         <result property="fStatus"    column="f_status"    />
         <result property="delFlag"    column="del_flag"    />
@@ -26,7 +31,7 @@
     </resultMap>
 
     <sql id="selectTGoodsVo">
-        select f_id, f_typeid, f_no, f_name, f_enam, f_specs, f_packagespecs, f_color, f_hscode, f_packageid, if_cntrno, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_goods
+        select f_id, f_typeid, f_no, f_name, f_enam, f_specs, f_packagespecs, f_color, f_hscode, f_packageid, f_ems_no, f_ems_seq_no, f_goods_ts, f_wms_dcl_unit, f_wms_law_unit, if_cntrno, f_status, del_flag, create_by, create_time, update_by, update_time, remark from t_goods
     </sql>
 
     <select id="selectTGoodsList" parameterType="TGoods" resultMap="TGoodsResult">
@@ -63,6 +68,11 @@
             <if test="fColor != null">f_color,</if>
             <if test="fHscode != null">f_hscode,</if>
             <if test="fPackageid != null">f_packageid,</if>
+            <if test="fEmsNo != null">f_ems_no,</if>
+            <if test="fEmsSeqNo != null">f_ems_seq_no,</if>
+            <if test="fGoodsTs != null">f_goods_ts,</if>
+            <if test="fWmsDclUnit != null">f_wms_dcl_unit,</if>
+            <if test="fWmsLawUnit != null">f_wms_law_unit,</if>
             <if test="ifCntrno != null">if_cntrno,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -82,6 +92,11 @@
             <if test="fColor != null">#{fColor},</if>
             <if test="fHscode != null">#{fHscode},</if>
             <if test="fPackageid != null">#{fPackageid},</if>
+            <if test="fEmsNo != null">#{fEmsNo},</if>
+            <if test="fEmsSeqNo != null">#{fEmsSeqNo},</if>
+            <if test="fGoodsTs != null">#{fGoodsTs},</if>
+            <if test="fWmsDclUnit != null">#{fWmsDclUnit},</if>
+            <if test="fWmsLawUnit != null">#{fWmsLawUnit},</if>
             <if test="ifCntrno != null">#{ifCntrno},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -105,6 +120,11 @@
             <if test="fColor != null">f_color = #{fColor},</if>
             <if test="fHscode != null">f_hscode = #{fHscode},</if>
             <if test="fPackageid != null">f_packageid = #{fPackageid},</if>
+            <if test="fEmsNo != null">f_ems_no = #{fEmsNo},</if>
+            <if test="fEmsSeqNo != null">f_ems_seq_no = #{fEmsSeqNo},</if>
+            <if test="fGoodsTs != null">f_goods_ts = #{fGoodsTs},</if>
+            <if test="fWmsDclUnit != null">f_wms_dcl_unit = #{fWmsDclUnit},</if>
+            <if test="fWmsLawUnit != null">f_wms_law_unit = #{fWmsLawUnit},</if>
             <if test="ifCntrno != null">if_cntrno = #{ifCntrno},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -2829,8 +2829,16 @@
                 WHEN item.f_billtype = 'HWTG' THEN
                 '货物通关'
             END AS fBilltype,
-            0 fQtyblc,
-            0 fGrossweightblc,
+            (
+            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' AND w.f_tocorpid = #{fCorpid} || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_qty, 0)
+            -
+            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid}, item.f_qty, 0 )
+            ) AS fQtyblc,
+            (
+            IF(item.f_billtype = 'SJRK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid} || item.f_billtype = 'CKDB' AND ware.f_id = item.f_transfer_warehouselocid, item.f_grossweight, 0.00)
+            -
+            IF( item.f_billtype = 'SJCK' || item.f_billtype = 'HQZY' AND w.f_corpid = #{fCorpid}, item.f_grossweight, 0.00 )
+            ) AS fGrossweightblc,
             item.f_truckno fTruckno,
             tf.f_billing_days fBillingDays,
             tf.f_amt fAmt,