Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

admin

2 天以前 51e0304ffad3ddfbbfd212a55fa4220ae8a7f047

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -613,11 +613,11 @@

                        CreateUser = 0,
                    };
                    if (houseNo == "1000" || houseNo == "1001" || houseNo == "2000" || houseNo == "2002" || houseNo == "2003" || houseNo == "2004")
                    if (houseNo == "1000" || houseNo == "1001" || houseNo == "1002" || houseNo == "1003" || houseNo == "1098" || houseNo == "2000" || houseNo == "2001" || houseNo == "2002" || houseNo == "2003" || houseNo == "2004" || houseNo == "3101" || houseNo == "3102" || houseNo == "3103" || houseNo == "3104")
                    {
                        notice.WareHouseNo = "W02";
                    }
                    else if (houseNo == "4000")
                    else if (houseNo == "4000" | houseNo == "4001")
                    {
                        notice.WareHouseNo = "W01";
                    }
@@ -753,12 +753,12 @@
                    //系统对接后放开
                    var jsonData = JsonConvert.SerializeObject(soInfo);

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

                    var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
                    if (obj.Success != 0)
                    var obj = JsonConvert.DeserializeObject<SapResultModel>(response);//解析返回数据
                    if (obj.RESULT != true)
                    {
                        throw new Exception("上传失败" + obj.Message);
                        throw new Exception("上传失败" + obj.MESSAGE);
                    }
                    #endregion
                }
@@ -1231,7 +1231,7 @@
                    //添加出库单
                    foreach (var d in model.Detail)
                    {
                        if (d.Qty < 1)
                        if (d.Qty <= 0)
                        {
                            throw new Exception("出库数量必须大于0");
                        }
@@ -1452,7 +1452,8 @@
                {
                    throw new Exception("未查询到出库单据信息");
                }
                if (notice.Origin != "WMS" || notice.Status != "0")
                //if (notice.Origin != "WMS" || notice.Status != "0")
                if (notice.Status != "0")
                {
                    throw new Exception("参数异常,请检查状态是否未等待执行或来源是否是WMS");
                }
@@ -1509,7 +1510,7 @@
                        //更新出库单
                        foreach (var d in model.Detail)
                        {
                            if (d.Qty < 1)
                            if (d.Qty <= 0)
                            {
                                throw new Exception("出库数据必须大于0");
                            }
@@ -2455,7 +2456,7 @@
                var allot = new AllotLocation();

                #region 集合 
              

                Db.BeginTran();
                try
                {
@@ -2792,7 +2793,7 @@
                        decimal needQty = detail.Qty - (detail.AllotQty == null ? 0 : decimal.Parse(detail.AllotQty.ToString()));
                        //库存明细 Status 0：待分配 1：部分分配  2：已分配 
                        var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.SkuNo == detail.SkuNo && (m.Qty - m.FrozenQty - m.LockQty + m.InspectQty) > 0 && (m.Status == "0" || m.Status == "1") && m.IsDel == "0"
                        && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24")//排除车间库存
                        && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24" && m.AreaNo != "B26" && m.AreaNo != "B27" && m.AreaNo != "B28")//排除车间库存
                            .ToList();


@@ -2896,7 +2897,7 @@
                            {
                                s.Status = "1";
                            }
                           

                            var sd = Db.Updateable(s).UpdateColumns(it => new { it.LockQty, it.Status }).ExecuteCommand();

                        }
@@ -2973,7 +2974,7 @@
                            notice.Status = "3";//正在执行
                        }
                    }
                    

                    notice.UpdateUser = userId;
                    notice.UpdateTime = DateTime.Now;
                    var zd = Db.Updateable(notice).ExecuteCommand();
@@ -4430,7 +4431,7 @@
                                }
                            }
                        }
                        if(string.IsNullOrEmpty(newAddress))
                        if (string.IsNullOrEmpty(newAddress))
                        {
                            //已有物品的巷道
                            var roadwayHave = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.WareHouseNo == "W01").GroupBy(g => g.RoadwayNo).Select(s => s.RoadwayNo).ToList();
@@ -4461,7 +4462,7 @@
                                }
                            }
                        }
                        

                    }
                }

@@ -4642,7 +4643,7 @@
                else
                {
                    // 取最上面一排
                    location = slotModel[0].LocatNo;                    
                    location = slotModel[0].LocatNo;
                }

                bl = true;
@@ -4763,7 +4764,9 @@

                    }

                    var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && (m.AreaNo == "B02" || m.AreaNo == "B05")).Select(m => m.LocatNo).ToList();
                    //所属区域集合
                    List<string> areNolist = new List<string>() { "B01", "B02", "B05" };
                    var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && areNolist.Contains(m.AreaNo)).Select(m => m.LocatNo).ToList();
                    //判断是否是原辅料出库任务  货架储位=》平库储位
                    if (endLocateList.Contains(task.EndLocat) && PalletType == "0")
                    {