From 03214febb52b6e0f6f03248d3ef3cbe08967a116 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期五, 27 三月 2026 10:17:42 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs | 107 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 23 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/PalletTypeInfoService.cs
index 52f4b6f..9fceff8 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;
@@ -33,9 +34,13 @@
List<string> PalletCodes = new List<string>();
for (int i = 0; i < num; i++)
{
- //PalletCodes.Add(GetOrderPintCode("PalletCodes"),palletCodeType);
+ PalletCodes.Add(GetOrderPintCode($"PalletCodes",palletCodeType));
}
content= PrintPallet(PalletCodes);
+ foreach (var PalletCode in PalletCodes)
+ {
+ Console.WriteLine(PalletCode);
+ }
return content.OK();
}
catch (Exception ex)
@@ -52,20 +57,20 @@
public string GetOrderPintCode(string printCode,string palletCodeType)
{
string PrintCode = "";
- //var PrintSetting = SqlSugarHelper.DbWMS.Queryable<Dt_PrintSetting>().Where(x => x.PrintCode == printCode).ToList().FirstOrDefault();
+ var PrintSetting = Db.Queryable<Dt_PrintSetting>().Where(x => x.PrintCode == printCode).ToList().FirstOrDefault();
- //if (PrintSetting.Spare1 == DateTime.Now.ToString("yyyyMMdd"))
- //{
- // PrintCode = PrintSetting.Spare1 + PrintSetting.PrintNo.ToString().PadLeft(PrintSetting.Spare2, '0');
- // PrintSetting.PrintNo = PrintSetting.PrintNo + 1;
- //}
- //else
- //{
- // PrintSetting.Spare1 = DateTime.Now.ToString("yyyyMMdd");
- // PrintSetting.PrintNo = 2;
- // PrintCode = PrintSetting.Spare1 + 1.ToString().PadLeft(PrintSetting.Spare2, '0');
- //}
- //SqlSugarHelper.DbWMS.Updateable(PrintSetting).ExecuteCommand();
+ if (PrintSetting.Spare1 == DateTime.Now.ToString("yyyyMMdd"))
+ {
+ PrintCode = palletCodeType+PrintSetting.Spare1 + PrintSetting.PrintNo.ToString().PadLeft(PrintSetting.Spare2, '0');
+ 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');
+ }
+ Db.Updateable(PrintSetting).ExecuteCommand();
return PrintCode;
}
@@ -77,16 +82,72 @@
/// <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();
}
+
+ /// <summary>
+ /// 鑾峰彇鎵樼洏鏍囪瘑
+ /// </summary>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent GetPalletTypeInfos(int WarehouseId)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<Dt_PalletTypeInfo> dt_PalletTypeInfos = BaseDal.QueryData(x => x.WarehouseId == WarehouseId);
+ return content.OK(data: dt_PalletTypeInfos);
+ }
+ catch(Exception ex)
+ {
+ return content.Error();
+ }
+ }
+
+ public WebResponseContent GetWarehouses()
+ {
+ WebResponseContent content = new WebResponseContent();
+
+ try
+ {
+ List<Dt_PalletTypeInfo> dt_PalletTypeInfos = BaseDal.QueryData(x => x);
+ List<Dt_Warehouse> dt_Warehouses = new List<Dt_Warehouse>();
+ foreach (var item in dt_PalletTypeInfos)
+ {
+ Dt_Warehouse dt_Warehouse = Db.Queryable<Dt_Warehouse>().First(x => x.WarehouseId == item.WarehouseId);
+ dt_Warehouses.Add(dt_Warehouse);
+ }
+ List<Dt_Warehouse> NewDt_Warehouses = new List<Dt_Warehouse>();
+ NewDt_Warehouses.AddRange(dt_Warehouses.DistinctBy(x => x.WarehouseId));
+ return content.OK(data: NewDt_Warehouses);
+ }
+ catch(Exception ex)
+ {
+ return content.Error();
+ }
+
+ }
+
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ var id = saveModel.MainData["id"].ObjToInt();
+ var palletType = saveModel.MainData["palletType"].ObjToInt();
+ var typeName = saveModel.MainData["typeName"].ToString();
+ var length = saveModel.MainData["length"].ObjToInt();
+ var width = saveModel.MainData["width"].ObjToInt();
+ var height = saveModel.MainData["height"].ObjToInt();
+ var locationCount = saveModel.MainData["locaitonCount"].ObjToInt();
+ Dt_PalletTypeInfo palletTypeInfo = BaseDal.QueryFirst(x => x.Id == id);
+ palletTypeInfo.PalletType = palletType;
+ palletTypeInfo.TypeName = typeName;
+ palletTypeInfo.Length = length;
+ palletTypeInfo.Width = width;
+ palletTypeInfo.Height = height;
+ palletTypeInfo.LocaitonCount = locationCount;
+
+ return base.UpdateData(palletTypeInfo);
+ }
}
}
--
Gitblit v1.9.3