Commit graph

2581 commits

Author SHA1 Message Date
Bright
bb53d4ef63 สร้าง+แก้ไข ส่งชื่อคำสั่งเพิ่ม 2025-04-03 13:06:10 +07:00
mamoss
4b7ca5fbf4 comment where in gen 2025-04-03 11:43:43 +07:00
mamoss
9da9b812c1 แก้สถ่นะออกคำสั่ง 2025-04-03 11:17:05 +07:00
Bright
26a16c6833 fix issue #1354 2025-04-02 18:45:25 +07:00
Bright
8c2de2e7bf fix issue #1354 2025-04-02 18:11:35 +07:00
2faf631f7b fix view duplicate field name 2025-04-02 14:00:54 +07:00
mamoss
3c7c4fe214 migrate 2025-04-02 13:20:52 +07:00
mamoss
3b56a81a61 Merge branch 'main' into develop 2025-04-02 13:14:16 +07:00
mamoss
1af0cd483d Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-04-02 13:14:10 +07:00
mamoss
46d6ab106d edit search 2025-04-02 11:44:26 +07:00
mamoss
3e7a00e35d filter salary 2025-04-02 11:29:30 +07:00
Bright
3c889b8db6 Merge branch 'develop-Bright' into develop 2025-04-02 10:10:28 +07:00
Bright
0a217642a0 fix bug ออกคำสั่งไม่บันทืกลงทะเบียนประวัติ (เปลี่ยน type ตัวแปร refId) 2025-04-02 10:10:21 +07:00
7d23d00a06 add viewPosmaster 2025-04-02 10:01:00 +07:00
5d4727761f fix พ้นพนักงาน 2025-04-01 20:46:30 +07:00
mamoss
5f53769292 search retire 2025-04-01 15:00:13 +07:00
a03a53954c Merge branch 'develop' into adiDev 2025-04-01 14:31:27 +07:00
0a9fd9f07e update 2025-04-01 14:29:43 +07:00
mamoss
87337727eb Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-04-01 14:18:06 +07:00
mamoss
2a534b40c4 test migrste 2025-04-01 14:17:57 +07:00
26ef28f5cf Merge branch 'develop' into adiDev 2025-04-01 13:38:34 +07:00
68e0fb1e5a fix command 2025-04-01 13:37:32 +07:00
Methapon2001
ac5d6b015a feat: add message type to websocket 2025-04-01 11:35:16 +07:00
mamoss
68f680d841 edit path 2025-04-01 11:28:58 +07:00
mamoss
72bd27c9b0 status ช่วยราชการ 2025-04-01 11:14:42 +07:00
mamoss
aac393f6f8 check type object log 2025-04-01 00:38:04 +07:00
mamoss
23cc373e33 sort root 2025-03-31 17:45:00 +07:00
Bright
97c1f07a6a Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2025-03-31 17:36:21 +07:00
Bright
046f6bff85 ออกคำสั่งกลับรับราชการ ปั๊มฟิลด์ประเภท ระดับ ตำแหน่งใหม่ 2025-03-31 17:35:09 +07:00
Methapon2001
11f4636342 feat: add notification 2025-03-31 17:34:06 +07:00
Methapon2001
63aea8dc27 feat: socket target can also be string 2025-03-31 17:31:44 +07:00
Methapon2001
b2ac1878b9 feat: enable websocket 2025-03-31 16:59:14 +07:00
Bright
8cf13b8690 เพิ่ม return ฟิลด์ระดับตำแหน่ง, สังกัด 2025-03-31 11:25:25 +07:00
mamoss
968d5a2be4 เพิ่มปีคำสั่ง 2025-03-29 18:12:03 +07:00
mamoss
e88e143c4c profilesaalry admin 2025-03-29 17:09:17 +07:00
mamoss
6e5b3a927b sort salary admin 2025-03-29 16:59:59 +07:00
mamoss
013792c2ec Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-28 23:47:10 +07:00
mamoss
971ff7712f ส่งตัวกลับ 2025-03-28 23:47:02 +07:00
6c27dfe184 Merge branch 'develop' into adiDev 2025-03-28 16:25:37 +07:00
cc10973842 #1275,#1276 2025-03-28 16:24:26 +07:00
mamoss
a34f814eba Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-28 14:06:49 +07:00
mamoss
79e2785b38 name province 2025-03-28 14:06:38 +07:00
90d92f8d20 Merge branch 'develop' into adiDev 2025-03-28 13:59:16 +07:00
23cd5ea4b7 fix 2025-03-28 13:58:06 +07:00
mamoss
d281e37b2c Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-28 12:26:20 +07:00
mamoss
13e82ad80f edit subrank child1 2025-03-28 12:26:12 +07:00
Bright
3c33875748 fix 2025-03-28 12:10:12 +07:00
mamoss
1e33f6d4ea เพิ่มชื่อจังหวัด 2025-03-28 11:32:36 +07:00
27fe258408 Merge branch 'develop' into adiDev 2025-03-27 18:27:52 +07:00
bdd654089f #1290 (ข้อมูลเท่าที่ where ได้) 2025-03-27 18:26:37 +07:00