同步

刘磊

2025-11-11 6fed1f731b16c1820a43fc34130a70b21465e2bb

同步

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_Common/MES/Request/pushOrderInfo.cs

@@ -21,8 +21,11 @@
        /// </summary>
        public string splitStrategy { get; set; }

        public string data { get; set; }
        public List<orderInfoDetail> data { get; set; }
    }

    public class orderInfoDetail
    {
        /// <summary>
        /// è®¢å•å·
        /// </summary>

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_IStorageTaskService/BDCManager/IBDCManager.cs

@@ -6,15 +6,15 @@

namespace WIDESEA_IStorageTaskServices
{
    internal class IBDCManager
    public interface IBDCManager
    {
        //int TotalCapacity { get; }
        //int CurrentOccupancy { get; }
        //List<CarBody> GetInventory();
        //bool AddToBDC(CarBody body);
        //CarBody RetrieveFromBDC(string bodyId);
        //List<CarBody> RetrieveByModel(string model);
        //List<CarBody> RetrieveByColor(BodyColor color);
        //void GenerateReport();
        int TotalCapacity { get; }
        int CurrentOccupancy { get; }
        List<Dt_CarBody> GetInventory();
        bool AddToBDC(Dt_CarBody body);
        Dt_CarBody RetrieveFromBDC(string bodyId);
        List<Dt_CarBody> RetrieveByModel(string model);
        List<Dt_CarBody> RetrieveByColor(int color);
        void GenerateReport();
    }
}

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pushOrderInfo.cs

@@ -33,26 +33,29 @@

                if (result.plantCode != "1052") throw new Exception("非本工厂订单,请重试");

                var palletStockInfos = _palletStockInfoRepository.QueryData(x => x.OrderID == result.workOrderNo);
                var ListTaskDto = new List<WMSTaskDTO>();
                var ListTask = new List<Dt_Task>();
                foreach (var item in result.data)
                {
                    var palletStockInfos = _palletStockInfoRepository.QueryData(x => x.OrderID == item.workOrderNo);


                //如存在预绑定工单的库存,则优先出库预绑定的工单
                if (palletStockInfos != null || palletStockInfos.Count != 0)
                {
                    foreach (var item in palletStockInfos)
                        foreach (var item1 in palletStockInfos)
                    {
                        Dt_Task task = new Dt_Task()
                        {
                            CurrentAddress = item.LocationCode,
                                CurrentAddress = item1.LocationCode,
                            Grade = 2,
                            NextAddress = item.LocationCode,
                            PalletCode = item.PalletCode,
                            OrderNo = item.OrderID,
                            PVI = item.PVI,
                            Modifier = item.Modifier,
                            Roadway = item.RoadwayNo,
                            SourceAddress = item.LocationCode,
                                NextAddress = item1.LocationCode,
                                PalletCode = item1.PalletCode,
                                OrderNo = item1.OrderID,
                                PVI = item1.PVI,
                                Modifier = item1.Modifier,
                                Roadway = item1.RoadwayNo,
                                SourceAddress = item1.LocationCode,
                            TaskNum = _taskRepository.GetTaskNo().Result,
                            TaskState = (int)TaskOutStatusEnum.OutNew,
                            TaskType = (int)TaskOutboundTypeEnum.Outbound,
@@ -80,7 +83,10 @@
                {
                    //如不存在预绑定工单车辆,则按照工单信息匹配库存车辆
                    //todo ç‰¹å¾ä¿¡æ¯åŒ¹é…
                    _palletStockInfoRepository.QueryData(x => x.PVI == result.pvi);
                        _palletStockInfoRepository.QueryData(x => x.PVI == item.pvi);

                    }


                }

@@ -95,7 +101,7 @@
                    Creater = "System",
                    Status = 1,
                    //UpperOutOrderId = result.workOrderNo,
                    OrderNumber = result.workOrderNo,
                    OrderNumber = result.data[0].workOrderNo,
                    WarehouseId = 1,
                    OrderDate = DateTime.Now,
                    UpperOutOrderId = 1,
@@ -103,6 +109,7 @@

                };


                var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
                var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/removeWorkOrderInfo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;

namespace WIDESEA_StoragIntegrationServices
{
    /// <summary>
    /// BDC请求焊装特征下发
    /// æŽ¥å£æè¿°: è½¦èº«è¿›å…¥BDC时，BDC读取车身上的一维条码向MES请求焊装特征信息
    /// </summary>
    public partial class MESService
    {
        public WebResponseContent removeWorkOrderInfo(string jsonData)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {   


                return content.OK();
            }
            catch (Exception ex)
            {

                return content.OK(ex.Message);
            }

        }
    }
}

 ÏîÄ¿´úÂë/WMS/WMSServer/WIDESEA_StorageTaskServices/BDCManager/BDCManager.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;

namespace WIDESEA_StorageTaskServices
{
    public class BDCManager : IBDCManager
    {
        private readonly List<Dt_PalletStockInfo> _storageLocations;
        private readonly List<DtLocationInfo> _locationInfos;
        private readonly object _lock = new object();


        public int TotalCapacity => _locationInfos.Count;

        public int CurrentOccupancy => _storageLocations.Count;

        public bool AddToBDC(Dt_CarBody body)
        {
            throw new NotImplementedException();
        }

        public void GenerateReport()
        {
            throw new NotImplementedException();
        }

        public List<Dt_CarBody> GetInventory()
        {
            throw new NotImplementedException();
        }

        public List<Dt_CarBody> RetrieveByColor(int color)
        {
            throw new NotImplementedException();
        }

        public List<Dt_CarBody> RetrieveByModel(string model)
        {
            throw new NotImplementedException();
        }

        public Dt_CarBody RetrieveFromBDC(string bodyId)
        {
            throw new NotImplementedException();
        }
    }
}