Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

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<MesShift> 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());
                     }