<<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD queryPendingOrderList queryDispatchCount receiveOrders auto rr dateNow nowDate RepairDispatchRecord rat Vo querySystemMessagePage repairDispatchRecordService insertDispatchBatch inserBatchSystemMessage request repairEvaluateService repairSystemMessagesService repairUserService repairRecordService queryPendingOrder autoDispatchUser RepairAdmin rsms openid WxOpenidConfig Scan getRepairsShiftIdByHour 好评执行成功了一次 queryEvaluateList 自动派单失败！ ======= alterPrice( 维修单不是待确认状态，无法进行改价操作 goodsList details getRepairsByRecordIds getRepairsByRecordId >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 getTechniciansByUserId queryTeamWorkPage pay( 报价 changeMaintenanceConsumables transfer( queryManagePage rdr queryTimeoutReportExport reportExport 提交订单 该物品已存在 getRepairArticleTypeByName .getRepairByName updateRepairAreaById queryAreaByName updateRepairArticleTypeById QueryArticleTypeTreeRecords EXISTS tran dropDown FIND_IN_SET(rat.id,ru.article_id) FIND_IN_SET(rat.parent_id,ru.article_id) .autoDispatchUser <<<<<<< HEAD String dateS receiveOwnOrders getRepairsByShiftIds dateHour getRepairByUserId t1 ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff jr <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff 1696037190094 <<<<<<< HEAD 1688462584849 ======= 1696037190094 <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java 419 file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java 1230 <<<<<<< HEAD file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairRecordServiceImpl.java 43 file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java 117 file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/DelayedUtils.java 128 file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java 26 file://$PROJECT_DIR$/src/main/java/com/repair/scheduled/SystemScheduled.java 73 file://$PROJECT_DIR$/src/main/java/com/repair/scheduled/SystemScheduled.java 84 file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java 22 file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java 36 file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java 44 ======= >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java 358 file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAreaController.java 64 >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 <<<<<<< HEAD ======= >>>>>>> ad80b4e35f8af32a80da24920b5f5775bb80cda3 1.8