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

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesWorkOrderDaoImpl.java

@@ -34,15 +34,20 @@ public class MesWorkOrderDaoImpl implements IMesWorkOrderDao {
 
     @Override
     public List<MesWorkOrderModel> sumMesWorkOrderQtyToSap(String organizeCode) {
-        StringBuffer hql = new StringBuffer("select organize_code as organizeCode,part_no as partNo, date_format(plan_start_time, '%Y-%m-%d' ) as planStartTime, product_version as productVersion, " +
+        StringBuffer hql = new StringBuffer("select workOrder.organize_code as organizeCode,workOrder.part_no as partNo, " +
-                " sum(case when work_order_status = 40 then reported_qty else qty end ) as qty  " +
+                " date_format(workOrder.plan_start_time, '%Y-%m-%d' ) as planStartTime, workOrder.product_version as productVersion, " +
-                " from mes_work_order where is_deleted=:isDeleted and is_valid = :isValid and organize_code = :organizeCode " +
+                " sum(case when workOrder.work_order_status = 40 then workOrder.reported_qty else workOrder.qty end ) as qty  " +
-                " and work_order_type = :workOrderType and order_flag != :orderFlag and work_order_status in (20,30,40,50) and plan_start_time >= :today" +
+                " from mes_work_order as workOrder left join mes_part_sap as partSap on workOrder.part_no = partSap.part_no" +
-                " group by organize_code,part_no, date_format(plan_start_time, '%Y-%m-%d' ), product_version ");
+                " where workOrder.is_deleted=:isDeleted and workOrder.is_valid = :isValid and workOrder.organize_code = :organizeCode " +
+                " and partSap.is_deleted=:isDeleted and partSap.is_valid = :isValid and partSap.organize_code = :organizeCode " +
+                " and partSap.is_test_piece = :isTestPiece and workOrder.work_order_type = :workOrderType and workOrder.order_flag != :orderFlag " +
+                " and workOrder.work_order_status in (20,30,40,50) and workOrder.plan_start_time >= :today" +
+                " group by workOrder.organize_code,workOrder.part_no, date_format(workOrder.plan_start_time, '%Y-%m-%d' ), workOrder.product_version ");
         Query query = entityManager.createNativeQuery(hql.toString());
         query.setParameter("organizeCode", organizeCode);
         query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+        query.setParameter("isTestPiece", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         query.setParameter("today", TimeTool.getToday());
         query.setParameter("workOrderType", MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue());
         query.setParameter("orderFlag", MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue());

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java

@@ -85,7 +85,7 @@ public class MesQmsScrapJob extends BaseMesScheduleJob {
 
                     for (MesPartInspection mesPartInspection : mesPartInspectionList) {
                         mesPartInspection.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
-                        ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB);
+//                        ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB);
                     }
                     partInspectionRepository.saveAll(mesPartInspectionList);
                 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java

@@ -80,13 +80,13 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob {
 //                        new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1)) + " 00:00:00",
 //                        TimeTool.getToday() + " 00:00:00", "createDatetime", packBean, true);
                 // 获取当前时间前1小时的时间
-                LocalDateTime now = LocalDateTime.now();
+//                LocalDateTime now = LocalDateTime.now();
-                LocalDateTime oneHourAgo = now.minusHours(1);
+//                LocalDateTime oneHourAgo = now.minusHours(1);
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+//                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                String formattedNow = now.format(formatter);
+//                String formattedNow = now.format(formatter);
-                String formattedOneHourAgo = oneHourAgo.format(formatter);
+//                String formattedOneHourAgo = oneHourAgo.format(formatter);
+//                DdlPreparedPack.timeBuilder(formattedOneHourAgo, formattedNow, "createDatetime", packBean, true);
                 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "qmsSync", packBean);
-                DdlPreparedPack.timeBuilder(formattedOneHourAgo, formattedNow, "createDatetime", packBean, true);
 
                 List<MesPartInspection> mesPartInspectionList = partInspectionRepository.findByHqlWhere(packBean);
                 if (!CollectionUtils.isEmpty(mesPartInspectionList)) {
@@ -113,8 +113,9 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob {
                     qmsSuspiciousService.doQmsSuspiciousByPartInspection(partInspectionList, organizeCode);
 
                     for (MesPartInspection mesPartInspection : mesPartInspectionList) {
-                        mesPartInspection.setQmsSync(1);
+                        mesPartInspection.setQmsSync(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
-                        ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB);
+                        //42959 QMS可疑品汇总job 会把电子化检验终检人和终检时间覆盖掉
+//                        ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB);
                     }
                     partInspectionRepository.saveAll(mesPartInspectionList);
                 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordServiceImpl.java

@@ -155,7 +155,7 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
         }
 
         if (!StringUtil.isEmpty(mesProductionRecord.getWorkCenterCode())) {
-            sql += " and mpr.work_center_code ='" + mesProductionRecord.getWorkCenterCode() + "' ";
+            sql += " and mpr.work_center_code like '%" + mesProductionRecord.getWorkCenterCode() + "%' ";
         }
 
         if (!StringUtil.isEmpty(mesProductionRecord.getShiftCode())) {
@@ -163,7 +163,7 @@ public class MesProductionRecordServiceImpl extends BaseMesService<MesProduction
         }
 
         if (!StringUtil.isEmpty(mesProductionRecord.getWorkCellCode())) {
-            sql += " and mpr.work_cell_code ='" + mesProductionRecord.getWorkCellCode() + "' ";
+            sql += " and mpr.work_cell_code like '%" + mesProductionRecord.getWorkCellCode() + "%' ";
         }
 
         if (!StringUtil.isEmpty(mesProductionRecord.getEquipmentName())) {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -483,7 +483,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         } catch (ImppBusiException busExcep) {
             MesException.throwMesBusiException(busExcep.getErrorDetail());
         } catch (Exception e) {
-            MesException.throwMesBusiException("计划日期格式异常");
+            MesException.throwMesBusiException("计划日期格式异常，日期格式应为:%s",DateUtil.SHORT_FORMAT);
         }
         //查询班次信息
         List<MesShift> mesShifts = mesShiftMap.get(item.getWorkCenterCode() + item.getShiftCode());
@@ -847,12 +847,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         //查询物料信息
         MesPart mesPart = iMesPartService.getPartByPartNo(mesWorkOrderDb.getPartNo(), mesWorkOrderDb.getOrganizeCode());
         //查询产线信息
-        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrderDb.getOrganizeCode());
+        MesWorkCenter mesWorkCenter = getMesWorkCenter(mesWorkOrderDb.getOrganizeCode(),mesWorkOrderDb.getWorkCenterCode());
-        DdlPreparedPack.getStringEqualPack(mesWorkOrderDb.getWorkCenterCode(), "workCenterCode", ddlPackBean);
-        MesWorkCenter mesWorkCenter = mesWorkCenterRDao.getByProperty(ddlPackBean);
-        if (Objects.isNull(mesWorkCenter)) {
-            MesException.throwMesBusiException("产线【%s】不存在", mesWorkOrderDb.getWorkCenterCode());
-        }
         //获取生产版本
         MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrderDb);
         //物料+生产版本获取bom信息
@@ -864,25 +859,22 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             double unCompleteQty = MathOperation.sub(mesWorkOrderDb.getQty(), mesWorkOrderDb.getReportedQty());
             mesWorkOrderDb.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0);
             if (mesWorkOrderDb.getReportedQty() > mesWorkOrderDb.getQty()) {
-                //查询产线信息
-                DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode());
-                DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
-                MesWorkCenter workCenter = mesWorkCenterRDao.getByProperty(packBean);
                 // 以下则是超工单逻辑
                 // 如果产线中没有配置超工单，则直接阻断
-                if (!Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), workCenter.getIsCheckOrderQty())) {
+                if (!Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), mesWorkCenter.getIsCheckOrderQty())) {
                     MesException.throwMesBusiException("请检查工单数量,工单号[%s],工单数量[%s]报工数量[%s],且未配置超工单!", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getQty(), mesWorkOrder.getReportedQty());
                 }
                 // 如果配置了超工单，且比例已经超过了配置的超工单比例，也需要阻断
                 double rate =  MathOperation.div((mesWorkOrderDb.getReportedQty() - mesWorkOrderDb.getQty()),mesWorkOrderDb.getQty());
-                if (rate > MathOperation.div(workCenter.getOrderRate(),100)) {
+                if (rate > MathOperation.div(mesWorkCenter.getOrderRate(),100)) {
-                    MesException.throwMesBusiException("请检查工单数量,工单号[%s],工单数量[%s]报工数量[%s],配置了超工单,但超过了比例[%s]!", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getQty(), mesWorkOrder.getReportedQty(), workCenter.getOrderRate());
+                    MesException.throwMesBusiException("请检查工单数量,工单号[%s],工单数量[%s]报工数量[%s],配置了超工单,但超过了比例[%s]!", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getQty(), mesWorkOrder.getReportedQty(), mesWorkCenter.getOrderRate());
                 }
                 mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
             } else if (Objects.equals(mesWorkOrderDb.getReportedQty(), mesWorkOrderDb.getQty())) {
                 mesWorkOrderDb.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.COMPLETE.getValue());
             } else {
-                mesWorkOrderDb.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
+                mesWorkOrderDb.setWorkOrderStatus(mesWorkOrder.getWorkOrderStatus()==MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()?
+                        MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue():MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
             }
             mesWorkOrderDb.setCompleteQty(mesWorkOrderDb.getReportedQty());
         } else {
@@ -902,7 +894,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             String sn = getStringList(mesWorkOrder);
             //保存数据
             List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
-            String nowTime = TimeTool.getNowTime(true);
+            String nowTime = StringUtil.isEmpty(mesWorkOrder.getDescription())?TimeTool.getNowTime(true):mesWorkOrder.getDescription();
+
             for (MesBom mesBom : mesBoms) {
                 mesProductOffLineList.add(creatMesProductOffLine(mesWorkOrder, mesProductVersion, sn, mesBom, false,nowTime));
             }
@@ -921,6 +914,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         if (mesWorkOrderNew.getNum() <= 0) {
             MesException.throwMesBusiException("工单报工数量不能为0,不允许报工");
         }
+        //查询产线信息
+        MesWorkCenter workCenter = getMesWorkCenter(mesWorkOrder.getOrganizeCode(),mesWorkOrder.getWorkCenterCode());
         //报工类型
         //报工
         if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrderNew.getReportType()) {
@@ -929,10 +924,6 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             double unCompleteQty = MathOperation.sub(mesWorkOrder.getQty(), mesWorkOrder.getReportedQty());
             mesWorkOrder.setUnCompleteQty(unCompleteQty > 0 ? unCompleteQty : 0);
             if (mesWorkOrder.getReportedQty() > mesWorkOrder.getQty()) {
-                //查询产线信息
-                DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode());
-                DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", ddlPackBean);
-                MesWorkCenter workCenter = mesWorkCenterRDao.getByProperty(ddlPackBean);
                 // 以下则是超工单逻辑
                 // 如果产线中没有配置超工单，则直接阻断
                 if (!Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), workCenter.getIsCheckOrderQty())) {
@@ -1285,6 +1276,15 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         return newMesProductOffLine;
     }
 
+
+    private MesWorkCenter getMesWorkCenter(String organizeCode,String workCenterCode) {
+        MesWorkCenter mesWorkCenter = workCenterService.getWorkCenterDb(organizeCode, workCenterCode);
+        if (Objects.isNull(mesWorkCenter)) {
+            MesException.throwMesBusiException("产线【%s】不存在", workCenterCode);
+        }
+        return mesWorkCenter;
+    }
+
     @Override
     public List<MesWorkOrderModel> sumMesWorkOrderQtyToSap(String organizeCode) {
         //查询汇总工单数量

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.StringJoiner;
 
 @Service
@@ -29,9 +30,17 @@ public class MesEquipmentLogDetailService extends BaseMesService<MesEquipmentLog
         DdlPreparedPack.getStringEqualPack(new StringJoiner(MesExtConstWords.E_UNDERLINE).add(bean.getOrganizeCode()).add(bean.getEquipId().toString()).toString(), MesExtConstWords.ORG_EQUIP_ID, packBean);
 //        DdlPreparedPack.getNumEqualPack(bean.getEquipId(), MesExtConstWords.EQUIP_ID, packBean);
         DdlPreparedPack.getNumEqualPack(bean.getVariableType(), MesExtConstWords.VARIABLE_TYPE, packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
+        if(!StringUtils.isEmpty(bean.getEquipVariableId().toString().contains(","))){
+            DdlPreparedPack.getInPackList(Arrays.asList(bean.getEquipVariableId().toString().split(",")), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
+        }else {
+            DdlPreparedPack.getNumEqualPack(bean.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
+        }
+        if(!StringUtils.isEmpty(bean.getEquipVariableName().contains(","))){
+            DdlPreparedPack.getInPackList(Arrays.asList(bean.getEquipVariableName().split(",")), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
+        }else {
+            DdlPreparedPack.getStringLikerPack(bean.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
+        }
 //        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), MesExtConstWords.EQUIPMENT_CODE, packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
         DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
     }