md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.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.common.core.domain.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,6 +51,17 @@ public class EmisSupplierController extends BaseController
     @Autowired
     private IEmisSupplierService emisSupplierService;
 
+    @JacksonFilter(include= {"id","code","name","nameEn","settledType","settledType","transType","bizSite"},value= EmisSupplier.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @GetMapping("/listSimple")
+    public TableDataInfo listSimple(EmisSupplier emisSupplier)
+    {
+        setPrivParams(emisSupplier);
+
+        startPage();
+        List<EmisSupplier> list = emisSupplierService.selectEmisSupplierList(emisSupplier);
+        return getDataTable(list);
+    }
+
     /**
      * 查询公司供应商表列表
      */

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

@@ -45,6 +45,10 @@ public class EmisTmsSiteBatch extends BaseEntity
     /* 批次时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date batchDate;
+    /* 供应商代码 */
+    private String supplierCode;
+    /* 供应商名称 */
+    private String supplierName;
     /* 所属线路 */
     private String transLineType;
     /* 所属产品 */
@@ -62,10 +66,10 @@ public class EmisTmsSiteBatch extends BaseEntity
     /* 航空单号 */
     private String airBilllNo;
     /* 预计出发时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date etd;
     /* 预计到达时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date eta;
     /* 车牌号 */
     private String carNo;
@@ -77,6 +81,8 @@ public class EmisTmsSiteBatch extends BaseEntity
     private String declareResStatus;
     /* 目的国家 */
     private String destCountry;
+    /* 目的国家名称 */
+    private String destCountryName;
     /* 运输重量 */
     private BigDecimal transWeight;
     /* 包裹数 */
@@ -99,8 +105,6 @@ public class EmisTmsSiteBatch extends BaseEntity
     /* 发件国家 目的国家名称 */
     private String sendCountryName;
 
-    private String destCountryName;
-
     private String startSiteName;
     private String nextSiteName;
 

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

@@ -9,11 +9,12 @@
         <result property="batchNo"    column="batch_no"    />
         <result property="batchName"    column="batch_name"    />
         <result property="batchDate"    column="batch_date"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
         <result property="transLineType"    column="trans_line_type"    />
         <result property="productType"    column="product_type"    />
         <result property="batchType"    column="batch_type"    />
         <result property="transType"    column="trans_type"    />
-
         <result property="startSiteCode"    column="start_site_code"    />
         <result property="sendCountry"    column="send_country"    />
         <result property="nextSiteCode"    column="next_site_code"    />
@@ -24,22 +25,20 @@
         <result property="shipNo"    column="ship_no"    />
         <result property="clearanceResStatus"    column="clearance_res_status"    />
         <result property="declareResStatus"    column="declare_res_status"    />
-
         <result property="destCountry"    column="dest_country"    />
-
+        <result property="destCountryName"    column="dest_country_name"    />
+        <result property="transWeight"    column="trans_weight"    />
+        <result property="packNum"    column="pack_num"    />
         <result property="totalParcelQty"    column="total_parcel_qty"    />
         <result property="totalWaybillQty"    column="total_waybill_qty"    />
         <result property="totalVolume"    column="total_volume"    />
         <result property="totalWeight"    column="total_weight"    />
         <result property="opMan"    column="op_man"    />
 
-        <result property="transWeight"    column="trans_weight"    />
-        <result property="packNum"    column="pack_num"    />
-
+        <!--   扩展     -->
         <association property="productTypeName"    column="product_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
         <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
 
-        <!--   个性化查询     -->
         <association property="sendCountryName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectFromCountryNameByLineCode"/>
         <association property="destCountryName"    column="dest_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>