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 1ed1793..f65f3f6 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
@@ -196,7 +196,7 @@ class AnotherOrderActivity : BaseActivity() {
         tvNameDis.text = putTableDataDTO.loadingName
         tvPhoneDis.text = putTableDataDTO.loadingPhone
         tvAddressDis.text = putTableDataDTO.detailAddress
-        tvEndTimeDis.text = putTableDataDTO.loadingDeadline
+//        tvEndTimeDis.text = putTableDataDTO.loadingDeadline
         ryDis.notifyDatas(putTableDataDTO.getGoods())
 
         rlTopDis.setOnClickListener { v12: View? ->
@@ -262,10 +262,36 @@ class AnotherOrderActivity : BaseActivity() {
         tvName.text = sendTableDataDTO.loadingName
         tvPhone.text = sendTableDataDTO.loadingPhone
         tvAddress.text = sendTableDataDTO.detailAddress
-        tvStartTime.text = sendTableDataDTO.loadingDeadline
+//        tvStartTime.text = sendTableDataDTO.loadingDeadline
 //            etMoney.setText(sendTableDataDTO.totalFreight)
 
 
+        val nowString = TimeUtil.getNowString("yyyy-MM-dd") + " " + getRead(23) + ":" + getRead(59)
+        oib.sendTableData[0].loadingDeadline = nowString
+        tvStartTime.text = nowString
+
+
+        //卸货截止日期
+        val endDate = TimeUtil.getString(
+            nowString,
+            SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()),
+            14400,
+            TimeConstants.MIN
+        )
+        oib.putTableData[0].loadingDeadline = endDate
+
+
+        //订单有效期根据装货截止时间延长15天
+        val waybillEndDate = TimeUtil.getString(
+            nowString,
+            SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()),
+            21600,
+            TimeConstants.MIN
+        )
+        effectiveTime.text = waybillEndDate
+        oib.formData.effectiveTime = waybillEndDate
+
+
         rlTop.setOnClickListener { v12: View? ->
             val `in` = Intent(this, AddressActivity::class.java)
             `in`.putExtra("type", 0)
@@ -313,9 +339,6 @@ class AnotherOrderActivity : BaseActivity() {
                 oib.putTableData[0].loadingDeadline = endDate
                 tvEndTimeDis.text = endDate
 
-                //订单有效期根据装货截止时间延长15天
-                //        }
-
                 //订单有效期根据装货截止时间延长15天
                 val waybillEndDate = TimeUtil.getString(
                     text,