diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0c0c338
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2266b30..d5e5cad 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..4515aa3
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.6.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt b/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt
index 8c28878..1ed1793 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt
+++ b/app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt
@@ -11,11 +11,14 @@ import android.widget.TextView
 import android.widget.Toast
 import com.dahe.mylibrary.base.BaseActivity
 import com.dahe.mylibrary.net.CommonResponseBean
+import com.dahe.mylibrary.utils.TimeConstants
 import com.dahe.mylibrary.utils.TimeUtil
+import com.github.gzuliyujiang.wheelpicker.DatePicker
 import com.github.gzuliyujiang.wheelpicker.DatimePicker
 import com.github.gzuliyujiang.wheelpicker.OptionPicker
 import com.github.gzuliyujiang.wheelpicker.annotation.DateMode
 import com.github.gzuliyujiang.wheelpicker.annotation.TimeMode
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity
 import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity
 import com.google.gson.Gson
 import com.lxj.xpopup.XPopup
@@ -274,21 +277,60 @@ class AnotherOrderActivity : BaseActivity() {
             startActivity(`in`)
         }
         tvStartTime.setOnClickListener(View.OnClickListener { V: View? ->
-            val ap = DatimePicker(this)
+//            val ap = DatimePicker(this)
+//            val wheelLayout = ap.wheelLayout
+//            ap.setOnDatimePickedListener { year: Int, month: Int, day: Int, hour: Int, minute: Int, second: Int ->
+//                val text =
+//                    year.toString() + "-" + getRead(month) + "-" + getRead(day) + " " + getRead(hour) + ":" + getRead(
+//                        minute)
+//                oib.sendTableData.get(0).setLoadingDeadline(text)
+//                tvStartTime.setText(text)
+//            }
+//            wheelLayout.setDateMode(DateMode.YEAR_MONTH_DAY)
+//            wheelLayout.setTimeMode(TimeMode.HOUR_24_NO_SECOND)
+//            wheelLayout.setRange(DatimeEntity.now(), DatimeEntity.yearOnFuture(10))
+//            wheelLayout.setDateLabel("年", "月", "日")
+//            wheelLayout.setTimeLabel("时", "分", "")
+//            ap.show()
+
+            val ap = DatePicker(this)
             val wheelLayout = ap.wheelLayout
-            ap.setOnDatimePickedListener { year: Int, month: Int, day: Int, hour: Int, minute: Int, second: Int ->
+            ap.setOnDatePickedListener { year: Int, month: Int, day: Int ->
                 val text =
-                    year.toString() + "-" + getRead(month) + "-" + getRead(day) + " " + getRead(hour) + ":" + getRead(
-                        minute)
-                oib.sendTableData.get(0).setLoadingDeadline(text)
-                tvStartTime.setText(text)
+                    year.toString() + "-" + getRead(month) + "-" + getRead(day) + " " + getRead(23) + ":" + getRead(
+                        59
+                    )
+                oib.sendTableData[0].loadingDeadline = text
+                tvStartTime.text = text
+
+                //卸货截止日期
+                val endDate = TimeUtil.getString(
+                    text,
+                    SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()),
+                    14400,
+                    TimeConstants.MIN
+                )
+                oib.putTableData[0].loadingDeadline = endDate
+                tvEndTimeDis.text = endDate
+
+                //订单有效期根据装货截止时间延长15天
+                //        }
+
+                //订单有效期根据装货截止时间延长15天
+                val waybillEndDate = TimeUtil.getString(
+                    text,
+                    SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()),
+                    21600,
+                    TimeConstants.MIN
+                )
+                effectiveTime.text = waybillEndDate
+                oib.formData.effectiveTime = waybillEndDate
             }
             wheelLayout.setDateMode(DateMode.YEAR_MONTH_DAY)
-            wheelLayout.setTimeMode(TimeMode.HOUR_24_NO_SECOND)
-            wheelLayout.setRange(DatimeEntity.now(), DatimeEntity.yearOnFuture(10))
+            wheelLayout.setRange(DateEntity.today(), DateEntity.yearOnFuture(10))
             wheelLayout.setDateLabel("年", "月", "日")
-            wheelLayout.setTimeLabel("时", "分", "")
             ap.show()
+
         })
         ryPretend.addItemDecoration(RecyclerViewDecoration(this,
             RecyclerViewDecoration.VERTICAL_LIST))
@@ -343,10 +385,10 @@ class AnotherOrderActivity : BaseActivity() {
         r3.setOnClickListener {
             if (isLogin()) {
                 etMoney.clearFocus()
-                val ctb = TypeParts.getCarTypeLong(this)
-                val data: MutableList<OptionBaseBean?> = java.util.ArrayList()
-                for (typeDTO in ctb.data.type) {
-                    data.add(OptionBaseBean(typeDTO.value, typeDTO.name))
+                val ctb = TypeParts.getCarTypeShort(this)
+                val data: MutableList<OptionBaseBean?> = ArrayList()
+                for (typeDTO in ctb.data) {
+                    data.add(OptionBaseBean(typeDTO.value, typeDTO.label))
                 }
                 val picker = OptionPicker(this)
                 picker.setBodyWidth(140)
@@ -406,10 +448,11 @@ class AnotherOrderActivity : BaseActivity() {
         r7.setOnClickListener {
             if (isLogin()) {
                 etMoney.clearFocus()
-                val al = TypeParts.getNpType(this)
-                val data: MutableList<OptionBaseBean?> = java.util.ArrayList()
-                for (datum in al.data) {
-                    data.add(OptionBaseBean(datum.id, datum.cateName))
+
+                val ctb = TypeParts.getGoodsTypeShort(this)
+                val data: MutableList<OptionBaseBean?> = ArrayList()
+                for (typeDTO in ctb.data) {
+                    data.add(OptionBaseBean(typeDTO.id, typeDTO.cateName))
                 }
                 val picker = OptionPicker(this)
                 picker.setBodyWidth(140)
@@ -500,33 +543,30 @@ class AnotherOrderActivity : BaseActivity() {
                         return@setOnClickListener
                     }
 
-                    if (!TimeUtil.compareDate(tvEndTimeDis.text.toString(),
-                            TimeUtil.getNowString(SimpleDateFormat("yyyy-MM-dd HH:mm",
-                                Locale.getDefault())),
-                            SimpleDateFormat("yyyy-MM-dd HH:mm",
-                                Locale.getDefault()))
-                    ) {
-                        showToast("卸货截止时间不能小于当前时间")
-                        return@setOnClickListener
-                    }
+//                    if (!TimeUtil.compareDate(tvEndTimeDis.text.toString(),
+//                            TimeUtil.getNowString(SimpleDateFormat("yyyy-MM-dd HH:mm",
+//                                Locale.getDefault())),
+//                            SimpleDateFormat("yyyy-MM-dd HH:mm",
+//                                Locale.getDefault()))
+//                    ) {
+//                        showToast("卸货截止时间不能小于当前时间")
+//                        return@setOnClickListener
+//                    }
 
-                    if (!TimeUtil.compareDate(effectiveTime.text.toString(),
-                            TimeUtil.getNowString(SimpleDateFormat("yyyy-MM-dd HH:mm",
-                                Locale.getDefault())),
-                            SimpleDateFormat("yyyy-MM-dd HH:mm",
-                                Locale.getDefault()))
-                    ) {
-                        showToast("订单有效期不能小于当前时间")
-                        return@setOnClickListener
-                    }
+//                    if (!TimeUtil.compareDate(effectiveTime.text.toString(),
+//                            TimeUtil.getNowString(SimpleDateFormat("yyyy-MM-dd HH:mm",
+//                                Locale.getDefault())),
+//                            SimpleDateFormat("yyyy-MM-dd HH:mm",
+//                                Locale.getDefault()))
+//                    ) {
+//                        showToast("订单有效期不能小于当前时间")
+//                        return@setOnClickListener
+//                    }
                     if (etMoney.text.toString().isEmpty()) {
                         showToast("请输入运费信息")
                         return@setOnClickListener
                     }
 
-
-
-
                     if (oib.sendTableData[0].goods.size > 0 && oib.putTableData[0].goods.size > 0 && !TextUtils.isEmpty(
                             oib.formData.shipperCarId)
                     ) {
diff --git a/app/src/main/res/layout/activity_anohter_order.xml b/app/src/main/res/layout/activity_anohter_order.xml
index 01cde1a..0a61c3f 100644
--- a/app/src/main/res/layout/activity_anohter_order.xml
+++ b/app/src/main/res/layout/activity_anohter_order.xml
@@ -252,7 +252,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="@dimen/dp_24"
-                        android:text="货物大类(交通厅)"
+                        android:text="货物大类"
                         android:textColor="#ff999999"
                         android:textSize="@dimen/sp_14" />
 
@@ -281,11 +281,13 @@
                 </RelativeLayout>
 
                 <View
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
                     android:background="#8AA5E1"
                     android:alpha="0.5"/>
                 <RelativeLayout
+                    android:visibility="gone"
                     android:id="@+id/r8"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -328,11 +330,13 @@
                 </RelativeLayout>
 
                 <View
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
                     android:background="#8AA5E1"
                     android:alpha="0.5"/>
                 <RelativeLayout
+                    android:visibility="gone"
                     android:id="@+id/r5"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"