md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java

@@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.emis.domain.EmisTransProduct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,6 +63,16 @@ public class EmisGoodsController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')")
+    @JacksonFilter(include= {"id","goodsSn","goodsName","goodsNameEn"},value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @GetMapping("/listSimple")
+    public TableDataInfo listSimple(EmisGoods emisGoods)
+    {
+        startPage();
+        List<EmisGoods> list = emisGoodsService.selectEmisGoodsList(emisGoods);
+        return getDataTable(list);
+    }
+
     /**
      * 导出货物信息列表
      */

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisUserController.java

@@ -0,0 +1,41 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisCountryController.java
+  * @author linfso
+  * @date 2023-11-16 16:18:40
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 国家 控制器 </p>
+ */
+
+package com.xdadan.erp.web.emis;
+
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.emis.domain.EmisCountry;
+import com.xdadan.erp.emis.service.IEmisCountryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 用户Controller
+ * 
+ * @author linfso
+ * @date 2023-11-16 16:18:40
+ */
+@RestController
+@RequestMapping("/emis/emisUser")
+public class EmisUserController extends BaseController
+{
+
+}

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java

@@ -53,11 +53,9 @@ public class EmisQuotePrice extends BaseEntity
     private String prodCode;
     /* 产品类型名称 */
     private String prodName;
-    /* soon_piece_type */
+    /* 录入收费项 */
-    private String soonPieceType;
-    /* 录入付款类型 */
     private String recPayType;
-    /* 计费类型 0-重量计费 1-体积计费 */
+    /* 计费类型 1-重量计费 2-体积计费 */
     private String billType;
     /* 其他类型1 */
     private String otherType1;

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java

@@ -57,4 +57,5 @@ public class EmisSpecialCalcWeight extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 
+
 }

emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisQuotePriceMapper">
 
     <resultMap type="EmisQuotePrice" id="EmisQuotePriceResult">
@@ -15,7 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="feeType"    column="fee_type"    />
         <result property="prodCode"    column="prod_code"    />
         <result property="prodName"    column="prod_name"    />
-        <result property="soonPieceType"    column="soon_piece_type"    />
         <result property="recPayType"    column="rec_pay_type"    />
         <result property="billType"    column="bill_type"    />
         <result property="otherType1"    column="other_type1"    />
@@ -49,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisQuotePriceVo">
-        select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, soon_piece_type, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_site, disp_area_name, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price
+        select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_site, disp_area_name, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price
     </sql>
 
     <select id="selectEmisQuotePriceList" parameterType="EmisQuotePrice" resultMap="EmisQuotePriceResult">
@@ -65,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feeType != null  and feeType != ''"> and fee_type like concat('%', #{feeType}, '%')</if>
             <if test="prodCode != null  and prodCode != ''"> and prod_code like concat('%', #{prodCode}, '%')</if>
             <if test="prodName != null  and prodName != ''"> and prod_name like concat('%', #{prodName}, '%')</if>
-            <if test="soonPieceType != null  and soonPieceType != ''"> and soon_piece_type like concat('%', #{soonPieceType}, '%')</if>
             <if test="recPayType != null  and recPayType != ''"> and rec_pay_type like concat('%', #{recPayType}, '%')</if>
             <if test="billType != null  and billType != ''"> and bill_type like concat('%', #{billType}, '%')</if>
             <if test="otherType1 != null  and otherType1 != ''"> and other_type1 like concat('%', #{otherType1}, '%')</if>
@@ -101,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectEmisQuotePriceByQuoteId" parameterType="Long" resultMap="EmisQuotePriceResult">
-        select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, soon_piece_type, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_site, disp_area_name, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_site, disp_area_name, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_quote_price a
         where a.quote_id = #{quoteId}
     </select>
@@ -119,7 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feeType != null and feeType != ''">fee_type,</if>
             <if test="prodCode != null and prodCode != ''">prod_code,</if>
             <if test="prodName != null and prodName != ''">prod_name,</if>
-            <if test="soonPieceType != null and soonPieceType != ''">soon_piece_type,</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type,</if>
             <if test="billType != null and billType != ''">bill_type,</if>
             <if test="otherType1 != null and otherType1 != ''">other_type1,</if>
@@ -150,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="quoteId != null">#{quoteId},</if>
             <if test="quoteName != null and quoteName != ''">#{quoteName},</if>
@@ -162,7 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feeType != null and feeType != ''">#{feeType},</if>
             <if test="prodCode != null and prodCode != ''">#{prodCode},</if>
             <if test="prodName != null and prodName != ''">#{prodName},</if>
-            <if test="soonPieceType != null and soonPieceType != ''">#{soonPieceType},</if>
             <if test="recPayType != null and recPayType != ''">#{recPayType},</if>
             <if test="billType != null and billType != ''">#{billType},</if>
             <if test="otherType1 != null and otherType1 != ''">#{otherType1},</if>
@@ -193,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisQuotePrice" parameterType="EmisQuotePrice">
@@ -208,7 +204,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
             <if test="prodCode != null and prodCode != ''">prod_code = #{prodCode},</if>
             <if test="prodName != null and prodName != ''">prod_name = #{prodName},</if>
-            <if test="soonPieceType != null and soonPieceType != ''">soon_piece_type = #{soonPieceType},</if>
             <if test="recPayType != null and recPayType != ''">rec_pay_type = #{recPayType},</if>
             <if test="billType != null and billType != ''">bill_type = #{billType},</if>
             <if test="otherType1 != null and otherType1 != ''">other_type1 = #{otherType1},</if>