111

src/main/java/com/th/demo/model/ware/Distribution.java

@@ -42,6 +42,8 @@ public class Distribution {
 
     private String tallyPeople;
 
+    private String transportName;
+
     public String getTallyPeople() {
         return tallyPeople;
     }
@@ -203,4 +205,12 @@ public class Distribution {
     public void setListDetail(List<DistributionDetail> listDetail) {
         this.listDetail = listDetail;
     }
+
+    public String getTransportName() {
+        return transportName;
+    }
+
+    public void setTransportName(String transportName) {
+        this.transportName = transportName;
+    }
 }

src/main/java/com/th/demo/model/ware/OutRecord.java

@@ -88,6 +88,7 @@ public class OutRecord {
     private Double unitPrice;
 
     private String contractNo;
+    private String transportName;
 
     public Double getUnitPrice() {
         return unitPrice;
@@ -449,4 +450,12 @@ public class OutRecord {
     public void setContractNo(String contractNo) {
         this.contractNo = contractNo;
     }
+
+    public String getTransportName() {
+        return transportName;
+    }
+
+    public void setTransportName(String transportName) {
+        this.transportName = transportName;
+    }
 }

src/main/java/com/th/demo/service/impl/maint/TransportServiceImpl.java

@@ -34,13 +34,17 @@ public class TransportServiceImpl implements TransportService {
 
     @Override
     public String query(int page, int rows, String query, String userId, String belongId) {
-        PageHelper.startPage(page, rows);
         List<Transport> list = new ArrayList<Transport>();
 
         list = transportMapper.selectByName(query, belongId);
+        if(page ==-1 && rows==-1){
+            result = JSONTools.toString(list);
+        }else {
+            PageHelper.startPage(page, rows);
+            PageInfo<Transport> pageInfo = new PageInfo<>(list);
+            result = JSONTools.toString(pageInfo);
+        }
 
-        PageInfo<Transport> pageInfo = new PageInfo<>(list);
-        result = JSONTools.toString(pageInfo);
         return result;
     }
 

src/main/resource/mapper/ware/DistributionMapper.xml

@@ -18,6 +18,7 @@
     <result column="cancel_time" property="cancelTime" jdbcType="TIMESTAMP" />
     <result column="cancel_flag" property="cancelFlag" jdbcType="VARCHAR" />
     <result column="belong_id" property="belongId" jdbcType="VARCHAR" />
+    <result column="transport_name" property="transportName" jdbcType="VARCHAR" />
 
     <result column="delivery_company" property="deliveryCompany" jdbcType="VARCHAR" />
     <result column="distribution_no" property="distributionNo" jdbcType="VARCHAR" />
@@ -234,6 +235,7 @@
       cancel_flag = #{cancelFlag,jdbcType=VARCHAR},
       belong_id = #{belongId,jdbcType=VARCHAR},
       delivery_company = #{deliveryCompany,jdbcType=VARCHAR},
+      transport_name = #{transportName,jdbcType=VARCHAR},
       distribution_no =ifnull(distribution_no,(select dis_no from (select concat('BS',DATE_FORMAT(NOW(), '%Y%m%d'),IFNULL(lpad(max(substring(t.distribution_no,11,3)+1),3,'0'),'001')) as dis_no from t_ware_distribution t
 where substring(t.distribution_no,3,8) = DATE_FORMAT(NOW(), '%Y%m%d')) temp))
       ,tally_people    = #{tallyPeople,jdbcType=VARCHAR}

src/main/resource/mapper/ware/OutRecordMapper.xml

@@ -40,6 +40,7 @@
     <result column="invoice_price" property="invoicePrice" jdbcType="DOUBLE" />
     <result column="verify_account_id" property="verifyAccountId" jdbcType="DOUBLE" />
     <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
+    <result column="transport_name" property="transportName" jdbcType="VARCHAR" />
 
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
@@ -92,6 +93,7 @@
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
     <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
     <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
+    <result column="transport_name" property="transportName" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
@@ -398,7 +400,7 @@
 
   <select id="select" resultMap="BaseResultMap" >
     select
-       e.name as fk_compony_name,p.tally_people as tally_people,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
+       e.name as fk_compony_name,p.tally_people as tally_people,p.transport_name as transport_name,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
        ,t.invoice_price
     from t_ware_out_record t ,t_ware_distribution p,(select t.plate_no,max(t.ord_no) ord_no from t_ware_store t group by t.plate_no) c,t_ware_in_record d LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
      where t.ware_name  like concat('%',#{param1,jdbcType=VARCHAR},'%')
@@ -458,7 +460,7 @@
   </select>
   <select id="selectExpt" resultMap="CleanResultMap" >
     select
-    e.name as fk_compony_name,p.tally_people as tally_people,p.truck_no as out_car_no,f.user_desc as add_id,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time
+    e.name as fk_compony_name,p.tally_people as tally_people,p.transport_name as transport_name,p.truck_no as out_car_no,f.user_desc as add_id,t.*,c.ord_no,DATE_FORMAT(d.add_time, '%Y-%m-%d %H:%i:%s') as in_time
     ,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
     ,t.invoice_price,t.distribution_id
     from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id

src/main/resource/mapper/ware/StoreMapper.xml

@@ -427,7 +427,8 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
 
 
   <select id="selectStore" resultMap="BaseResultMap" >
-    select e.name as fk_compony_id,t.* from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d,t_maint_customer e
+    select e.name as fk_compony_id,t.*
+    from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d,t_maint_customer e
     where t.ware_id = a.id
     and t.stack_id = b.id
     and t.material_id  = c.id