干膜优化，盘点，MES退库优化

wangxinhui

2025-02-19 28aac1b84d301b79a0ca784e812561422fbac4a5

干膜优化，盘点，MES退库优化

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1ecaf9f0-bb7f-4dc0-8819-5392f594923e.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2ea398b8-de19-4e5a-87af-08d6c00ecef6.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4d0021aa-b015-4f6b-8102-5f3a9a94a5f7.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/8342b990-a0d5-45ef-af12-e7e147559e6d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e3aa52f0-6a1f-441b-907d-66672a2f2bad.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/¸ÉĤ²Ö/ConveyorLineJob_GM.cs

@@ -98,7 +98,7 @@
                        {
                            if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && !conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !conveyorLineSignalWrite.STB && !conveyorLineSignalWrite.ACK)
                            {
                                Dt_Task task = _taskRepository.QueryFirst(x => _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && string.IsNullOrEmpty(x.NextAddress));
                                Dt_Task task = _taskRepository.QueryFirst(x => _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && !string.IsNullOrEmpty(x.NextAddress));
                                if (task != null)
                                {
                                    _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute, nextAddress: item.StationCode, deviceCode: item.StackerCraneCode, targetAddress: item.StationCode);
@@ -164,7 +164,7 @@
                                }
                                else if (conveyorLineSignalWrite.STB && conveyorLineSignalRead.ACK && conveyorLineStatus.Goods)
                                {
                                    _taskService.TaskCompleted(conveyorLineInfoRead.TaskNum);
                                    _taskService.TaskCompleted(conveyorLineInfoWrite.TaskNum);
                                    device.SetValue(W_ConveyorLineDB.STB, false, item.StationCode);
                                }
                            }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/16a8d927-ff5a-4742-82f5-ded128fce3b7.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8f635d1b-069a-4488-a00e-fa81e04f8d45.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c3bc09c9-10ef-487b-bab9-1fe2e84571e1.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d9d071a5-d4c7-4ac6-8365-fb73d8cfa365.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_External/ERPService/InvokeERPService.cs

@@ -125,6 +125,23 @@
            return response;
        }
        /// <summary>
        /// ERP盘赢/亏上报接口调用
        /// </summary>
        public string InvokeTakeStockApi(ERPTakeStockModel takeModel)
        {
            Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.InvokeErpApi.ToString());
            ERPBaseModel<ERPTakeStockModel> model = new ERPBaseModel<ERPTakeStockModel>()
            {
                Data = takeModel,
                Desc = "材料盘点",
                Type = "toTCWMSMaterialCounting",
                SecurityCode = "TeChuang"
            };
            string request = JsonConvert.SerializeObject(model, settings);
            string response = HttpHelper.Post(apiInfo.ApiAddress, request);
            return response;
        }
        /// <summary>
        /// ERP物料出库接口调用
        /// </summary>
        /// <param name="outboundModel"></param>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_External/IERPService/IInvokeERPService.cs

@@ -41,5 +41,9 @@
        /// ERP退料上报接口调用
        /// </summary>
        string InvokeReturnApi(ERPReturnModel returnModel);
        /// <summary>
        /// ERP盘赢/亏上报接口调用
        /// </summary>
        string InvokeTakeStockApi(ERPTakeStockModel takeModel);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/ERPTakeStockModel.cs

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

namespace WIDESEA_External.Model
{
    /// <summary>
    /// ç›˜ç‚¹å•å›žä¼ ERP
    /// </summary>
    public class ERPTakeStockModel
    {
        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        public int Way { get; set; }
        /// <summary>
        /// ä¸»é”®å€¼
        /// </summary>
        public string UniqueTag { get; set; }
        /// <summary>
        /// ç›˜ç‚¹å•å·
        /// </summary>
        public string Code { get; set; }
        /// <summary>
        /// ä¼šè®¡æœŸé—´
        /// </summary>
        public string FiscalPeriotime { get; set; }
        /// <summary>
        /// ç›˜ç‚¹å•åç§°
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// ä»“库代号
        /// </summary>
        public string WarehouseCode { get; set; }
        /// <summary>
        /// åˆ›å»ºäººä»£å·
        /// </summary>
        public string Createuser { get; set; }
        /// <summary>
        /// åˆ›å»ºæ—¥æœŸ
        /// </summary>
        public string Createtime { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }
        /// <summary>
        /// ç›˜ç‚¹æ˜Žç»†åˆ—表
        /// </summary>
        public List<TakeDetailsItem> Details { get; set; }
    }
    public class TakeDetailsItem
    {
        /// <summary>
        /// ææ–™ç¼–码
        /// </summary>
        public string MaterialsCode { get; set; }
        /// <summary>
        /// å‚¨åŒº
        /// </summary>
        public string LocationCode { get; set; }
        /// <summary>
        /// å†…部批次号
        /// </summary>
        public string Lotno { get; set; }
        /// <summary>
        /// è´¦é¢æ•°é‡
        /// </summary>
        public int Sysqty { get; set; }
        /// <summary>
        /// å®žç›˜æ•°é‡
        /// </summary>
        public int Qty { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -221,5 +221,18 @@

            return BaseDal.GetStockInfos(materielCode, batchNo, locationCodes);
        }
        public WebResponseContent MatPicking(SaveModel saveModel)
        {
            WebResponseContent content= new WebResponseContent();
            try
            {

            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs

@@ -433,13 +433,7 @@

                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode == WarehouseEnum.HA57.ToString());

                Dt_StockInfo stockInfo = new Dt_StockInfo()
                {
                    PalletCode = model.CarrierCode,
                    PalletType = palletTypeInfo.PalletType,
                    WarehouseId = warehouse.WarehouseId,
                    StockStatus = StockStatusEmun.MES退库.ObjToInt()
                };
                
                Dt_StockInfo_Hty stockInfo_Hty = _stockRepository.StockInfo_HtyRepository.QueryData(x=>x.PalletCode== model.CarrierCode).OrderByDescending(x=>x.SourceId).First();
                Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.StockId==stockInfo_Hty.SourceId);

@@ -458,7 +452,14 @@
                    Status = StockStatusEmun.MES退库.ObjToInt(),
                    Unit = model.Unit
                };

                Dt_StockInfo stockInfo = new Dt_StockInfo()
                {
                    PalletCode = model.CarrierCode,
                    PalletType = palletTypeInfo.PalletType,
                    WarehouseId = warehouse.WarehouseId,
                    StockStatus = StockStatusEmun.MES退库.ObjToInt(),
                    Details=new List<Dt_StockInfoDetail> { stockInfoDetail }
                };
                //Dt_Task task = new Dt_Task()
                //{
                //    PalletCode = stockInfo.PalletCode,

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs

@@ -181,5 +181,9 @@
        {
            return _invokeERPService.InvokeReturnApi(returnModel);
        }
        public string InvokeTakeStockApi([FromBody] ERPTakeStockModel takeModel)
        {
            return _invokeERPService.InvokeTakeStockApi(takeModel);
        }
    }
}