工单汇总需求变更

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.utils.BeanUtil;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderModel;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.SQLQuery;
 import org.hibernate.transform.Transformers;
@@ -34,15 +35,17 @@ 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, " +
-                " sum(case when work_order_status = 40 then complete_qty else qty end ) as qty  " +
+                " sum(case when work_order_status = 40 then 0 else qty end ) as qty  " +
                 " from mes_work_order where is_deleted=:isDeleted and is_valid = :isValid and organize_code = :organizeCode " +
-                " and work_order_type = 20 and order_flag !='P' and work_order_status != 10 and plan_start_time >= :today" +
+                " and work_order_type = :workOrderType and order_flag != :orderFlag and work_order_status in (20,40) and plan_start_time >= :today" +
                 " group by organize_code,part_no, date_format(plan_start_time, '%Y-%m-%d' ), 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("today", TimeTool.getToday());
+        query.setParameter("workOrderType", MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue());
+        query.setParameter("orderFlag", MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue());
         query.unwrap(SQLQuery.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
 
         List<HashMap<String, Object>> hashMaps = query.getResultList();