|
|
@@ -354,11 +354,19 @@ public class MesProductController extends BaseController {
|
|
|
public Object screenPieceData() {
|
|
|
// 生产日按 08:30 分界：当前早于 08:30 归入前一生产日
|
|
|
// 窗口 [prodDay 08:30, prodDay+1 08:30)：白班(08:30~20:30) + 当晚夜班(20:30~次日08:30)
|
|
|
+ // 特例 08:30~12:00：扩展下界到 prodDay-1 20:30，让"夜班"格继续显示昨夜数据（直到 12:00 才清零）
|
|
|
java.time.LocalTime nowTime = java.time.LocalTime.now();
|
|
|
- LocalDate prodDay = nowTime.isBefore(java.time.LocalTime.of(8, 30))
|
|
|
+ java.time.LocalTime t0830 = java.time.LocalTime.of(8, 30);
|
|
|
+ java.time.LocalTime t1200 = java.time.LocalTime.of(12, 0);
|
|
|
+ LocalDate prodDay = nowTime.isBefore(t0830)
|
|
|
? LocalDate.now().minusDays(1) : LocalDate.now();
|
|
|
DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
- String dateStart = prodDay.format(fmt) + " 08:30:00";
|
|
|
+ String dateStart;
|
|
|
+ if (!nowTime.isBefore(t0830) && nowTime.isBefore(t1200)) {
|
|
|
+ dateStart = prodDay.minusDays(1).format(fmt) + " 20:30:00";
|
|
|
+ } else {
|
|
|
+ dateStart = prodDay.format(fmt) + " 08:30:00";
|
|
|
+ }
|
|
|
String dateEnd = prodDay.plusDays(1).format(fmt) + " 08:30:00";
|
|
|
|
|
|
String prefixConf = Global.getConfig("mes.piecework.product.prefixes");
|
wangxichen