Merge branch 'master' into wxw

Administrator

2024-03-28 142b9361406c50d66699427caec485363bdc6252

Merge branch 'master' into wxw

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -153,39 +153,58 @@
            try
            {
                string skuType = string.Empty;
                int IsPack = 0; //0：不管 1：贴 2：不贴
                /**
                 * 成品贴         0
                 * 采购可贴可不贴    1
                 * 中间品不贴    2
                 * 退货贴        3
                 * 余料退回可贴可不贴    4
                 * 其它可贴可不贴    5
                 * 代储不贴        6
                 * 寄存不贴        7
                 */
                switch (model.Type)//0：原料 1：包材 2：成品 3：耗材 4：半成品
                {
                    case "0"://成品入库
                        skuType = "(2)";
                        IsPack = 1; //贴
                        break;
                    case "1"://采购入库
                        skuType = "(0,1,3)";
                        break;
                    case "2"://中间品入库
                        skuType = "(4)";
                        IsPack = 2; //不贴
                        break;
                    case "3"://退货入库
                        skuType = "(2)";
                        IsPack = 1; //贴
                        break;
                    case "4"://车间余料退回入库
                        skuType = "(0,1,3)";
                        break;
                    case "5"://其它入库
                        skuType = "(0,1,3)";
                        break;
                    case "6"://代储入库
                        skuType = "(2)";
                        break;
                    case "1"://采购入库
                        skuType = "(0,1,3)";
                        break;
                    case "4"://车间余料退回入库
                        skuType = "(0,1,3)";
                        break;
                    case "2"://中间品入库
                        skuType = "(4)";
                        IsPack = 2; //不贴
                        break;
                    case "7"://寄存入库
                        skuType = "(3)";
                        //skuType = "(3)";
                        IsPack = 2; //不贴
                        break;
                    default: //其它
                        skuType = "(0,1,2,3,4)";
                        //skuType = "(0,1,2,3,4)";
                        break;
                }

                Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
                    .AndIF(true, it => skuType.Contains(it.Type))
                    .AndIF(model.Type != "7", it => skuType.Contains(it.Type))
                    .AndIF(model.Type == "7", it => it.SkuNo == "100088")
                    .AndIF(IsPack == 1, it => it.PackagNo != "")
                    .AndIF(IsPack == 2, it => it.PackagNo == "")
                    .AndIF(true, it => it.IsDel == "0")
                    .And(it => it.SkuNo != "100099")
                    .AndIF(!string.IsNullOrWhiteSpace(model.SkuNo),
@@ -201,6 +220,8 @@
                    .Includes(x => x.PackagInfo)
                    .ToList();



                return data.Select(m => new MaterialsDto()
                {
                    //Id = m.Id,

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1233,6 +1233,20 @@

                #endregion

                #region 验证储位状态是否正常

                var locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.LocatNo == result.LocatNo);
                if (locat == null)
                {
                    throw new Exception("未获取到对应储位信息，请检查!");
                }
                if (locat.Status != "1")
                {
                    throw new Exception("当前储位不是有物品，请检查!");
                }

                #endregion

                //获取库存明细信息
                var stockDetail = Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.PalletNo == palletNo).ToList();
                //验证库存明细信息是否存在
@@ -1284,6 +1298,10 @@
                        item.AreaNo = "";//所属区域更改（改为空）
                        Db.Updateable(item).ExecuteCommand();
                    }
                    //变更储位状态
                    locat.Status = "0";//储位更改（改为空储位）
                    Db.Updateable(locat).ExecuteCommand();

                    //出库流水（更改状态）
                    var allot = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo && m.SONo == soNo).ToList();


 Wms/Wms/Controllers/BllAsnController.cs

@@ -97,6 +97,11 @@
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        /// <summary>
        /// 获取添加明细数据源
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetMaterialsList(GetMaterialsVm model)
        {