Merge branch 'csc'

Demo

2024-03-21 5ee576e2cd08ac783b064b5b550236d35f11533f

Merge branch 'csc'

 HTML/views/BaseSetting/MaterialsForm.html

@@ -325,6 +325,7 @@
                            $("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 是否免检
                            $("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected", "selected");// 单位
                            $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 包装
                            $("#PackagNo").attr("disabled", "disabled")
                            $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 存储环境
                            $("input[name='Weight']").val(res.data.Weight); // 理论重量
                            $("input[name='Warranty']").val(res.data.Warranty); // 保质期

 Pda/View/index.html

@@ -101,7 +101,7 @@
            <div id="" class="layout-sub-content">
                <div id="menuList" class="menu">
                    <ul class="" style="text-align: center;">
                        <li><a lang href="/pda_09/View/login.html">重新登录</a></li>
                        <li><a lang href="/View/login.html">重新登录</a></li>
                    </ul>
                </div>
                <div class="" >

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1934,9 +1934,9 @@
                }
                //判断托盘是否在库外
                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
                if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
                if (stockDetail != null)// && !string.IsNullOrEmpty(stockDetail.WareHouseNo)
                {
                    throw new Exception("该托盘未在库外，请核实！");
                    throw new Exception("该托盘在库存已有信息，请核实！");
                }
                // 验证入库单明细是否存在
                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));

 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -40,7 +40,7 @@
                "stock.LockQty,stock.FrozenQty,stock.OwnerNo,stock.OwnerName,(mate.Weight * stock.Qty) WeightSum " +
                "from DataStock stock " +
                "left join SysMaterials mate on stock.SkuNo = mate.SkuNo " +
                "Where stock.IsDel = @isdel";
                "Where stock.IsDel = @isdel and mate.IsDel = 0 ";
            //判断物料编码是否为空
            if (!string.IsNullOrEmpty(skuNo))
            {
@@ -83,36 +83,37 @@

            foreach (var item in StockList)
            {
                //判断库存总量是否拥有物料
                if (StockListDto.Count > 0)
                {
                    int i = 0;
                    //foreach循环库存总量
                    foreach (var dto in StockListDto)
                    {
                        //判断物料和批次是否相同
                        if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
                        {
                            dto.Qty =  (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
                            dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
                            dto.LockQty = (Convert.ToDecimal(dto.LockQty) + Convert.ToDecimal(item.LockQty)).ToString();
                            dto.ResidueQty= (Convert.ToDecimal(dto.ResidueQty) + Convert.ToDecimal(item.ResidueQty)).ToString();
                            break;
                        }
                        i += 1;
                        //判断已有相同物料
                        if (i == StockListDto.Count)
                        {
                            StockListDto.Add(item);
                            break;
                        }
                    }
                }
                else
                {
                    StockListDto.Add(item);
                    continue;
                }
                StockListDto.Add(item);
                ////判断库存总量是否拥有物料
                //if (StockListDto.Count > 0)
                //{
                //    int i = 0;
                //    //foreach循环库存总量
                //    foreach (var dto in StockListDto)
                //    {
                //        //判断物料和批次是否相同
                //        if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
                //        {
                //            dto.Qty =  (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
                //            dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
                //            dto.LockQty = (Convert.ToDecimal(dto.LockQty) + Convert.ToDecimal(item.LockQty)).ToString();
                //            dto.ResidueQty= (Convert.ToDecimal(dto.ResidueQty) + Convert.ToDecimal(item.ResidueQty)).ToString();
                //            break;
                //        }
                //        i += 1;
                //        //判断已有相同物料
                //        if (i == StockListDto.Count)
                //        {
                //            StockListDto.Add(item);
                //            break;
                //        }
                //    }
                //}
                //else
                //{
                //    StockListDto.Add(item);
                //    continue;
                //}
            }

            return StockListDto;