修改问题

chengsc

2024-10-18 f2b3c45b78bb9fc021869c4ae35e6de039b50bbf

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -17,6 +17,11 @@
using WMS.Entity.Context;
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllAsnServer;
using WMS.BLL.SysServer;
using System.Threading.Tasks;
using System.Security.Policy;
using WMS.Entity.DataEntity;
using WMS.Entity.BllQualityEntity;

namespace WMS.BLL.BllAsnServer
{
@@ -188,7 +193,7 @@
                        skuType = "(0,1,3)";
                        break;
                    case "6"://代储入库
                        skuType = "(2)";
                        skuType = "(0,1,2,3,4)";
                        IsPack = 2; //不贴
                        break;
                    case "7"://寄存入库
@@ -201,7 +206,7 @@
                }

                Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
                    .AndIF(model.Type != "7", it => skuType.Contains(it.Type))
                    .AndIF(model.Type != "7", it => skuType.Contains(it.Type) && it.SkuNo != "100088")
                    .AndIF(model.Type == "7", it => it.SkuNo == "100088")
                    .AndIF(IsPack == 1, it => it.PackagNo != "")
                    .AndIF(IsPack == 2, it => it.PackagNo == "")
@@ -253,14 +258,15 @@
        }

        //添加入库单据
        public string AddArrivalNotice(ArrivalNoticeVm model)
        public string AddArrivalNotice(ArrivalNoticeVm model, string url)
        {
            string strMessage = "";
            string sqlString = string.Empty;
            string sqlDetailStr = string.Empty;
            //0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料入库 5：其它入库 6：代储入库 7：寄存入库
            var TypeLot = "1, 2, 5, 6, 7"; //批次可为空单据类型
            var TypeLot = "2, 5, 6, 7"; //批次可为空单据类型

            var addOder = new List<ResponseOrderTaskModel>();
            try
            {
                if (model.Origin == "录入")
@@ -280,13 +286,13 @@
                }
                //判断是否为采购入库单据或车间余料退回入库
                // 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库
                if (model.Type == "1" || model.Type == "4")
                {
                    if (!string.IsNullOrWhiteSpace(model.LotNo))
                    {
                        throw new Exception("采购入库或余料退回不可输入批次，不可编辑!");
                    }
                }
                //if (model.Type == "1" || model.Type == "4")
                //{
                //    if (!string.IsNullOrWhiteSpace(model.LotNo))
                //    {
                //        throw new Exception("采购入库或余料退回不可输入批次，不可编辑!");
                //    }
                //}

                sqlString += "Insert into BllArrivalNotice (ASNNo,Type,Origin,CustomerNo,";
                sqlString += "CustomerName,LotNo,LotText,SupplierLot,CreateUser) values ( ";
@@ -316,9 +322,27 @@
                        //判断是否为不限制批次单据
                        if (!TypeLot.Contains(model.Type))
                        {
                            strMessage = "-1:批次号不可为空;";
                            strMessage = "-1:进厂编号不可为空;";
                            continue;
                        }
                    }
                    if (model.Type != "7")
                    {
                        if (!TypeLot.Contains(model.Type))
                        {
                            if (detailModel.LotNo.Length != 10)
                            {
                                strMessage = "-1:进厂编号位数长度有误;";
                                continue;
                            }
                        }
                        
                    }
                    
                    if (model.Type == "1" && string.IsNullOrWhiteSpace(detailModel.SupplierLot)) //采购到货单原厂批号（供货批次）不能为空
                    {
                        strMessage = "-1:原厂批号不可为空;";
                        continue;
                    }
                    // 判断是否已存在当前明细
                    string sqlCount = $"SELECT COUNT(ID) FROM BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' ";
@@ -326,7 +350,7 @@
                    var com = new Common().GetRowCount(sqlCount);
                    if (com > 0)
                    {
                        strMessage = "-1:物料和批次号重复;";
                        strMessage = "-1:物料和进厂编号重复;";
                        continue;
                    }
                    if (detailModel.Price == null)
@@ -340,6 +364,20 @@
                    sqlDetailStr += $"'{model.ASNNo}','{detailModel.SkuNo}','{detailModel.SkuName}','{detailModel.Standard}', ";
                    sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
                    sqlDetailStr += $"{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";

                    if (model.Type == "0")//成品入库单下发WCS信息
                    {
                        addOder.Add(new ResponseOrderTaskModel()
                        {
                            OrderNo = model.ASNNo,
                            LotNo = detailModel.LotNo,
                            SkuNo = detailModel.SkuNo,
                            SkuName = detailModel.SkuName,
                            BoxType = detailModel.Standard,
                            Qty = (int)detailModel.Qty,
                            TaskType = 0
                        });
                    }
                }

                if (sqlDetailStr == string.Empty)
@@ -358,6 +396,35 @@
                if (rowCount > 0 && rowDetailCount > 0)
                {
                    new OperationASNServer().AddLogOperationAsn("入库作业", "入库单据", model.ASNNo, "添加", $"添加了单据号为{model.ASNNo}的单据信息", Convert.ToInt32(model.CreateUser));

                    //if (addOder.Count > 0)
                    //{
                    //    // 正式运行程序放开
                    //    var jsonData = JsonConvert.SerializeObject(addOder);
                    //    string response = "";

                    //    try
                    //    {
                    //        var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                    //        //给WCS下发入库单信息
                    //        response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");

                    //        //////解析返回数据 
                    //        var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                    //        if (wcsModel.StatusCode == 0)
                    //        {
                                
                    //        }
                    //        if (wcsModel.StatusCode == -1)
                    //        {

                    //        }
                    //    }
                    //    catch (Exception ex)
                    //    {
                    //        throw new Exception(ex.Message);
                    //    }
                    //}
                    return strMessage;
                }
                else
@@ -869,11 +936,11 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public ErpModel CreateAsn(AsnInfo model)
        public HttpReturnModel HttpCreateAsn(AsnInfo model)
        {
            try
            {
                var resultModel = new ErpModel() { Success = -1, Message = "" };
                var resultModel = new HttpReturnModel() { Success = "-1", Message = "" };
                if (string.IsNullOrEmpty(model.AsnType))
                {
                    resultModel.Message = "单据类型不可为空!";
@@ -972,7 +1039,7 @@
                Db.Insertable(detailModels).ExecuteCommand();
                Db.CommitTran();

                resultModel.Success = 0;
                resultModel.Success = "0";
                resultModel.Message = "成功";
                return resultModel;
            }
@@ -984,7 +1051,7 @@
        }

        //订单回传上游系统
        public bool FinishAsn(int id, string url, int userId)
        public bool FinishAsn(int id, string erpUrl, string mesUrl,string mesTokenUrl, int userId)
        {
            try
            {
@@ -1006,6 +1073,19 @@
                {
                    throw new Exception("复核失败，复核人员和关闭订单人员不能相同！");
                }
                //单据类型是 成品入库或采购入库 判断入库物料是否合格
                if (notice.Type == "0" || notice.Type == "1")
                {
                    foreach (var item in detail)
                    {
                        var instStatus = Db.Queryable<BllQualityInspect>().Count(m => m.IsDel == "0" && m.SkuNo == item.SkuNo && m.LotNo == item.LotNo && m.IsQualified == "1");
                        if (instStatus == 0)
                        {
                            throw new Exception($"{item.SkuNo}、{item.LotNo}质量状态不是合格的，不能回传！");
                        }
                    }
                    
                }
                var list = new List<AsnDetail>();
                foreach (var d in detail)
                {
@@ -1019,23 +1099,53 @@
                    };
                    list.Add(item);
                }
                var soInfo = new AsnInfo()
                var asnInfo = new AsnInfo()
                {
                    OrderCode = notice.OrderCode,
                    AsnDetails = list
                };

                #region 通过接口发送至erp 
                #region 通过接口发送至erp 或 mes
                //系统对接后放开
                /*var jsonData = JsonConvert.SerializeObject(soInfo);
                var jsonData = JsonConvert.SerializeObject(asnInfo);
                var mesList = new List<string>() { "0", "4" };  //0 成品入库 4余料退回入库
                var erpList = new List<string>() { "1", "2", "3" }; //1 采购入库  2中间品入库  3 退货入库

                var response = HttpHelper.DoPost(url, jsonData, "入库单完成上传", "ERP");

                var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
                if (obj.Success != 0)
                if (mesList.Contains(notice.Type)) // mes 
                {
                    throw new Exception("上传失败" + obj.Message);
                }*/
                    //获取令牌
                    var token = new Token().GetMesToken(mesTokenUrl);
                    Dictionary<string, string> mesDic = new Dictionary<string, string>()
                    {
                        {"Authorization",token }
                    };
                    var mesData = new FinishAsnModel()
                    {
                        no = asnInfo.OrderCode,
                        qty = asnInfo.AsnDetails.Sum(m=>m.Qty)
                    };
                    jsonData = JsonConvert.SerializeObject(mesData);
                    //调用接口
                    var response = HttpHelper.DoPost(mesUrl, jsonData, "入库单完成上传", "MES", mesDic);

                    var obj = JsonConvert.DeserializeObject<MesModel>(response);//解析返回数据
                    if (obj.status != "0")
                    {
                        throw new Exception("上传失败" + obj.message);
                    }
                }
                else if (erpList.Contains(notice.Type)) //erp  
                {
                    var response = HttpHelper.DoPost(erpUrl, jsonData, "入库单完成上传", "ERP");

                    var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
                    if (obj.Success != 0)
                    {
                        throw new Exception("上传失败" + obj.Message);
                    }
                }

                
                #endregion

                notice.Status = "4";
@@ -1052,6 +1162,29 @@
            }
        }

        public void UpLocate(string wareNo,string locatNo)
        {
            try
            {
                if (string.IsNullOrWhiteSpace(wareNo) || string.IsNullOrWhiteSpace(locatNo))
                {
                    throw new Exception("仓库或储位不能为空");
                }
                var locate = Db.Queryable<SysStorageLocat>().First(m=>m.IsDel == "0" && m.LocatNo == locatNo && m.WareHouseNo == wareNo);
                if (locate == null)
                {
                    throw new Exception("未查询到储位信息");
                }
                locate.Status = "0";//储位状态变更空储位
                Db.Updateable(locate).ExecuteCommand();

            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        #endregion
    }