From e483cad96a5c9d8191d7cd2c503d1b24e161e8c5 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 1 Nov 2024 19:01:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=97=A9=E6=99=9A=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java index 7a37c2f..5c5b64c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java @@ -134,7 +134,6 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getWorkCenterCode(), "workCenterCode", shiftPackBean); List shiftList = mesShiftRao.findByHqlWhere(shiftPackBean); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd"); Date date=new Date(); try { date = sdf.parse(sortInfo.getMatchTime()); @@ -152,12 +151,12 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder { long startTime = Long.parseLong(shift.getStartTime().replaceAll(":", "")); long endTime = Long.parseLong(shift.getEndTime().replaceAll(":", "")); if (startTime < endTime){ - if (shiftTime > startTime && shiftTime < endTime) { + if (shiftTime >= startTime && shiftTime < endTime) { mesWorkOrder.setShiftName(shift.getShiftName()); mesWorkOrder.setShiftCode(shift.getShiftCode()); } }else { - if (shiftTime < startTime && shiftTime > endTime) { + if (shiftTime <= startTime || shiftTime < endTime) { mesWorkOrder.setShiftName(shift.getShiftName()); mesWorkOrder.setShiftCode(shift.getShiftCode()); }