From d13e6e7d5df05ba244971d2fabb788ccb0f5c12a Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 27 一月 2026 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs
index 87000a5..cdf4bc5 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs
@@ -8,6 +8,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Const;
+using WIDESEA_Core.Helper;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
@@ -35,8 +36,8 @@
{
PalletCodes.Add(GetOrderPintCode($"{palletCodeType}PalletCodes",palletCodeType));
}
- //content= PrintPallet(PalletCodes);
- foreach(var PalletCode in PalletCodes)
+ content= PrintPallet(PalletCodes);
+ foreach (var PalletCode in PalletCodes)
{
Console.WriteLine(PalletCode);
}
@@ -60,14 +61,14 @@
if (PrintSetting.Spare1 == DateTime.Now.ToString("yyyyMMdd"))
{
- PrintCode = palletCodeType+PrintSetting.Spare1 + PrintSetting.PrintNo.ToString().PadLeft(PrintSetting.Spare2, '0');
+ PrintCode = palletCodeType+PrintSetting.PrintNo.ToString().PadLeft(PrintSetting.Spare2, '0')+PrintSetting.Spare1;
PrintSetting.PrintNo = PrintSetting.PrintNo + 1;
}
else
{
PrintSetting.Spare1 = DateTime.Now.ToString("yyyyMMdd");
PrintSetting.PrintNo = 2;
- PrintCode = palletCodeType+PrintSetting.Spare1 + 1.ToString().PadLeft(PrintSetting.Spare2, '0');
+ PrintCode = palletCodeType+1.ToString().PadLeft(PrintSetting.Spare2, '0')+PrintSetting.Spare1;
}
Db.Updateable(PrintSetting).ExecuteCommand();
return PrintCode;
@@ -81,15 +82,8 @@
/// <exception cref="InvalidOperationException"></exception>
public WebResponseContent PrintPallet(List<string> palletCodes)
{
- var Base = "";
- var ipAddress = "";
- if (Base == null || ipAddress == null)
- {
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
- var IpAddress = Base + ipAddress;
- //var result = HttpsClient.PostAsync(palletCodes.ToJsonString()).Result;
- //return JsonConvert.DeserializeObject<WebResponseContent>();
+ string url = "http://127.0.0.1:8098/Print/PrintPalletCode";
+ HttpHelper.Post(url, palletCodes.Serialize());
return WebResponseContent.Instance.OK();
}
}
--
Gitblit v1.9.3