Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-11 97b9f7d9650b426fa540e7aaba7739a2e7080ab0

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/PalletCodeInfoService.cs

@@ -18,9 +18,12 @@
    public class PalletCodeInfoService : ServiceBase<Dt_PalletCodeInfo, IPalletCodeInfoRepository>, IPalletCodeInfoService
    {
        private readonly IWarehouseRepository _warehouseRepository;
        public PalletCodeInfoService(IPalletCodeInfoRepository BaseDal, IWarehouseRepository warehouseRepository) : base(BaseDal)
        private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;

        public PalletCodeInfoService(IPalletCodeInfoRepository BaseDal, IWarehouseRepository warehouseRepository, IPalletTypeInfoRepository palletTypeInfoRepository) : base(BaseDal)
        {
            _warehouseRepository = warehouseRepository;
            _palletTypeInfoRepository = palletTypeInfoRepository;
        }

        static object locker = new object();
@@ -51,9 +54,9 @@
                {
                    serialNo = 1;
                }
                Dt_Warehouse _Warehouse = _warehouseRepository.QueryFirst(x=>x.WarehouseId== warehouseId);

                string uplen = _Warehouse.WarehouseCode switch
                Dt_Warehouse _Warehouse = _warehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
                string uplen = "";
                switch (_Warehouse.WarehouseCode)
                {
                    "HA57" => "B",
                    "HA58" => "P",
@@ -67,11 +70,11 @@
                };
                for (int i = 0; i < count; i++)
                {
                    

                    palletCodeInfos.Add(new Dt_PalletCodeInfo
                    {
                        SerialNo = serialNo,
                        PalletCode = uplen+now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
                        PalletCode = uplen + now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
                        PalletType = 1,
                        PalletTypeId = 0,
                        WarehouseId = warehouseId,
@@ -84,13 +87,65 @@
                return base.AddData(palletCodeInfos);
            }
        }

        public WebResponseContent AddData(int warehouseId, int count, int palletTypeId)
        {
            try
            {
                Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.Id == palletTypeId && x.WarehouseId == warehouseId);
                if (palletTypeInfo == null)
                {
                    return WebResponseContent.Instance.Error($"未找到托盘类型配置信息");
                }
                lock (locker)
                {
                    List<Dt_PalletCodeInfo> palletCodeInfos = new List<Dt_PalletCodeInfo>();
                    int serialNo = 0;
                    DateTime now = DateTime.Now;
                    Dt_PalletCodeInfo palletCodeInfo = BaseDal.QueryFirst(x => x.WarehouseId == warehouseId, new Dictionary<string, OrderByType> { { nameof(Dt_PalletCodeInfo.SerialNo), OrderByType.Desc } });
                    if (palletCodeInfo != null && palletCodeInfo.CreateDate.Year == now.Year && palletCodeInfo.CreateDate.Month == now.Month && palletCodeInfo.CreateDate.Day == now.Day)
                    {
                        serialNo = palletCodeInfo.SerialNo + 1;

                    }
                    else
                    {
                        serialNo = 1;
                    }

                    for (int i = 0; i < count; i++)
                    {

                        palletCodeInfos.Add(new Dt_PalletCodeInfo
                        {
                            SerialNo = serialNo,
                            PalletCode = palletTypeInfo.CodeStartStr + now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
                            PalletType = 1,
                            PalletTypeId = 0,
                            WarehouseId = warehouseId,
                            Status = 0,
                            Size = 0
                        });

                        serialNo = serialNo + 1;
                    }
                    BaseDal.AddData(palletCodeInfos);
                }
                return WebResponseContent.Instance.OK();
            }
            catch(Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        public WebResponseContent PrintStatusUp(string printCode)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_PalletCodeInfo palletCodeInfo = BaseDal.QueryFirst(x=>x.PalletCode==printCode);
                if (palletCodeInfo==null)
                Dt_PalletCodeInfo palletCodeInfo = BaseDal.QueryFirst(x => x.PalletCode == printCode);
                if (palletCodeInfo == null)
                {
                    return content.Error("打印的托盘码不存在");
                }
@@ -100,7 +155,7 @@
            }
            catch (Exception ex)
            {
                content.Error("错误:"+ex.Message);
                content.Error("错误:" + ex.Message);
            }
            return content;
        }