提交 ca4783a4 authored 作者: huyufan's avatar huyufan

修改代码

上级 3c788a4c
......@@ -125,6 +125,8 @@ public class OrderGoodsVO {
@ApiModelProperty("'最晚接单时间'")
private String lastOrderTime;
@ApiModelProperty("'是否可编辑全部字段'")
private boolean editAllFlg;
@ApiModelProperty("是否暂停 0:否 1:是")
private Integer stopFlag;
@ApiModelProperty("结算账期 1拉运完成结 2月结")
private Integer settlementAccountPeriod;
}
\ No newline at end of file
......@@ -30,7 +30,7 @@ import java.time.ZoneOffset;
import java.util.*;
/**
*
* 货单最晚接单时间、最晚到达货源地时间处理
*/
@Component
@Slf4j
......@@ -64,6 +64,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo);
}
//根据货单最晚到达货源地时间处理
public void expireProduceByLastArriveSendTime(LocalDateTime localDateTime, String orderGoodsNo) {
redisTemplate.opsForZSet().add(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo, localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
}
......
......@@ -36,7 +36,7 @@ public class OrderGoodsSqlProvider {
" date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
" date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
"a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
"a.user_no,a.user_name");
"a.user_no,a.user_name,a.stop_flag,a.batch_number,a.last_arrive_receive_time,a.last_load_time,a.last_order_time,");
FROM("order_goods a");
if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论