From a3b72bdd43a1e61c2c08a65b1625106d2ac9d3bf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 18 三月 2024 16:31:38 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
index 9701512..0bc73b1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/CalibrationOrderMapper.java
@@ -24,6 +24,18 @@
List<Map<String, Object>> getPrecisionParameterList(@Param("equipmentId")String equipmentId);
/**
+ * 鑾峰彇褰撳墠鐧诲綍浜烘槸涓績鍙婂搴旂殑缂栫爜
+ * qsw 2024-3-18
+ */
+ String findProductionCode(@Param("userId") String userId);
+
+ /**
+ * 鏍规嵁妯″瀷浼犲叆鐨勭紪鐮� 鍒ゆ柇鏀圭紪鐮佸叕鍙�/涓績/宸ユ鐨勫摢涓�绾�
+ * qsw 2024-3-18
+ */
+ String findOrgType(@Param("productionCode") String productionCode);
+
+ /**
*棣栭〉鍏徃绾� 鎶�鏈姸鎬佹暟閲忕粺璁�
* qsw 2024-3-13
*/
@@ -54,33 +66,51 @@
List<Map<String, Object>> getFactoryNextNextMonthMaintenanceList();
/**
- *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ *棣栭〉鍏徃绾� 鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getFactoryThisMonthMaintenanceFinishList();
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鎶�鏈姸鎬佹暟閲忕粺璁�
* qsw 2024-3-13
*/
- List<Map<String, Object>> getEquipmentTechnologyStatusList(@Param("factoryModelId")String factoryModelId);
+ List<Map<String, Object>> getEquipmentTechnologyStatusList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
- *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ *棣栭〉锛堜簩绾ч〉闈級璁惧鎶ヤ慨鎯呭喌缁熻
* qsw 2024-3-13
*/
- List<Map<String, Object>> getReportRepairEquipmentList(@Param("factoryModelId")String factoryModelId);
+ List<Map<String, Object>> getReportRepairEquipmentList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
- *棣栭〉鏈湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚璁″垝
* qsw 2024-3-14
*/
- List<Map<String, Object>> getThisMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
+ List<Map<String, Object>> getThisMonthMaintenanceList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
- *棣栭〉涓嬫湀涓変繚璁″垝
+ *棣栭〉锛堜簩绾ч〉闈級涓嬫湀涓変繚璁″垝
* qsw 2024-3-14
*/
- List<Map<String, Object>> getNextMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
+ List<Map<String, Object>> getNextMonthMaintenanceList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
/**
- *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ *棣栭〉锛堜簩绾ч〉闈級涓嬩笅鏈堜笁淇濊鍒�
* qsw 2024-3-14
*/
- List<Map<String, Object>> getNextNextMonthMaintenanceList(@Param("factoryModelId")String factoryModelId);
+ List<Map<String, Object>> getNextNextMonthMaintenanceList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
+
+ /**
+ *棣栭〉锛堜簩绾ч〉闈級鏈湀涓変繚瀹屾垚鏁伴噺
+ * qsw 2024-3-14
+ */
+ List<Map<String, Object>> getThisMonthMaintenanceFinishList(@Param("workCenterId")String workCenterId,@Param("areaId")String areaId);
+
+ /**
+ *棣栭〉浜岀骇淇濆吇灞曠ず椤甸潰 鑾峰彇姣忎竴涓腑蹇冧笅浜岀骇淇濆吇璁″垝
+ * qsw 2024-3-15
+ */
+ List<Map<String, Object>> getCenterTwoMaintenancePlanList(@Param("workCenterId")String workCenterId);
}
--
Gitblit v1.9.3