仓库业务->利润总帐添加业务员查询条件，添加溢短重 字段

ruoyi-admin/src/main/resources/application-druid.yml

@@ -9,7 +9,12 @@ spring:
 #        url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
  #       url: jdbc:mysql://115.29.151.39:3306/sys?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
 #        url: jdbc:mysql://124.70.179.5:3306/Test?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        url: jdbc:mysql://124.70.179.5:3306/LinuxServer?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://124.70.179.5:3306/JinGang?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://124.70.179.5:3306/ruoyi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://124.70.179.5:3306/ZhongDian?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://124.70.179.5:3306/LinuxServer?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://124.70.179.5:3306/linshi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://124.70.179.5:3306/JianQiao?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: root
         password: daasan7ujm^YHN
 

ruoyi-admin/src/main/resources/application.yml

@@ -23,7 +23,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9010
+  port: 9011
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.warehouseBusiness.domain.enums.AnnexActEnum;
 import com.ruoyi.warehouseBusiness.domain.vo.WarehouseInfoVO;
 import com.ruoyi.warehouseBusiness.mapper.TAnnexMapper;
 import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,6 +65,7 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
         WarehouseInfoVO warehouseInfoVO = new WarehouseInfoVO();
         TWarehouse tWarehouse = tWarehouseMapper.selectTWarehouseById(fId);
         if (Objects.nonNull(tWarehouse)) {
+            BeanUtils.copyProperties(tWarehouse, warehouseInfoVO);
             TAnnex annex = new TAnnex();
             annex.setfPid(tWarehouse.getfId());
             annex.setfActid(AnnexActEnum.WAREHOUSE.getType());

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TWareHouseFees.java

@@ -114,6 +114,8 @@ public class TWareHouseFees extends BaseEntity {
     private Long fLoadportid;
     /** 目的港 */
     private Long fDestportid;
+    /** 业务员id */
+    private Long fSalesmanId;
 
     /**
      * 检索区间始
@@ -131,6 +133,14 @@ public class TWareHouseFees extends BaseEntity {
     @TableField(exist = false)
     private Long stlTypeid;
 
+    public Long getfSalesmanId() {
+        return fSalesmanId;
+    }
+
+    public void setfSalesmanId(Long fSalesmanId) {
+        this.fSalesmanId = fSalesmanId;
+    }
+
     public Long getStlTypeid() {
         return stlTypeid;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehousebillsitems.java

@@ -211,6 +211,12 @@ public class TWarehousebillsitems extends BaseEntity {
     private String fMarks;
 
     /**
+     * 溢短重
+     */
+    @Excel(name = "溢短重")
+    private BigDecimal  fActualWeight = BigDecimal.ZERO;
+
+    /**
      * 库存天数(出库日期-仓储费计费日期)
      */
     @Excel(name = "库存天数(出库日期-仓储费计费日期)")
@@ -394,6 +400,14 @@ public class TWarehousebillsitems extends BaseEntity {
      */
     private String fDc;
 
+    public BigDecimal getfActualWeight() {
+        return fActualWeight;
+    }
+
+    public void setfActualWeight(BigDecimal fActualWeight) {
+        this.fActualWeight = fActualWeight;
+    }
+
     public String getfDc() {
         return fDc;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/enums/WarehouseTypeEnum.java

@@ -68,9 +68,9 @@ public enum WarehouseTypeEnum {
 
     // 编号生成简写
 
-    SJRK_NO("RK", "费用变更"),
-    SJCK_NO("CK", "入库"),
-    CKDB_NO("DB", "出库"),
+    SJRK_NO("RK", "入库"),
+    SJCK_NO("CK", "出库"),
+    CKDB_NO("DB", "调拨"),
     HQZY_NO("HZ", "货转"),
 
     FYBG_NO("FYBG", "费用变更"),

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -1794,28 +1794,29 @@
 
     <select id="warehouseBillsFeesProfitList" resultType="java.util.Map">
         SELECT
-        t.f_id AS fSrcpid,
-        c.f_name AS fName,
-        c1.f_name AS fFeesName,
-        w.f_mblno AS fMblno,
-        w.f_product_name AS fProductName,
-        w.f_marks AS fMarks,
-        t.f_billtype AS fBilltype,
-        w.f_review_date AS fReviewDate,
-        sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) fAmount,
-        sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END ) fStlamount,
-        sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) - sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END )
-        nnfinished
+            t.f_id AS fSrcpid,
+            c.f_name AS fName,
+            c1.f_name AS fFeesName,
+            w.f_mblno AS fMblno,
+            w.f_product_name AS fProductName,
+            w.f_marks AS fMarks,
+            t.f_billtype AS fBilltype,
+            w.f_review_date AS fReviewDate,
+            sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) fAmount,
+            sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END ) fStlamount,
+            sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) - sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END )
+            nnfinished
         FROM
-        t_warehousebillsfees w
-        LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
-        left join sys_user u on t.create_by = u.user_name
-        left join sys_dept d on t.f_bsdeptid = d.dept_id
-        LEFT JOIN t_corps c ON c.f_id = t.f_corpid
-        LEFT JOIN t_corps c1 ON c1.f_id = w.f_corpid
+            t_warehousebillsfees w
+            LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
+            left join sys_user u on t.create_by = u.user_name
+            left join sys_dept d on t.f_bsdeptid = d.dept_id
+            LEFT JOIN t_corps c ON c.f_id = t.f_corpid
+            LEFT JOIN t_corps c1 ON c1.f_id = w.f_corpid
         <where>
-            <if test="fCorpid != null  and fCorpid != ''">and t.f_corpid = #{fCorpid}</if>
-            <if test="fToCorpid != null  and fToCorpid != ''">and w.f_corpid = #{fToCorpid}</if>
+            <if test="fCorpid != null and fCorpid != ''">and t.f_corpid = #{fCorpid}</if>
+            <if test="fToCorpid != null and fToCorpid != ''">and w.f_corpid = #{fToCorpid}</if>
+            <if test="fSalesmanId != null and fSalesmanId != ''">and t.f_salesman_id = #{fSalesmanId}</if>
             <if test="fMblno != null  and fMblno != ''">and w.f_mblno like concat('%', #{fMblno}, '%')</if>
             <if test="fMarks != null and fMarks != ''">and w.f_marks like concat('%', #{fMarks}, '%')</if>
             <if test="fProductName != null and fProductName != ''">and w.f_product_name like concat('%',

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

@@ -36,6 +36,7 @@
         <result property="fCntrno" column="f_cntrno"/>
         <result property="fTruckno" column="f_truckno"/>
         <result property="fMarks" column="f_marks"/>
+        <result property="fActualWeight" column="f_actual_weight"/>
         <result property="fBillstatus" column="f_billstatus"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
@@ -107,7 +108,7 @@
     <sql id="selectTWarehousebillsitemsVo">
         select f_id, f_pid, f_srcid, f_lineno, f_billno, f_goodsid, f_mblno, f_src_bsdate, f_originalbillno, f_transfer_warehouselocid, f_warehouselocid,
          f_originalbilldate, f_bsdate, f_billingway, f_chargedate, f_boxno, f_goodsval, f_cntqty, f_packagespecs, f_cntrtype, f_planvolumn,
-          f_planqty, f_plangrossweight, f_plannetweight, f_volumn, f_qty, f_grossweight, f_netweight, f_cntrno, f_truckno, f_marks, f_billstatus,
+          f_planqty, f_plangrossweight, f_plannetweight, f_volumn, f_qty, f_grossweight, f_netweight, f_cntrno, f_truckno, f_marks, f_actual_weight, f_billstatus,
            del_flag, create_by, create_time, update_by, update_time, remark, f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days,
             f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass, f_billtype, f_billing_qty, f_billing_deadline, f_business_type,
              f_is_inventory, f_warehouse_information, f_orgwarehouse_information, f_labour, f_fleet, f_stevedore, f_lntype, f_forkliftman,
@@ -155,6 +156,7 @@
             <if test="fTruckno != null  and fTruckno != ''">and f_truckno = #{fTruckno}</if>
             <if test="fBillstatus != null  and fBillstatus != ''">and f_billstatus = #{fBillstatus}</if>
             <if test="fMarks != null  and fMarks != ''">and f_marks = #{fMarks}</if>
+            <if test="fActualWeight != null  and fActualWeight != ''">and f_actual_weight = #{fActualWeight}</if>
             <if test="fInventoryDays != null ">and f_inventory_days = #{fInventoryDays}</if>
             <if test="fAmt != null ">and f_amt = #{fAmt}</if>
             <if test="fBillingDays != null ">and f_billing_days = #{fBillingDays}</if>
@@ -208,6 +210,7 @@
             item.f_driver_id_car AS fDriverIdCar,
             item.f_serial_number AS fSerialNumber,
             item.f_marks AS fMarks,
+            item.f_actual_weight AS fActualWeight,
             item.f_grossweight AS fGrossweight,
             item.f_is_inventory AS fIsInventory,
             item.f_business_type AS fBusinessType,
@@ -285,6 +288,7 @@
             <if test="fCntrno != null">f_cntrno,</if>
             <if test="fTruckno != null">f_truckno,</if>
             <if test="fMarks != null">f_marks,</if>
+            <if test="fActualWeight != null">f_actual_weight,</if>
             <if test="fBillstatus != null">f_billstatus,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -353,6 +357,7 @@
             <if test="fCntrno != null">#{fCntrno},</if>
             <if test="fTruckno != null">#{fTruckno},</if>
             <if test="fMarks != null">#{fMarks},</if>
+            <if test="fActualWeight != null">#{fActualWeight},</if>
             <if test="fBillstatus != null">#{fBillstatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -424,6 +429,7 @@
             <if test="fCntrno != null">f_cntrno = #{fCntrno},</if>
             <if test="fTruckno != null">f_truckno = #{fTruckno},</if>
             <if test="fMarks != null">f_marks = #{fMarks},</if>
+            <if test="fActualWeight != null">f_actual_weight = #{fActualWeight},</if>
             <if test="fBillstatus != null and fBillstatus != ''">f_billstatus = #{fBillstatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>