From 01dc27099e1182c13b3d93da223b90905b656a52 Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 21 Feb 2025 23:48:11 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=95?= =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release_Retirement.yaml | 72 +++++++++---------- .github/workflows/release_discipline.yaml | 72 +++++++++---------- .github/workflows/release_placement.yaml | 72 +++++++++---------- .../PlacementAppointmentController.cs | 10 +-- .../Controllers/PlacementController.cs | 10 +-- .../Controllers/PlacementOfficerController.cs | 2 +- .../Controllers/PlacementReceiveController.cs | 2 +- .../PlacementRepatriationController.cs | 2 +- .../PlacementTransferController.cs | 2 +- .../Controllers/RetirementOtherController.cs | 4 +- .../Controllers/RetirementOutController.cs | 2 +- .../Controllers/RetirementResignController.cs | 4 +- .../RetirementResignEmployeeController.cs | 4 +- 13 files changed, 129 insertions(+), 129 deletions(-) diff --git a/.github/workflows/release_Retirement.yaml b/.github/workflows/release_Retirement.yaml index 4d644cb3..18051f4e 100644 --- a/.github/workflows/release_Retirement.yaml +++ b/.github/workflows/release_Retirement.yaml @@ -68,40 +68,40 @@ jobs: docker compose pull docker compose up -d echo "${{ steps.gen_ver.outputs.image_ver }}"> success - - name: Notify Discord Success - if: success() - run: | - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": "✅ Deployment Success!", - "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", - "color": 3066993, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/success-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ secrets.DISCORD_WEBHOOK }} + # - name: Notify Discord Success + # if: success() + # run: | + # curl -H "Content-Type: application/json" \ + # -X POST \ + # -d '{ + # "embeds": [{ + # "title": "✅ Deployment Success!", + # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", + # "color": 3066993, + # "footer": { + # "text": "Release Notification", + # "icon_url": "https://example.com/success-icon.png" + # }, + # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + # }] + # }' \ + # ${{ secrets.DISCORD_WEBHOOK }} - - name: Notify Discord Failure - if: failure() - run: | - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": "❌ Deployment Failed!", - "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", - "color": 15158332, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/failure-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ secrets.DISCORD_WEBHOOK }} + # - name: Notify Discord Failure + # if: failure() + # run: | + # curl -H "Content-Type: application/json" \ + # -X POST \ + # -d '{ + # "embeds": [{ + # "title": "❌ Deployment Failed!", + # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", + # "color": 15158332, + # "footer": { + # "text": "Release Notification", + # "icon_url": "https://example.com/failure-icon.png" + # }, + # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + # }] + # }' \ + # ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.github/workflows/release_discipline.yaml b/.github/workflows/release_discipline.yaml index 80639a84..ed655586 100644 --- a/.github/workflows/release_discipline.yaml +++ b/.github/workflows/release_discipline.yaml @@ -68,40 +68,40 @@ jobs: docker compose pull docker compose up -d echo "${{ steps.gen_ver.outputs.image_ver }}"> success - - name: Notify Discord Success - if: success() - run: | - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": "✅ Deployment Success!", - "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", - "color": 3066993, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/success-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ secrets.DISCORD_WEBHOOK }} + # - name: Notify Discord Success + # if: success() + # run: | + # curl -H "Content-Type: application/json" \ + # -X POST \ + # -d '{ + # "embeds": [{ + # "title": "✅ Deployment Success!", + # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", + # "color": 3066993, + # "footer": { + # "text": "Release Notification", + # "icon_url": "https://example.com/success-icon.png" + # }, + # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + # }] + # }' \ + # ${{ secrets.DISCORD_WEBHOOK }} - - name: Notify Discord Failure - if: failure() - run: | - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": "❌ Deployment Failed!", - "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", - "color": 15158332, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/failure-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ secrets.DISCORD_WEBHOOK }} + # - name: Notify Discord Failure + # if: failure() + # run: | + # curl -H "Content-Type: application/json" \ + # -X POST \ + # -d '{ + # "embeds": [{ + # "title": "❌ Deployment Failed!", + # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", + # "color": 15158332, + # "footer": { + # "text": "Release Notification", + # "icon_url": "https://example.com/failure-icon.png" + # }, + # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + # }] + # }' \ + # ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.github/workflows/release_placement.yaml b/.github/workflows/release_placement.yaml index e1af3041..87088cc2 100644 --- a/.github/workflows/release_placement.yaml +++ b/.github/workflows/release_placement.yaml @@ -68,40 +68,40 @@ jobs: docker compose pull docker compose up -d echo "${{ steps.gen_ver.outputs.image_ver }}"> success - - name: Notify Discord Success - if: success() - run: | - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": "✅ Deployment Success!", - "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", - "color": 3066993, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/success-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ secrets.DISCORD_WEBHOOK }} + # - name: Notify Discord Success + # if: success() + # run: | + # curl -H "Content-Type: application/json" \ + # -X POST \ + # -d '{ + # "embeds": [{ + # "title": "✅ Deployment Success!", + # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", + # "color": 3066993, + # "footer": { + # "text": "Release Notification", + # "icon_url": "https://example.com/success-icon.png" + # }, + # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + # }] + # }' \ + # ${{ secrets.DISCORD_WEBHOOK }} - - name: Notify Discord Failure - if: failure() - run: | - curl -H "Content-Type: application/json" \ - -X POST \ - -d '{ - "embeds": [{ - "title": "❌ Deployment Failed!", - "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", - "color": 15158332, - "footer": { - "text": "Release Notification", - "icon_url": "https://example.com/failure-icon.png" - }, - "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" - }] - }' \ - ${{ secrets.DISCORD_WEBHOOK }} + # - name: Notify Discord Failure + # if: failure() + # run: | + # curl -H "Content-Type: application/json" \ + # -X POST \ + # -d '{ + # "embeds": [{ + # "title": "❌ Deployment Failed!", + # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", + # "color": 15158332, + # "footer": { + # "text": "Release Notification", + # "icon_url": "https://example.com/failure-icon.png" + # }, + # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" + # }] + # }' \ + # ${{ secrets.DISCORD_WEBHOOK }} diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 3b19dcef..e1d4d513 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -925,7 +925,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -1149,7 +1149,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -1363,7 +1363,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -1582,7 +1582,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -1818,7 +1818,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 8394ebdf..8fe4064d 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1825,7 +1825,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -2152,7 +2152,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -2421,7 +2421,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -2661,7 +2661,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : @@ -2886,7 +2886,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 2b72056f..14fafef4 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -696,7 +696,7 @@ namespace BMA.EHR.Placement.Service.Controllers dateEnd = p.DateEnd, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index a2c774c0..beb6fe35 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -1092,7 +1092,7 @@ namespace BMA.EHR.Placement.Service.Controllers orgChild4 = p.child4, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNo, + posNo = p.posMasterNo?.ToString(), posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : p.node == 3 ? $"{p.child3ShortName}" : p.node == 2 ? $"{p.child2ShortName}" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index 53bb2d5f..6e9a178f 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -523,7 +523,7 @@ namespace BMA.EHR.Placement.Service.Controllers dateEnd = p.DateRepatriation, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 83fe185e..c1421929 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -895,7 +895,7 @@ namespace BMA.EHR.Placement.Service.Controllers officerOrg = p.Organization, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 049a8629..fd0e8af2 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -720,7 +720,7 @@ namespace BMA.EHR.Retirement.Service.Controllers orgChild4 = p.child4Old, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : @@ -940,7 +940,7 @@ namespace BMA.EHR.Retirement.Service.Controllers orgChild4 = p.child4Old, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index 531973ef..fa573c93 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -573,7 +573,7 @@ namespace BMA.EHR.Retirement.Service.Controllers orgChild4 = p.child4Old, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 555dd4ca..2db7d80b 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -2251,7 +2251,7 @@ namespace BMA.EHR.Retirement.Service.Controllers orgChild4 = p.child4Old, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : @@ -2450,7 +2450,7 @@ namespace BMA.EHR.Retirement.Service.Controllers orgChild4 = p.child4Old, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 106f2308..c1e97428 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -1694,7 +1694,7 @@ namespace BMA.EHR.Retirement.Service.Controllers orgChild4 = p.child4Old, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : @@ -1893,7 +1893,7 @@ namespace BMA.EHR.Retirement.Service.Controllers orgChild4 = p.child4Old, commandNo = r.commandNo, commandYear = r.commandYear, - posNo = p.posMasterNoOld, + posNo = p.posMasterNoOld?.ToString(), posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :