Merge branch 'master' into wxw

wxw

2 天以前 165a01e366d3331f8a2d2a9e42c05bcd1209abde

Merge branch 'master' into wxw

 Wms/Model/InterFaceModel/HttpModel.cs

@@ -600,12 +600,12 @@
        /// <summary>
        /// 入库单号
        /// </summary>
        public long orderNo { get; set; }
        public string orderNo { get; set; }
        /// <summary>
        /// 入库单类型
        /// 0：成品入库 1：采购入库 3：退货入库 （销售退货）4：余料退回入库  8 ：生产退料入库
        /// </summary>
        public int billType { get; set; }
        public string billType { get; set; }
        /// <summary>
        /// 供应商编号
        /// </summary>
@@ -628,7 +628,7 @@
        /// <summary>
        /// 物料编码
        /// </summary>
        public long skuNo { get; set; }
        public string skuNo { get; set; }
        /// <summary>
        /// 物料名称
        /// </summary>
@@ -640,7 +640,7 @@
        /// <summary>
        /// 批号
        /// </summary>
        public long lotNo { get; set; }
        public string lotNo { get; set; }
        /// <summary>
        /// 生产日期
        /// </summary>

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -6074,11 +6074,14 @@
                {
                    foreach (var item in stockDetail)
                    {
                        if (!string.IsNullOrEmpty(item.WareHouseNo))
                        if (!string.IsNullOrEmpty(item.WareHouseNo) && !string.IsNullOrEmpty(item.AreaNo))
                        {
                            if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09") 
                        {
                            throw new Exception("该托盘未在库外，请核查!");
                        }
                    }
                    }
                    iscount = 1; //回流入库
                }
                #endregion

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -420,7 +420,7 @@
        public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo)
        {
            return await Db.Queryable<DataStockDetail>()
                     .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) && s.PalletNo.Contains(palletNo))
                     .Where(s => s.IsDel == "0" && s.LocatNo.Contains(locatNo) || s.PalletNo.Contains(palletNo))
                     .OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
                     .ToListAsync();