42777 报工调整报表新增 批量报工 + 报工调整

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

@@ -55,6 +55,9 @@ public class MesWorkOrderLogService extends BaseMesService<MesWorkOrderLog> impl
                 " wol.work_order_type as workOrderType," +
                 " wol.work_order_seq as workOrderSeq," +
                 " wol.cust_part_no as custPartNo," +
+                " wol.part_no as partNo," +
+                " wol.part_name as partName," +
+                " wol.type as type," +
                 " wol.qty as qty,"+
                 " wol.area_code as areaCode," +
                 " wol.work_center_code as workCenterCode," +
@@ -89,6 +92,11 @@ public class MesWorkOrderLogService extends BaseMesService<MesWorkOrderLog> impl
         if (!StringUtil.isEmpty(mesWorkOrderLog.getWorkCenterCode())) {
             sql += " and wol.work_center_code ='" + mesWorkOrderLog.getWorkCenterCode() + "' ";
         }
+        if (!StringUtil.isEmpty(mesWorkOrderLog.getType())) {
+            sql += " and wol.type ='" + mesWorkOrderLog.getType() + "' ";
+        }else {
+            sql += " and wol.type in ('30','40') ";
+        }
         sql += "  ORDER BY wol.modify_date_time desc,work_order_no  ";
 
         Query queryObject = entityManager.createNativeQuery(commHql + sql);