2 Commits

Author SHA1 Message Date
f5ba09f58d * Fixed issue with wrong prices in columns
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-04-10 06:06:25 +02:00
4f48158bc7 * Fixed precision 2026-03-25 13:11:35 +01:00
2 changed files with 67 additions and 191 deletions

View File

@@ -14,8 +14,8 @@ steps:
clone-manual: clone-manual:
image: woodpeckerci/plugin-git image: woodpeckerci/plugin-git
settings: settings:
remote: http://gitea:3000/${CI_REPO}.git remote: http://gitea:3000/FA/FA_WEB.git
branch: ${CI_COMMIT_BRANCH} branch: master
depth: 1 depth: 1
restore: restore:
image: mcr.microsoft.com/dotnet/sdk:latest image: mcr.microsoft.com/dotnet/sdk:latest
@@ -23,7 +23,7 @@ steps:
- | - |
set -euf set -euf
cd "${CI_WORKSPACE}" cd "${CI_WORKSPACE}"
echo "Aktualna ścieżka do pliku: $(pwd)" echo "Aktualna ścieżka: $(pwd)"
echo "=== Restore wszystkich projektów ===" echo "=== Restore wszystkich projektów ==="
find . -name "*.csproj" -type f -exec dotnet restore "{}" \; find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
test: test:
@@ -78,52 +78,6 @@ steps:
echo "=== Spakowane pakiety ===" echo "=== Spakowane pakiety ==="
ls -la nupkg/ || echo "Brak spakowanych pakietów!" ls -la nupkg/ || echo "Brak spakowanych pakietów!"
depends_on: [test] depends_on: [test]
publish-linux-local:
image: mcr.microsoft.com/dotnet/sdk:latest
commands:
- |
set -euf
cd "${CI_WORKSPACE}"
mkdir -p linux-apps
echo "=== Konfiguracja NuGet sources ==="
cat <<EOF > NuGet.Config
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="BaGet" value="http://baget:80/v3/index.json" allowInsecureConnections="true" />
</packageSources>
</configuration>
EOF
echo "=== Publikacja aplikacji LinuxLocal ==="
find . -name "*.csproj" -type f | while read csproj; do
PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
if [ "$PROJECT_TYPE" = "LinuxLocal" ]; then
PROJECT_NAME=$(basename "$csproj" .csproj)
echo "→ Publishing $PROJECT_NAME"
dotnet publish "$csproj" \
--configuration Release \
--output "./linux-apps/$PROJECT_NAME" \
--runtime linux-x64 \
--self-contained false
fi
done
echo ""
if [ -d "./linux-apps" ] && [ "$(ls -A ./linux-apps)" ]; then
echo "Opublikowane aplikacje:"
ls -la linux-apps/
else
echo "Brak aplikacji LinuxLocal do publikacji"
fi
depends_on: [restore]
publish-datamodels-to-baget: publish-datamodels-to-baget:
image: mcr.microsoft.com/dotnet/sdk:latest image: mcr.microsoft.com/dotnet/sdk:latest
environment: environment:
@@ -154,7 +108,6 @@ steps:
--skip-duplicate --skip-duplicate
done done
depends_on: [pack-datamodels] depends_on: [pack-datamodels]
select-projects-for-container: select-projects-for-container:
image: mcr.microsoft.com/dotnet/sdk:latest image: mcr.microsoft.com/dotnet/sdk:latest
commands: commands:
@@ -163,30 +116,24 @@ steps:
cd "${CI_WORKSPACE}" cd "${CI_WORKSPACE}"
> projects-to-build.txt > projects-to-build.txt
echo "=== Selekcja projektów do konteneryzacji ==="
find . -name "*.csproj" -type f | while read csproj; do find . -name "*.csproj" -type f | while read csproj; do
PROJECT_NAME=$(basename "$csproj" .csproj)
PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown") PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; then if [[ "$PROJECT_TYPE" == "Linux" || "$PROJECT_TYPE" == "Api" || "$PROJECT_TYPE" == "ServerProcess" || "$PROJECT_TYPE" == "Blazor" ]]; then
PROJECT_NAME=$(basename "$csproj" .csproj)
PROJECT_DIR=$(dirname "$csproj") PROJECT_DIR=$(dirname "$csproj")
echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)" echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)"
echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt
else else
PROJECT_NAME=$(basename "$csproj" .csproj)
echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)" echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)"
fi fi
done done
echo "" echo "=== Znaleziono projektow do budowy ==="
if [ -s projects-to-build.txt ]; then cat projects-to-build.txt || echo "Brak projektów!"
echo "Znalezione projekty:" wc -l < projects-to-build.txt
cat projects-to-build.txt
echo "Łącznie: $(wc -l < projects-to-build.txt)"
else
echo "BRAK PROJEKTÓW DO BUDOWY!"
fi
depends_on: [publish-datamodels-to-baget] depends_on: [publish-datamodels-to-baget]
containerize-apps: containerize-apps:
image: docker:27-cli image: docker:27-cli
environment: environment:
@@ -199,12 +146,6 @@ steps:
set -euf set -euf
cd "${CI_WORKSPACE}" cd "${CI_WORKSPACE}"
REGISTRY_ORG="fa"
echo "=== DEBUG: Zawartość projects-to-build.txt ==="
cat projects-to-build.txt || echo "Plik nie istnieje!"
echo "=== DEBUG: REGISTRY_ORG = '$REGISTRY_ORG' ==="
echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
if [ ! -s projects-to-build.txt ]; then if [ ! -s projects-to-build.txt ]; then
@@ -229,16 +170,12 @@ steps:
PDIR=$(echo "$PDIR" | xargs) PDIR=$(echo "$PDIR" | xargs)
PNAME=$(echo "$PNAME" | xargs) PNAME=$(echo "$PNAME" | xargs)
echo "=== DEBUG: PDIR='$PDIR' PNAME='$PNAME' ==="
test -z "$PNAME" && continue test -z "$PNAME" && continue
test ! -d "$PDIR" && continue test ! -d "$PDIR" && continue
echo -n "git.modwad.pl/fa/" > /tmp/tag.txt echo -n "git.modwad.pl/fa/" > /tmp/tag.txt
echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt
echo "=== DEBUG: Generated tag: $(cat /tmp/tag.txt) ==="
echo "$PNAME" > /tmp/pname.txt echo "$PNAME" > /tmp/pname.txt
echo "$PDIR" | sed 's|^\./||' > /tmp/pdir.txt echo "$PDIR" | sed 's|^\./||' > /tmp/pdir.txt
@@ -268,13 +205,16 @@ steps:
-t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \ -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \
-t "$(cat /tmp/tag.txt):latest" \ -t "$(cat /tmp/tag.txt):latest" \
-f "Dockerfile.final" \ -f "Dockerfile.final" \
. . || { echo "BUILD FAILED"; exit 1; }
echo "=== Obraz zbudowany, sprawdzam ==="
docker images | grep "$(cat /tmp/tag.txt | sed 's|git.modwad.pl/||')" || echo "Obraz nie znaleziony w docker images"
echo "=== Pushing SHA tag ===" echo "=== Pushing SHA tag ==="
docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" || { echo "PUSH SHA FAILED"; exit 1; }
echo "=== Pushing latest tag ===" echo "=== Pushing latest tag ==="
docker push "$(cat /tmp/tag.txt):latest" docker push "$(cat /tmp/tag.txt):latest" || { echo "PUSH LATEST FAILED"; exit 1; }
echo "=== SUCCESS: $(cat /tmp/tag.txt) ===" echo "=== SUCCESS: $(cat /tmp/tag.txt) ==="
@@ -283,83 +223,18 @@ steps:
echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ===" echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ==="
depends_on: [select-projects-for-container] depends_on: [select-projects-for-container]
deploy-linux-local:
image: alpine:latest
commands:
- |
cd "${CI_WORKSPACE}"
echo "=== Sprawdzanie aplikacji LinuxLocal ==="
if [ ! -d "./linux-apps" ]; then
echo "Folder ./linux-apps nie istnieje"
exit 0
fi
echo "=== DEBUG: Zawartość ./linux-apps/ ==="
ls -la ./linux-apps/
echo "=== Wdrażanie aplikacji LinuxLocal do /opt/fa-apps/ ==="
mkdir -p /opt/fa-apps
cd ./linux-apps
for app in *; do
echo "→ DEBUG: Sprawdzam $app"
if [ ! -d "$app" ]; then
echo " → $app nie jest folderem, pomijam"
continue
fi
echo " → Kopiuję $app"
echo " → Zawartość:"
ls -la "$app/"
rm -rf "/opt/fa-apps/$app"
cp -r "$app" "/opt/fa-apps/$app"
find "/opt/fa-apps/$app" -type f -executable -exec chmod +x {} \;
echo " → Skopiowano!"
done
cd "${CI_WORKSPACE}"
echo ""
echo "=== Wdrożone aplikacje ==="
ls -laR /opt/fa-apps/
depends_on: [publish-linux-local, containerize-apps]
cleanup-docker: cleanup-docker:
image: docker:27-cli image: docker:27-cli
commands: commands:
- | - |
echo "=== Status przed czyszczeniem ===" echo "=== Czyszczenie starych obrazów ==="
docker system df docker image prune -af --filter "until=24h"
echo "=== Czyszczenie nieużywanych kontenerów ==="
echo ""
echo "=== Usuwanie dangling images ==="
docker image prune -f
echo ""
echo "=== Usuwanie starych wersji aplikacji ==="
docker images --format "{{.Repository}}:{{.Tag}}" | grep "git.modwad.pl/" | grep -v ":latest" | grep -v ":${CI_COMMIT_SHA}" | while read img; do
echo "Usuwam: $img"
docker rmi "$img" || true
done
echo ""
echo "=== Usuwanie kontenerów ==="
docker container prune -f docker container prune -f
echo "=== Czyszczenie build cache ==="
echo "" docker builder prune -af --filter "until=24h"
echo "=== Usuwanie build cache ==="
docker builder prune -af
echo ""
echo "=== Status po czyszczeniu ===" echo "=== Status po czyszczeniu ==="
docker system df docker system df
depends_on: [deploy-linux-local] depends_on: [containerize-apps]
when: when:
status: [success, failure] status: [success, failure]

View File

@@ -161,13 +161,13 @@ namespace SytelineSaAppEfDataModel
entity.Property(e => e.BlanketQty).IsRequired(false).HasColumnName("blanket_qty"); entity.Property(e => e.BlanketQty).IsRequired(false).HasColumnName("blanket_qty");
entity.Property(e => e.EffectiveDate).HasColumnName("eff_date"); entity.Property(e => e.EffectiveDate).HasColumnName("eff_date");
entity.Property(e => e.ExpirationDate).HasColumnName("exp_date"); entity.Property(e => e.ExpirationDate).HasColumnName("exp_date");
entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price"); entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price").HasColumnType("decimal(20, 8)");
entity.Property(e => e.Status).IsRequired(false).HasColumnName("stat").HasMaxLength(1); entity.Property(e => e.Status).IsRequired(false).HasColumnName("stat").HasMaxLength(1);
entity.Property(e => e.PromiseDate).HasColumnName("promise_date"); entity.Property(e => e.PromiseDate).HasColumnName("promise_date");
entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3); entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3);
entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3); entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3);
entity.Property(e => e.BlanketQtyReleased).IsRequired(false).HasColumnName("blanket_qty_conv"); entity.Property(e => e.BlanketQtyReleased).IsRequired(false).HasColumnName("blanket_qty_conv");
entity.Property(e => e.ContPriceReleased).IsRequired(false).HasColumnName("cont_price_conv"); entity.Property(e => e.ContPriceReleased).HasColumnType("decimal(20, 8)").IsRequired(false).HasColumnName("cont_price_conv");
entity.Property(e => e.QtySent).IsRequired(false).HasColumnName("qty_bco"); entity.Property(e => e.QtySent).IsRequired(false).HasColumnName("qty_bco");
entity.Property(e => e.SentCode).IsRequired(false).HasColumnName("bco_code").HasMaxLength(1); entity.Property(e => e.SentCode).IsRequired(false).HasColumnName("bco_code").HasMaxLength(1);
entity.Property(e => e.NonAppliedData).IsRequired(false).HasColumnName("non_appl_data").HasMaxLength(75); entity.Property(e => e.NonAppliedData).IsRequired(false).HasColumnName("non_appl_data").HasMaxLength(75);
@@ -216,8 +216,8 @@ namespace SytelineSaAppEfDataModel
entity.Property(e => e.QtyShipped).IsRequired(false).HasColumnName("qty_shipped"); entity.Property(e => e.QtyShipped).IsRequired(false).HasColumnName("qty_shipped");
entity.Property(e => e.QtyPacked).IsRequired(false).HasColumnName("qty_packed"); entity.Property(e => e.QtyPacked).IsRequired(false).HasColumnName("qty_packed");
entity.Property(e => e.Discount).IsRequired(false).HasColumnName("disc"); entity.Property(e => e.Discount).IsRequired(false).HasColumnName("disc");
entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost"); entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost").HasColumnType("decimal(20, 8)");
entity.Property(e => e.Price).IsRequired(false).HasColumnName("price"); entity.Property(e => e.Price).IsRequired(false).HasColumnName("price").HasColumnType("decimal(20, 8)");
entity.Property(e => e.RefType).IsRequired(false).HasColumnName("ref_type").HasMaxLength(1); entity.Property(e => e.RefType).IsRequired(false).HasColumnName("ref_type").HasMaxLength(1);
entity.Property(e => e.RefNumber).IsRequired(false).HasColumnName("ref_num").HasMaxLength(10); entity.Property(e => e.RefNumber).IsRequired(false).HasColumnName("ref_num").HasMaxLength(10);
entity.Property(e => e.RefLineSuf).IsRequired(false).HasColumnName("ref_line_suf"); entity.Property(e => e.RefLineSuf).IsRequired(false).HasColumnName("ref_line_suf");
@@ -261,7 +261,7 @@ namespace SytelineSaAppEfDataModel
entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3); entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3);
entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3); entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3);
entity.Property(e => e.QtyOrderedReleased).IsRequired(false).HasColumnName("qty_ordered_conv"); entity.Property(e => e.QtyOrderedReleased).IsRequired(false).HasColumnName("qty_ordered_conv");
entity.Property(e => e.PriceReleased).IsRequired(false).HasColumnName("price_conv"); entity.Property(e => e.PriceReleased).IsRequired(false).HasColumnName("price_conv").HasColumnType("decimal(20, 8)");
entity.Property(e => e.CustomerOrderCustomerNumber).IsRequired(false).HasColumnName("co_cust_num").HasMaxLength(7); entity.Property(e => e.CustomerOrderCustomerNumber).IsRequired(false).HasColumnName("co_cust_num").HasMaxLength(7);
entity.Property(e => e.Packed).IsRequired(false).HasColumnName("packed"); entity.Property(e => e.Packed).IsRequired(false).HasColumnName("packed");
entity.Property(e => e.Bol).IsRequired(false).HasColumnName("bol"); entity.Property(e => e.Bol).IsRequired(false).HasColumnName("bol");
@@ -474,7 +474,7 @@ namespace SytelineSaAppEfDataModel
entity.Property(e => e.BlanketQty).HasColumnName("blanket_qty"); entity.Property(e => e.BlanketQty).HasColumnName("blanket_qty");
entity.Property(e => e.EffDate).HasColumnName("eff_date").IsRequired(false); entity.Property(e => e.EffDate).HasColumnName("eff_date").IsRequired(false);
entity.Property(e => e.ExpDate).HasColumnName("exp_date").IsRequired(false); entity.Property(e => e.ExpDate).HasColumnName("exp_date").IsRequired(false);
entity.Property(e => e.ContPrice).HasColumnName("cont_price").IsRequired(false); entity.Property(e => e.ContPrice).HasColumnName("cont_price").HasColumnType("decimal(20, 8)").IsRequired(false);
entity.Property(e => e.Stat).HasColumnName("stat").HasMaxLength(2).IsRequired(false); entity.Property(e => e.Stat).HasColumnName("stat").HasMaxLength(2).IsRequired(false);
entity.Property(e => e.PromiseDate).HasColumnName("promise_date").IsRequired(false); entity.Property(e => e.PromiseDate).HasColumnName("promise_date").IsRequired(false);
entity.Property(e => e.Pricecode).HasColumnName("pricecode").HasMaxLength(6).IsRequired(false); entity.Property(e => e.Pricecode).HasColumnName("pricecode").HasMaxLength(6).IsRequired(false);
@@ -2344,6 +2344,7 @@ namespace SytelineSaAppEfDataModel
entity.Property(e => e.ContPrice) entity.Property(e => e.ContPrice)
.HasColumnName("cont_price") .HasColumnName("cont_price")
.HasColumnType("decimal(20, 8)")
.IsRequired(false); .IsRequired(false);
entity.Property(e => e.BrkQty1) entity.Property(e => e.BrkQty1)