吉安立库
上一版本: f1bd65a4 | 补丁 | 提交 | 显示空白
1
yangpeixing
3 天以前 e1fc440b82cdbb9b63c6a1e47c204fbe830da0d5 
1

1
已修改3个文件
91 ■■■■■ 文件已修改
WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs


@@ -230,7 +230,7 @@


        /// 调拨出库单


        /// </summary>


        [Description("调拨出库单")]


        Allocate = 4,


        Allocate = 3,


        /// <summary>


        /// 生产返工单


        /// </summary>




 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs


@@ -169,7 +169,6 @@


                //        newTask.TaskType = TaskTypeEnum.MesPalletSmallReturn.ObjToInt();


                //    }


                //}


                //else


                //{


                stockInfo.StockStatus = StockStatusEmun.入库确认.ObjToInt();


                locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();


@@ -178,6 +177,30 @@


                _unitOfWorkManage.BeginTran();


                int taskId = BaseDal.AddData(newTask);


                newTask.TaskId = taskId;




                 List<Dt_StockInfoDetail> stockInfoDetails = stockInfo.Details;


                foreach (var stockInfoDetail in stockInfoDetails)


                {


                    WriteLog.Write_Log("API", "入库—请求LED", "请求成功", new { 请求报文 = 1 });


                    var postData = new


                    {


                        DeviceCode = "1005",    // 屏幕编号


                        MaterialCode = stockInfoDetail.MaterielCode,//物料类型


                        SendNum = stockInfoDetail.OutboundQuantity,//发料数


                        BackNum = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity//回库数   


                    };


                    WriteLog.Write_Log("API", "入库—请求LED", "请求成功", new { 请求报文2 = postData });


                    string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);


                    WriteLog.Write_Log("API", "入库—请求LED", "请求成功", new { 请求报文3 = json });


                    using (var client = new HttpClient())            


                    {


                        var content = new StringContent(json, Encoding.UTF8, "application/json");


                        var response = client.PostAsync(LEDAPI, content).Result;


                        string result = response.Content.ReadAsStringAsync().Result;


                        WriteLog.Write_Log("API", "入库—请求LED", "请求成功", new { 请求报文 = response, 接收报文 = result });


                    }


                    WriteLog.Write_Log("API", "入库—请求LED", "请求成功", new { 请求报文 = 4 });


                }


                if (returnOrder != null)


                {


                    returnOrder.OrderStatus = InOrderStatusEnum.入库中.ObjToInt();




 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs


@@ -24,25 +24,35 @@


using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;


using Org.BouncyCastle.Asn1.Tsp;


using Spire.Pdf;


using Spire.Pdf;


using SqlSugar;


using System;


using System;


using System;


using System;


using System;


using System.Collections.Generic;


using System.ComponentModel;


using System.ComponentModel.DataAnnotations;


using System.ComponentModel.DataAnnotations;


using System.Diagnostics;


using System.Diagnostics.CodeAnalysis;


using System.Drawing.Printing;


using System.Drawing.Printing;


using System.IO;


using System.IO;


using System.Linq;


using System.Net.Http;


using System.Net.Http;


using System.Reflection;


using System.Reflection.Metadata;


using System.Text;


using System.Threading.Tasks;


using System.Threading.Tasks;


using System.Threading.Tasks;


using WIDESEA_BasicRepository;


using WIDESEA_Common;


using WIDESEA_Common.Log;


using WIDESEA_Common.Log;


using WIDESEA_Common.OrderEnum;


using WIDESEA_Common.TaskEnum;


@@ -54,6 +64,7 @@


using WIDESEA_Core.TaskEnum;


using WIDESEA_DTO.Basic;


using WIDESEA_DTO.ERP;


using WIDESEA_DTO.ERP;


using WIDESEA_DTO.Inbound;


using WIDESEA_DTO.Stock;


using WIDESEA_DTO.Task;


@@ -62,6 +73,7 @@


using WIDESEA_IInboundRepository;


using WIDESEA_IInboundService;


using WIDESEA_InboundRepository;


using WIDESEA_InboundRepository;


using WIDESEA_IOutboundRepository;


using WIDESEA_IOutboundService;


using WIDESEA_IRecordService;


@@ -69,8 +81,10 @@


using WIDESEA_IStockService;


using WIDESEA_ITaskInfoRepository;


using WIDESEA_ITaskInfoService;


using WIDESEA_Model;


using WIDESEA_Model.Models;


using WIDESEA_Model.Models.Inbound;


using WIDESEA_OutboundRepository;


using WIDESEA_OutboundRepository;


using WIDESEA_StockRepository;


using WIDESEA_TaskInfoRepository;


@@ -78,26 +92,13 @@


using static WIDESEA_Common.HouseBackboundPassBack;


using static WIDESEA_Common.HouseInboundPassBack;


using static WIDESEA_Common.HouseInboundPassBack.data.data1;


using static WIDESEA_Common.HouseInboundPassBack.data.data1;


using static WIDESEA_Common.HouseoutboundPassBack;


using static WIDESEA_Common.InventoryAllocate;


using static WIDESEA_Common.NewHouseInboundPassBack;


using static WIDESEA_Common.NewHouseInboundPassBack.Parame.Syncretism;


using static WIDESEA_ITaskInfoService.ITaskService;


using Parameter = WIDESEA_Common.Parameter;


using WIDESEA_DTO.ERP;


using WIDESEA_OutboundRepository;


using System.ComponentModel.DataAnnotations;


using System;


using System.IO;


using System.Net.Http;


using System.Threading.Tasks;


using Spire.Pdf;


using WIDESEA_InboundRepository;


using System.Drawing.Printing;


using System;


using WIDESEA_Common.Log;


using static WIDESEA_Common.HouseInboundPassBack.data.data1;


using System.Diagnostics;




namespace WIDESEA_TaskInfoService


{


@@ -2866,12 +2867,15 @@




        private void AddRetrueOrder(Dt_Task task,Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)


        {


            Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()


           .Where(x => x.StockId == stockInfo.Id).First();


            if (stockInfoDetail == null)


            List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()


           .Where(x => x.StockId == stockInfo.Id).ToList();


            if (stockInfoDetails == null || stockInfoDetails.Count == 0)


            {


                throw new Exception("建立回库单时，未找到该库存信息");


            }


            Dt_ReturnOrder? lastReturnOrder = null;


            foreach (var stockInfoDetail in stockInfoDetails)


            {


            if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())


            {


                Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());


@@ -2908,9 +2912,15 @@


                }


                WriteLog.Write_Log("API", "出库—请求LED", "请求成功", new { 请求报文 = 4 });




                decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;


                if (returnQuantity > 0)


                    bool allowCompeted = stockInfo.Details.All(x => x.StockQuantity == x.OutboundQuantity);


                    if (allowCompeted)


                {


                        DeleteAndMoveIntoHtStockStatus(stockInfo);




                    }     


                    else


                    {


                        decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;


                    Dt_ReturnOrder returnOrder = new Dt_ReturnOrder


                    {


                        MaterielCode = stockInfoDetail.MaterielCode,


@@ -2926,29 +2936,33 @@


                        OrderType = OrderTypeEnum.余料回库单.ObjToInt(),


                        System = "WMS"


                    };


                        if(lastReturnOrder != null)


                        {


                            lastReturnOrder.Remark = lastReturnOrder.Remark + $",{returnOrder.BatchNo}";


                            _returnOrderRepository.UpdateData(lastReturnOrder);


                        }


                    if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)


                    {


                        returnOrder.LocationCode = stockInfo.LocationCode;


                    }


                    _unitOfWorkManage.BeginTran();


                        if(lastReturnOrder == null)


                        {


                    _returnOrderRepository.AddData(returnOrder);


                            lastReturnOrder = returnOrder;


                        }


                    stockInfo.LocationCode = "";


                    stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();


                    stockInfo.Remark = "余料退库";


                    stockInfoDetail.OutboundQuantity = 0;


                    stockInfoDetail.StockQuantity = returnQuantity;


                    stockInfoDetail.OrderNo = returnOrder.OrderNo;


                        stockInfoDetail.OrderNo = lastReturnOrder.OrderNo;


                    _stockService.StockInfoService.Repository.UpdateData(stockInfo);


                    _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);


                    _unitOfWorkManage.CommitTran();


                }


                else


                {


                    DeleteAndMoveIntoHtStockStatus(stockInfo);


                }


            }






        }




        //低温、药水回库单