diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java index 943e9bb..2b29bee 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java @@ -135,6 +135,28 @@ public abstract class BaseOrdercluster> extends Ba return get("create_time"); } + /** + * name: start_time + * type: DATETIME(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * + * @param startTime 客户要求的送货起始时间(限定的执行起始日期) + */ + @JSONField(name = "start_time") + public void setStartTime(java.util.Date startTime) { + set("start_time", startTime); + } + + /** + * @return start_time 客户要求的送货起始时间(限定的执行起始日期) + */ + @JSONField(name = "start_time") + public java.util.Date getStartTime() { + return get("start_time"); + } + /** * name: cutoff_time * type: DATETIME(19) @@ -151,7 +173,7 @@ public abstract class BaseOrdercluster> extends Ba /** - * @return cutoff_time 客户要求的送货截止时间(限定的执行日期,只能在执行当前进行) + * @return cutoff_time 客户要求的送货截止时间(限定的执行截止日期,只能在执行当前进行) */ @JSONField(name = "cutoff_time") public java.util.Date getCutoffTime() { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java index 0f18fbf..7e69dbe 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java @@ -278,6 +278,8 @@ public class TransportSyncService { return result; } + // 判断是否有配额、是否在有效时间段内 + Transport transport = new Transport(); transport.setId(StrKit.getRandomUUID()); transport.setSupermarketId(supermarket_id); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index 1e4e106..7d2b98b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -234,7 +234,7 @@ public class OrderclusterSyncService extends BaseSyncService { String customer_texpayer_num, Integer req_receipt, double total_weight, - Date start_time, + Date start_time, Date cutoff_time, int supermarket_id, String trucks, @@ -347,6 +347,7 @@ public class OrderclusterSyncService extends BaseSyncService { model.setTransDistance(new BigDecimal(0)); model.setTotalWeight(new BigDecimal(total_weight)); + model.setStartTime(start_time); model.setCutoffTime(cutoff_time); model.setSupermarketId(supermarket_id);