From e2f151957b38d3c02c26be4343b6916d65e800b7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 13:52:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/PalletCodeInfoService.cs | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/PalletCodeInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/PalletCodeInfoService.cs"
index 870efab..622391f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/PalletCodeInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/PalletCodeInfoService.cs"
@@ -4,6 +4,8 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Helper;
@@ -15,8 +17,10 @@
{
public class PalletCodeInfoService : ServiceBase<Dt_PalletCodeInfo, IPalletCodeInfoRepository>, IPalletCodeInfoService
{
- public PalletCodeInfoService(IPalletCodeInfoRepository BaseDal) : base(BaseDal)
+ private readonly IWarehouseRepository _warehouseRepository;
+ public PalletCodeInfoService(IPalletCodeInfoRepository BaseDal, IWarehouseRepository warehouseRepository) : base(BaseDal)
{
+ _warehouseRepository = warehouseRepository;
}
static object locker = new object();
@@ -47,12 +51,24 @@
{
serialNo = 1;
}
+ Dt_Warehouse _Warehouse = _warehouseRepository.QueryFirst(x=>x.WarehouseId== warehouseId);
+ string uplen = "";
+ switch (_Warehouse.WarehouseCode)
+ {
+ case "HA153":
+ uplen = "Y";
+ break;
+ default:
+ uplen = "N";
+ break;
+ }
for (int i = 0; i < count; i++)
{
+
palletCodeInfos.Add(new Dt_PalletCodeInfo
{
SerialNo = serialNo,
- PalletCode = now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
+ PalletCode = uplen+now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
PalletType = 1,
PalletTypeId = 0,
WarehouseId = warehouseId,
@@ -65,5 +81,25 @@
return base.AddData(palletCodeInfos);
}
}
+ public WebResponseContent PrintStatusUp(string printCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_PalletCodeInfo palletCodeInfo = BaseDal.QueryFirst(x=>x.PalletCode==printCode);
+ if (palletCodeInfo==null)
+ {
+ return content.Error("鎵撳嵃鐨勬墭鐩樼爜涓嶅瓨鍦�");
+ }
+ palletCodeInfo.Status = PrintStatusEnum.Printed.ObjToInt();
+ BaseDal.UpdateData(palletCodeInfo);
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error("閿欒:"+ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3