收费标准模块完成

发运单模块加入目的地
发运单详情模块加入类型

common/src/main/java/com/jpsoft/prices/modules/base/entity/Invoice.java

@@ -18,6 +18,8 @@ import lombok.Data;
 public class Invoice {
         @ApiModelProperty(value = "UUID")
     private String id;
+        @ApiModelProperty(value = "目的地编号")
+    private String destinationId;
         @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
 	    @ApiModelProperty(value = "发货日期")

common/src/main/java/com/jpsoft/prices/modules/base/entity/InvoiceInfo.java

@@ -24,6 +24,8 @@ public class InvoiceInfo {
     private String orderNumber;
         @ApiModelProperty(value = "名称")
     private String name;
+        @ApiModelProperty(value = "类别")
+    private String type;
         @ApiModelProperty(value = "条形码")
     private String barCode;
         @ApiModelProperty(value = "长（CM）")

common/src/main/resources/mapper/base/Invoice.xml

@@ -5,6 +5,7 @@
 <mapper namespace="com.jpsoft.prices.modules.base.dao.InvoiceDAO">
 	<resultMap id="InvoiceMap" type="com.jpsoft.prices.modules.base.entity.Invoice">
 		<id property="id" column="id_" />
+		<result property="destinationId" column="destination_id" />
 		<result property="shipment" column="shipment_" />
 		<result property="recipient" column="recipient_" />
 		<result property="recipientTelephone" column="recipient_telephone" />
@@ -26,10 +27,11 @@
 	-->
 	<![CDATA[
 		insert into base_invoice
-	    (id_,shipment_,recipient_,recipient_telephone,recipient_entity,recipient_address,goods_value,status_,del_flag,create_time,create_by,update_time,update_by)
+	    (id_,destination_id,shipment_,recipient_,recipient_telephone,recipient_entity,recipient_address,goods_value,status_,del_flag,create_time,create_by,update_time,update_by)
 		values
 		(
 #{id,jdbcType=VARCHAR}
+,#{destinationId,jdbcType=VARCHAR}
 ,#{shipment,jdbcType= TIMESTAMP }
 ,#{recipient,jdbcType=VARCHAR}
 ,#{recipientTelephone,jdbcType=VARCHAR}
@@ -51,6 +53,9 @@
 	<update id="update" parameterType="com.jpsoft.prices.modules.base.entity.Invoice">
 		update base_invoice
 		<set>
+				<if test="destinationId!=null">
+		destination_id=#{destinationId,jdbcType=VARCHAR},
+		</if>
 				<if test="shipment!=null">
 		shipment_=#{shipment,jdbcType= TIMESTAMP },
 		</if>
@@ -91,8 +96,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="InvoiceMap">
-		select 
-id_,shipment_,recipient_,recipient_telephone,recipient_entity,recipient_address,goods_value,status_,del_flag,create_time,create_by,update_time,update_by		from base_invoice where id_=#{0}
+		select id_,destination_id,shipment_,recipient_,recipient_telephone,recipient_entity,recipient_address,goods_value,status_,del_flag,create_time,create_by,update_time,update_by		from base_invoice where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_invoice where id_=#{0}

common/src/main/resources/mapper/base/InvoiceInfo.xml

@@ -5,21 +5,22 @@
 <mapper namespace="com.jpsoft.prices.modules.base.dao.InvoiceInfoDAO">
 	<resultMap id="InvoiceInfoMap" type="com.jpsoft.prices.modules.base.entity.InvoiceInfo">
 		<id property="id" column="id_" />
-			<result property="invoiceId" column="invoice_id" />
-			<result property="orderNumber" column="order_number" />
-			<result property="name" column="name_" />
-			<result property="barCode" column="bar_code" />
-			<result property="boxLength" column="box_length" />
-			<result property="boxWidth" column="box_width" />
-			<result property="boxHight" column="box_hight" />
-			<result property="netWeight" column="net_weight" />
-			<result property="grossWeight" column="gross_weight" />
-			<result property="delFlag" column="del_flag" />
-			<result property="createTime" column="create_time" />
-			<result property="createBy" column="create_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="updateBy" column="update_by" />
-			</resultMap>
+		<result property="invoiceId" column="invoice_id" />
+		<result property="orderNumber" column="order_number" />
+		<result property="name" column="name_" />
+		<result property="type" column="type_" />
+		<result property="barCode" column="bar_code" />
+		<result property="boxLength" column="box_length" />
+		<result property="boxWidth" column="box_width" />
+		<result property="boxHight" column="box_hight" />
+		<result property="netWeight" column="net_weight" />
+		<result property="grossWeight" column="gross_weight" />
+		<result property="delFlag" column="del_flag" />
+		<result property="createTime" column="create_time" />
+		<result property="createBy" column="create_by" />
+		<result property="updateTime" column="update_time" />
+		<result property="updateBy" column="update_by" />
+	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.prices.modules.base.entity.InvoiceInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -28,13 +29,14 @@
 	-->
 	<![CDATA[
 		insert into base_invoice_info
-	    (id_,invoice_id,order_number,name_,bar_code,box_length,box_width,box_hight,net_weight,gross_weight,del_flag,create_time,create_by,update_time,update_by)
+	    (id_,invoice_id,order_number,name_,type_,bar_code,box_length,box_width,box_hight,net_weight,gross_weight,del_flag,create_time,create_by,update_time,update_by)
 		values
 		(
 #{id,jdbcType=VARCHAR}
 ,#{invoiceId,jdbcType=VARCHAR}
 ,#{orderNumber,jdbcType=VARCHAR}
 ,#{name,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
 ,#{barCode,jdbcType=VARCHAR}
 ,#{boxLength,jdbcType= NUMERIC }
 ,#{boxWidth,jdbcType= NUMERIC }
@@ -63,6 +65,9 @@
 		</if>
 				<if test="name!=null">
 		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
 		</if>
 				<if test="barCode!=null">
 		bar_code=#{barCode,jdbcType=VARCHAR},
@@ -102,7 +107,7 @@
 	</update>
 	<select id="get" parameterType="string" resultMap="InvoiceInfoMap">
 		select 
-id_,invoice_id,order_number,name_,bar_code,box_length,box_width,box_hight,net_weight,gross_weight,del_flag,create_time,create_by,update_time,update_by		from base_invoice_info where id_=#{0}
+id_,invoice_id,order_number,name_,type_,bar_code,box_length,box_width,box_hight,net_weight,gross_weight,del_flag,create_time,create_by,update_time,update_by		from base_invoice_info where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_invoice_info where id_=#{0}

web/src/main/java/com/jpsoft/prices/modules/base/controller/CompanyController.java

@@ -254,4 +254,22 @@ public class CompanyController {
 
         return msgResult;
     }
+
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "query", method = RequestMethod.POST)
+    public MessageResult<List> query() {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        Map<String, Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("name_", "asc"));
+
+        Page<Company> page = companyService.pageSearch(searchParams,1,10000,false,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
 }

web/src/main/java/com/jpsoft/prices/modules/base/controller/DestinationController.java

@@ -241,6 +241,7 @@ public class DestinationController {
 
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("code_","asc"));
+        sortList.add(new Sort("name_","asc"));
 
         Page<Destination> page = destinationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(Destination li : page.getResult()){

web/src/main/resources/application-dev.yml

@@ -5,9 +5,15 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://192.168.77.122:3306/feilihua_prices?useSSL=false&autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    url: jdbc:log4jdbc:mysql://192.168.77.122:3306/feilihua_prices?useSSL=false&autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: 123456
+#    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/feilihua_prices?useSSL=false&autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: jpsoft2016
+    url: jdbc:log4jdbc:mysql://47.101.158.176:3306/feilihua_prices?useSSL=false&autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: 123456
+    password: jpsoft2022
 
 logger:
   level: WARN