From ab5afff6e039ab0ae8047828665ba3e87ec8a214 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Fri, 25 Aug 2023 12:27:12 +0700
Subject: [PATCH] Add API Create command For C-PM-10 to C-PM-17

---
 .../Controllers/OrderController.cs            | 788 ++++++++++++++++++
 .../Requests/CreateCommandGroup0Request.cs    |  23 +
 .../Requests/CreateCommandGroup10Request.cs   |  27 +
 .../Requests/CreateCommandGroup6Request.cs    |  43 +
 .../Requests/CreateCommandGroup7Request.cs    |  29 +
 .../Requests/CreateCommandGroup8Request.cs    |  25 +
 .../Requests/CreateCommandGroup9Request.cs    |  31 +
 .../Models/Commands/Core/Command.cs           |  66 ++
 ...8-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp | Bin 28996 -> 29003 bytes
 9 files changed, 1032 insertions(+)
 create mode 100644 BMA.EHR.Command.Service/Requests/CreateCommandGroup0Request.cs
 create mode 100644 BMA.EHR.Command.Service/Requests/CreateCommandGroup10Request.cs
 create mode 100644 BMA.EHR.Command.Service/Requests/CreateCommandGroup6Request.cs
 create mode 100644 BMA.EHR.Command.Service/Requests/CreateCommandGroup7Request.cs
 create mode 100644 BMA.EHR.Command.Service/Requests/CreateCommandGroup8Request.cs
 create mode 100644 BMA.EHR.Command.Service/Requests/CreateCommandGroup9Request.cs

diff --git a/BMA.EHR.Command.Service/Controllers/OrderController.cs b/BMA.EHR.Command.Service/Controllers/OrderController.cs
index 75b6f527..e77d2419 100644
--- a/BMA.EHR.Command.Service/Controllers/OrderController.cs
+++ b/BMA.EHR.Command.Service/Controllers/OrderController.cs
@@ -1295,6 +1295,794 @@ namespace BMA.EHR.Command.Service.Controllers
 
         #endregion
 
+        #region " C-PM-10 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-10
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-10/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType10Async([FromBody] CreateCommandGroup6Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+
+                    PlacementCommandIssuer = req.placementCommandIssuer,
+                    PlacementCommandNo = req.placementCommandNo,
+                    PlacementCommandDate = req.placementCommandDate,
+                    PlacementPositionName = req.placementPositionName,
+                    PlacementOrganizationName = req.placementOrganizationName,
+                    ProbationStartDate = req.probationStartDate,
+                    ProbationEndDate = req.probationEndDate,
+                    ChairManFullName = req.chairManFullName,
+                    Member1FullName = req.member1FullName,
+                    Member2FullName = req.member2FullName,
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-10
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-10/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType10Async(Guid orderId, [FromBody] CreateCommandGroup6Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                order.PlacementCommandIssuer = req.placementCommandIssuer;
+                order.PlacementCommandNo = req.placementCommandNo;
+                order.PlacementCommandDate = req.placementCommandDate;
+                order.PlacementPositionName = req.placementPositionName;
+                order.PlacementOrganizationName = req.placementOrganizationName;
+                order.ProbationStartDate = req.probationStartDate;
+                order.ProbationEndDate = req.probationEndDate;
+                order.ChairManFullName = req.chairManFullName;
+                order.Member1FullName = req.member1FullName;
+                order.Member2FullName = req.member2FullName;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region " C-PM-11 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-11
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-11/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType11Async([FromBody] CreateCommandGroup7Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+
+                    PlacementCommandIssuer = req.placementCommandIssuer,
+                    PlacementCommandNo = req.placementCommandNo,
+                    PlacementCommandDate = req.placementCommandDate,
+                    
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-11
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-11/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType11Async(Guid orderId, [FromBody] CreateCommandGroup7Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                order.PlacementCommandIssuer = req.placementCommandIssuer;
+                order.PlacementCommandNo = req.placementCommandNo;
+                order.PlacementCommandDate = req.placementCommandDate;               
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region " C-PM-12 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-12
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-12/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType12Async([FromBody] CreateCommandGroup7Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+
+                    PlacementCommandIssuer = req.placementCommandIssuer,
+                    PlacementCommandNo = req.placementCommandNo,
+                    PlacementCommandDate = req.placementCommandDate,
+
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-12
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-12/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType12Async(Guid orderId, [FromBody] CreateCommandGroup7Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                order.PlacementCommandIssuer = req.placementCommandIssuer;
+                order.PlacementCommandNo = req.placementCommandNo;
+                order.PlacementCommandDate = req.placementCommandDate;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+        
+        #region " C-PM-13 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-13
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-13/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType13Async([FromBody] CreateCommandGroup8Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+
+                    ReceiveOrganizationName = req.receiveOrganizationName,
+
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-13
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-13/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType13Async(Guid orderId, [FromBody] CreateCommandGroup8Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                order.ReceiveOrganizationName = req.receiveOrganizationName;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region " C-PM-14 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-14
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-14/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType14Async([FromBody] CreateCommandGroup9Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+
+                    TransferOrganizationName = req.transferOrganizationName,
+                    ConclusionReceiveNo = req.conclusionReceiveNo,
+                    ConclusionReceiveDate = req.conclusionReceiveDate,
+
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-14
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-14/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType14Async(Guid orderId, [FromBody] CreateCommandGroup9Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                order.TransferOrganizationName = req.transferOrganizationName;
+                order.ConclusionReceiveNo = req.conclusionReceiveNo;
+                order.ConclusionReceiveDate = req.conclusionReceiveDate;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region " C-PM-15 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-15
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-15/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType15Async([FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-15
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-15/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType15Async(Guid orderId, [FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region " C-PM-16 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-16
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-16/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType16Async([FromBody] CreateCommandGroup10Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+
+                    GovAidCommandNo = req.govAidCommandNo,
+                    GovAidCommandDate = req.govAidCommandDate,
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-16
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-16/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType16Async(Guid orderId, [FromBody] CreateCommandGroup10Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                order.GovAidCommandNo = req.govAidCommandNo;
+                order.GovAidCommandDate = req.govAidCommandDate;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
+        #region " C-PM-17 "
+
+        /// <summary>
+        /// PM7-22 : สร้างข้อมูลรายละเอียดการออกคำสั่ง C-PM-17
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("c-pm-17/detail")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PostType17Async([FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+
+                var inserted = new Domain.Models.Commands.Core.Command
+                {
+                    CommandNo = req.orderNo,
+                    CommandYear = req.orderYear.ToString(),
+                    CommandSubject = req.orderTitle,
+                    CommandTypeId = req.orderTypeValue,
+                    IssuerOrganizationId = req.orderBy,
+                    IssuerOrganizationName = req.orderByOrganizationName,
+                    AuthorizedUserFullName = req.signatoryBy,
+                    AuthorizedPosition = req.signatoryPosition,
+
+                    CommandAffectDate = req.orderDate,
+                    OwnerGovId = OcId,
+                };
+
+                var result = await _repository.AddAsync(inserted);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// PM7-23 : แก้ไขข้อมูลรายละเอียดการออกคำสั่ง C-PM-17
+        /// </summary>
+        /// <param name="orderId">Record Id ของคำสั่ง</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("c-pm-17/detail/{orderId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PutType17Async(Guid orderId, [FromBody] CreateCommandGroup0Request req)
+        {
+            try
+            {
+                var order = await _repository.GetByIdAsync(orderId);
+                if (order == null)
+                    throw new Exception(GlobalMessages.CommandNotFound);
+
+
+                var commandType = await _commandTypeRepository.GetByIdAsync(req.orderTypeValue);
+                var status = await _commandStatusRepository.GetByIdAsync(order.CommandStatusId);
+
+                order.CommandNo = req.orderNo;
+                order.CommandYear = req.orderYear.ToString();
+                order.CommandSubject = req.orderTitle;
+                order.CommandType = commandType!;
+                order.IssuerOrganizationId = req.orderBy;
+                order.IssuerOrganizationName = req.orderByOrganizationName;
+                order.AuthorizedUserFullName = req.signatoryBy;
+                order.AuthorizedPosition = req.signatoryPosition;
+                order.CommandStatus = status!;
+                order.CommandAffectDate = req.orderDate;
+
+                var result = await _repository.UpdateAsync(order);
+
+                return Success(result);
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        #endregion
+
         #endregion
 
         /// <summary>
diff --git a/BMA.EHR.Command.Service/Requests/CreateCommandGroup0Request.cs b/BMA.EHR.Command.Service/Requests/CreateCommandGroup0Request.cs
new file mode 100644
index 00000000..17b9817b
--- /dev/null
+++ b/BMA.EHR.Command.Service/Requests/CreateCommandGroup0Request.cs
@@ -0,0 +1,23 @@
+namespace BMA.EHR.Command.Service.Requests
+{
+    public class CreateCommandGroup0Request
+    {
+        public Guid orderTypeValue { get; set; }
+
+        public string orderTitle { get; set; } = string.Empty;
+
+        public string orderNo { get; set; } = string.Empty;
+
+        public int orderYear { get; set; }
+
+        public DateTime orderDate { get; set; }
+
+        public Guid orderBy { get; set; }
+
+        public string orderByOrganizationName { get; set; } = string.Empty;
+
+        public string signatoryBy { get; set; } = string.Empty;
+
+        public string signatoryPosition { get; set; } = string.Empty;
+    }
+}
diff --git a/BMA.EHR.Command.Service/Requests/CreateCommandGroup10Request.cs b/BMA.EHR.Command.Service/Requests/CreateCommandGroup10Request.cs
new file mode 100644
index 00000000..91df5ac8
--- /dev/null
+++ b/BMA.EHR.Command.Service/Requests/CreateCommandGroup10Request.cs
@@ -0,0 +1,27 @@
+namespace BMA.EHR.Command.Service.Requests
+{
+    public class CreateCommandGroup10Request
+    {
+        public Guid orderTypeValue { get; set; }
+
+        public string orderTitle { get; set; } = string.Empty;
+
+        public string orderNo { get; set; } = string.Empty;
+
+        public int orderYear { get; set; }
+
+        public DateTime orderDate { get; set; }
+
+        public Guid orderBy { get; set; }
+
+        public string orderByOrganizationName { get; set; } = string.Empty;
+
+        public string signatoryBy { get; set; } = string.Empty;
+
+        public string signatoryPosition { get; set; } = string.Empty;
+
+        public string govAidCommandNo { get; set; }
+
+        public DateTime govAidCommandDate { get; set; }
+    }
+}
diff --git a/BMA.EHR.Command.Service/Requests/CreateCommandGroup6Request.cs b/BMA.EHR.Command.Service/Requests/CreateCommandGroup6Request.cs
new file mode 100644
index 00000000..084a1818
--- /dev/null
+++ b/BMA.EHR.Command.Service/Requests/CreateCommandGroup6Request.cs
@@ -0,0 +1,43 @@
+namespace BMA.EHR.Command.Service.Requests
+{
+    public class CreateCommandGroup6Request
+    {
+        public Guid orderTypeValue { get; set; }
+
+        public string orderTitle { get; set; } = string.Empty;
+
+        public string orderNo { get; set; } = string.Empty;
+
+        public int orderYear { get; set; }
+
+        public DateTime orderDate { get; set; }
+
+        public Guid orderBy { get; set; }
+
+        public string orderByOrganizationName { get; set; } = string.Empty;
+
+        public string signatoryBy { get; set; } = string.Empty;
+
+        public string signatoryPosition { get; set; } = string.Empty;
+
+        public string placementCommandIssuer { get; set; }
+
+        public string placementCommandNo { get; set; }
+
+        public DateTime placementCommandDate { get; set; }
+
+        public string placementPositionName { get; set; }
+
+        public string placementOrganizationName { get; set; }
+
+        public DateTime probationStartDate { get; set; }
+
+        public DateTime probationEndDate { get; set; }
+
+        public string chairManFullName { get; set; }
+
+        public string member1FullName { get; set; }
+
+        public string member2FullName { get; set; }
+    }
+}
diff --git a/BMA.EHR.Command.Service/Requests/CreateCommandGroup7Request.cs b/BMA.EHR.Command.Service/Requests/CreateCommandGroup7Request.cs
new file mode 100644
index 00000000..c6bcb8b5
--- /dev/null
+++ b/BMA.EHR.Command.Service/Requests/CreateCommandGroup7Request.cs
@@ -0,0 +1,29 @@
+namespace BMA.EHR.Command.Service.Requests
+{
+    public class CreateCommandGroup7Request
+    {
+        public Guid orderTypeValue { get; set; }
+
+        public string orderTitle { get; set; } = string.Empty;
+
+        public string orderNo { get; set; } = string.Empty;
+
+        public int orderYear { get; set; }
+
+        public DateTime orderDate { get; set; }
+
+        public Guid orderBy { get; set; }
+
+        public string orderByOrganizationName { get; set; } = string.Empty;
+
+        public string signatoryBy { get; set; } = string.Empty;
+
+        public string signatoryPosition { get; set; } = string.Empty;
+
+        public string placementCommandIssuer { get; set; }
+
+        public string placementCommandNo { get; set; }
+
+        public DateTime placementCommandDate { get; set; }
+    }
+}
diff --git a/BMA.EHR.Command.Service/Requests/CreateCommandGroup8Request.cs b/BMA.EHR.Command.Service/Requests/CreateCommandGroup8Request.cs
new file mode 100644
index 00000000..88e8c5de
--- /dev/null
+++ b/BMA.EHR.Command.Service/Requests/CreateCommandGroup8Request.cs
@@ -0,0 +1,25 @@
+namespace BMA.EHR.Command.Service.Requests
+{
+    public class CreateCommandGroup8Request
+    {
+        public Guid orderTypeValue { get; set; }
+
+        public string orderTitle { get; set; } = string.Empty;
+
+        public string orderNo { get; set; } = string.Empty;
+
+        public int orderYear { get; set; }
+
+        public DateTime orderDate { get; set; }
+
+        public Guid orderBy { get; set; }
+
+        public string orderByOrganizationName { get; set; } = string.Empty;
+
+        public string signatoryBy { get; set; } = string.Empty;
+
+        public string signatoryPosition { get; set; } = string.Empty;
+
+        public string receiveOrganizationName { get; set; }
+    }
+}
diff --git a/BMA.EHR.Command.Service/Requests/CreateCommandGroup9Request.cs b/BMA.EHR.Command.Service/Requests/CreateCommandGroup9Request.cs
new file mode 100644
index 00000000..52889232
--- /dev/null
+++ b/BMA.EHR.Command.Service/Requests/CreateCommandGroup9Request.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Command.Service.Requests
+{
+    public class CreateCommandGroup9Request
+    {
+        public Guid orderTypeValue { get; set; }
+
+        public string orderTitle { get; set; } = string.Empty;
+
+        public string orderNo { get; set; } = string.Empty;
+
+        public int orderYear { get; set; }
+
+        public DateTime orderDate { get; set; }
+
+        public Guid orderBy { get; set; }
+
+        public string orderByOrganizationName { get; set; } = string.Empty;
+
+        public string signatoryBy { get; set; } = string.Empty;
+
+        public string signatoryPosition { get; set; } = string.Empty;
+
+        public string transferOrganizationName { get; set; }
+
+        public string? conclusionReceiveNo { get; set; }
+
+        public DateTime? conclusionReceiveDate { get; set; }
+    }
+}
diff --git a/BMA.EHR.Domain/Models/Commands/Core/Command.cs b/BMA.EHR.Domain/Models/Commands/Core/Command.cs
index 0f991980..173e77b1 100644
--- a/BMA.EHR.Domain/Models/Commands/Core/Command.cs
+++ b/BMA.EHR.Domain/Models/Commands/Core/Command.cs
@@ -103,6 +103,72 @@ namespace BMA.EHR.Domain.Models.Commands.Core
 
         #endregion
 
+        #region " C-PM-10,C-PM-11,C-PM-12 "
+
+        [Comment("หน่วยงานที่ออกคำสั่งบรรจุ")]
+        public string? PlacementCommandIssuer { get; set; }
+
+        [Comment("เลขที่คำสั่งบรรจุ")]
+        public string? PlacementCommandNo { get; set; }
+
+        [Comment("คำสั่งบรรจุลงวันที่")]
+        public DateTime? PlacementCommandDate { get; set; }
+
+        #endregion
+
+        #region " C-PM-10 "
+
+        [Comment("ตำแหน่งที่บรรจุ")]
+        public string? PlacementPositionName { get; set; }
+
+        [Comment("สังกัดที่บรรจุ")]
+        public string? PlacementOrganizationName { get; set; }
+
+        [Comment("วันที่เริ่มทดลองปฏิบัติราชการ")]
+        public DateTime? ProbationStartDate { get; set; }
+
+        [Comment("วันที่สิ้นสุดการทดลองปฏิบัติราชการ")]
+        public DateTime? ProbationEndDate { get; set; }
+
+        [Comment("ประธานคณะกรรมการ")]
+        public string? ChairManFullName { get; set; }
+
+        [Comment("กรรมการคนที่ 1")]
+        public string? Member1FullName { get; set; }
+
+        [Comment("กรรมการคนที่ 2")]
+        public string? Member2FullName { get; set; }
+
+        #endregion
+
+        #region " C-PM-13 "
+
+        [Comment("ส่วนราชการที่รับโอน")]
+        public string? ReceiveOrganizationName { get; set; }
+
+        #endregion
+
+        #region " C-PM-14 "
+
+        [Comment("ส่วนราชการที่ให้โอน")]
+        public string? TransferOrganizationName { get; set; }
+
+        [Comment("มติ กก. ครั้งที่ (การรับโอน)")]
+        public string? ConclusionReceiveNo { get; set; }
+
+        [Comment("ลงวันที่ (การรับโอน)")]
+        public DateTime? ConclusionReceiveDate { get; set; }
+
+        #endregion
+
+        #region " C-PM-16 "
+
+        public string? GovAidCommandNo { get; set; }
+
+        public DateTime? GovAidCommandDate { get; set; }
+
+        #endregion
+
         public virtual List<CommandDocument> Documents { get; set; } = new();
 
         public virtual List<CommandReceiver> Receivers { get; set; }
diff --git a/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp b/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp
index 07383996ba960c00ea9215c2a3d90c9e4d9a047e..bc4f20d5075477cb444330a9cf79858acc9bf4a6 100644
GIT binary patch
delta 1815
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
F001n#UUmQg

delta 1830
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
U000000C<xhaV7?5Z~y=R0B^!=vj6}9