Pda/View/SoSetting/palletOut.html

@@ -61,16 +61,16 @@
                            <label class="layui-form-label">托盘垛数：</label>
                            <div class="layui-input-block">
                                <input id="STOCKCODE" type="number" lay-verify="stock" placeholder="托盘垛数"
                                    autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                    autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" value="1" disabled>
                            </div>
                        </div>
                        <div id="layout-bill" class="layui-form-item layout-dropdownlist" >
                            <label class="layui-form-label">出库口：</label>
                            <label class="layui-form-label">出库位置：</label>
                            <div class="layui-input-block" id="selectDiv">
                                <select id="bar" lay-filter="getbar" lay-verify="required" lay-search>
                                    <option value=""></option>
                                    <option value="17">17</option>
                                    <option value="18">18</option> 
                                    <option value="B080101">B080101</option>
                                    <option value="B080102">B080102</option> 
                                </select>
                                <!-- <img src="/assets/down_arraw.png" > -->
                            </div>
@@ -104,7 +104,7 @@
                // }
                
                function clear(){ 
                    $("#STOCKCODE").val(""); 
                    $("#STOCKCODE").val("1"); 
                    $("#bar option[value='']").attr("selected", "selected");
                    form.render('select');
                }

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -961,108 +961,108 @@
                    return "-1:关单失败！";
                }
                #region 采购计划，若是采购订单根据采购计划单自动生成入库单信息
                if (notice.Type == "1" && !string.IsNullOrEmpty(notice.OrderCode))
                {
                    // 获取采购总单信息
                    var planOrd = Db.Queryable<BllProcurePlanNotice>().First(it => it.OrderCode == notice.OrderCode && it.IsDel == "0");
                    //入库单明细
                    var noticeDetailList = Db.Queryable<BllArrivalNoticeDetail>()
                        .Where(m => m.IsDel == "0" && m.ASNNo == notice.ASNNo).ToList();
                    foreach (var item in noticeDetailList)
                    {
                        //采购单明细
                        var planDetail = Db.Queryable<BllProcurePlanNoticeDetail>()
                            .First(it => it.ParentId == planOrd.Id && it.SkuNo == item.SkuNo && it.IsDel == "0");
                        planDetail.CompleteQty += item.CompleteQty;
                        if (planDetail.CompleteQty >= planDetail.Qty)
                        {
                            planDetail.Status = "2";
                            planDetail.CompleteTime = comTime;
                        }
                        else
                        {
                            planDetail.Status = "1";
                        }
                        Db.Updateable(planDetail).ExecuteCommand();
                    }
                    // 维护采购总单信息
                    var planDetailNum = Db.Queryable<BllProcurePlanNoticeDetail>().Count(m => m.IsDel == "0" && m.ParentId == planOrd.Id && m.Status != "2");
                    if (planDetailNum == 0)
                    {
                        planOrd.Status = "2";
                        planOrd.CompleteTime = comTime;
                        Db.Updateable(planOrd).ExecuteCommand();
                    }
                    else
                    {
                        if (planOrd.Status == "0")
                        {
                            planOrd.Status = "1";
                            Db.Updateable(planOrd).ExecuteCommand();
                        }
                    }
                    //采购单明细
                    var planDetailList = Db.Queryable<BllProcurePlanNoticeDetail>()
                        .Where(it => it.ParentId == planOrd.Id && it.IsDel == "0" && it.CompleteQty < it.Qty).ToList();
                    foreach (var item in planDetailList)
                    {
                        //判断有无正在执行的
                        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(it => it.OrderDetailCode == item.OrderDetailCode && it.IsDel == "0" && it.Status == "0");
                        if (noticeDetail != null)
                        {
                            continue;
                        }
                        // 获取物料详细信息
                        var skuModel = Db.Queryable<SysMaterials>().First(it => it.SkuNo == item.SkuNo && it.IsDel == "0");
                        if (skuModel == null)
                        {
                            continue;
                        }
                        // 验证包装信息是否存在
                        var packagModel = Db.Queryable<SysPackag>().First(it => it.PackagNo == item.PackagNo && it.IsDel == "0");
                        if (packagModel == null)
                        {
                            continue;
                        }
                        // 入库总表信息
                        string asnNo = new Common().GetMaxNo("ASN");
                        var asnModel1 = new BllArrivalNotice()
                        {
                            ASNNo = asnNo,
                            Status = "0",//执行状态，0：等待执行
                            Type = "1",//单据类型，1：采购入库
                            Origin = "采购单",
                            CustomerNo = item.CustomerNo,
                            CustomerName = item.CustomerName,
                            OrderCode = planOrd.OrderCode,
                            CreateUser = 0
                        };
                        // 插入入库总表信息
                        Db.Insertable(asnModel1).ExecuteCommand();
                        //入库单明细
                        var arrDetailModel = new BllArrivalNoticeDetail()
                        {
                            ASNNo = asnNo,
                            SkuNo = skuModel.SkuNo,
                            SkuName = skuModel.SkuName,
                            Standard = skuModel.Standard,
                            LotNo = "",
                            LotText = "",
                            Qty = 0,
                            FactQty = 0,
                            CompleteQty = 0,
                            PackagNo = packagModel.PackagNo,
                            SupplierLot = "",
                            Status = "0",
                            IsSampling = "0",
                            InspectStatus = "0",
                            OrderDetailCode = item.OrderDetailCode,
                            CreateUser = 0
                        };
                        // 插入入库总表信息
                        Db.Insertable(arrDetailModel).ExecuteCommand();
                    }
                }
                //if (notice.Type == "1" && !string.IsNullOrEmpty(notice.OrderCode))
                //{
                //    // 获取采购总单信息
                //    var planOrd = Db.Queryable<BllProcurePlanNotice>().First(it => it.OrderCode == notice.OrderCode && it.IsDel == "0");
                //    //入库单明细
                //    var noticeDetailList = Db.Queryable<BllArrivalNoticeDetail>()
                //        .Where(m => m.IsDel == "0" && m.ASNNo == notice.ASNNo).ToList();
                //    foreach (var item in noticeDetailList)
                //    {
                //        //采购单明细
                //        var planDetail = Db.Queryable<BllProcurePlanNoticeDetail>()
                //            .First(it => it.ParentId == planOrd.Id && it.SkuNo == item.SkuNo && it.IsDel == "0");
                //        planDetail.CompleteQty += item.CompleteQty;
                //        if (planDetail.CompleteQty >= planDetail.Qty)
                //        {
                //            planDetail.Status = "2";
                //            planDetail.CompleteTime = comTime;
                //        }
                //        else
                //        {
                //            planDetail.Status = "1";
                //        }
                //        Db.Updateable(planDetail).ExecuteCommand();
                //    }
                //    // 维护采购总单信息
                //    var planDetailNum = Db.Queryable<BllProcurePlanNoticeDetail>().Count(m => m.IsDel == "0" && m.ParentId == planOrd.Id && m.Status != "2");
                //    if (planDetailNum == 0)
                //    {
                //        planOrd.Status = "2";
                //        planOrd.CompleteTime = comTime;
                //        Db.Updateable(planOrd).ExecuteCommand();
                //    }
                //    else
                //    {
                //        if (planOrd.Status == "0")
                //        {
                //            planOrd.Status = "1";
                //            Db.Updateable(planOrd).ExecuteCommand();
                //        }
                //    }
                //    //采购单明细
                //    var planDetailList = Db.Queryable<BllProcurePlanNoticeDetail>()
                //        .Where(it => it.ParentId == planOrd.Id && it.IsDel == "0" && it.CompleteQty < it.Qty).ToList();
                //    foreach (var item in planDetailList)
                //    {
                //        //判断有无正在执行的
                //        var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(it => it.OrderDetailCode == item.OrderDetailCode && it.IsDel == "0" && it.Status == "0");
                //        if (noticeDetail != null)
                //        {
                //            continue;
                //        }
                //        // 获取物料详细信息
                //        var skuModel = Db.Queryable<SysMaterials>().First(it => it.SkuNo == item.SkuNo && it.IsDel == "0");
                //        if (skuModel == null)
                //        {
                //            continue;
                //        }
                //        // 验证包装信息是否存在
                //        var packagModel = Db.Queryable<SysPackag>().First(it => it.PackagNo == item.PackagNo && it.IsDel == "0");
                //        if (packagModel == null)
                //        {
                //            continue;
                //        }
                //        // 入库总表信息
                //        string asnNo = new Common().GetMaxNo("ASN");
                //        var asnModel1 = new BllArrivalNotice()
                //        {
                //            ASNNo = asnNo,
                //            Status = "0",//执行状态，0：等待执行
                //            Type = "1",//单据类型，1：采购入库
                //            Origin = "采购单",
                //            CustomerNo = item.CustomerNo,
                //            CustomerName = item.CustomerName,
                //            OrderCode = planOrd.OrderCode,
                //            CreateUser = 0
                //        };
                //        // 插入入库总表信息
                //        Db.Insertable(asnModel1).ExecuteCommand();
                //        //入库单明细
                //        var arrDetailModel = new BllArrivalNoticeDetail()
                //        {
                //            ASNNo = asnNo,
                //            SkuNo = skuModel.SkuNo,
                //            SkuName = skuModel.SkuName,
                //            Standard = skuModel.Standard,
                //            LotNo = "",
                //            LotText = "",
                //            Qty = 0,
                //            FactQty = 0,
                //            CompleteQty = 0,
                //            PackagNo = packagModel.PackagNo,
                //            SupplierLot = "",
                //            Status = "0",
                //            IsSampling = "0",
                //            InspectStatus = "0",
                //            OrderDetailCode = item.OrderDetailCode,
                //            CreateUser = 0
                //        };
                //        // 插入入库总表信息
                //        Db.Insertable(arrDetailModel).ExecuteCommand();
                //    }
                //}
                #endregion

                Db.Ado.CommitTran();
@@ -1429,7 +1429,7 @@
                //系统对接后放开
                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)

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -2822,8 +2822,8 @@
                //获取当前时间
                DateTime serverTime = Db.GetDate();
                //获取库存明细是否小于等于该垛数
                 
                var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && !string.IsNullOrWhiteSpace(s.WareHouseNo)).ToListAsync();

                var stockDetail = await Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.SkuNo == "100099" && s.Status == "0" && s.WareHouseNo == "W02").ToListAsync();
                if (stockDetail.Count > 0)
                {
                    //判断是否大于需要垛数
@@ -2832,7 +2832,7 @@
                        throw Oops.Bah("需要垛数大于库存垛数，请重新输入!");
                    }
                }
                stockDetail = new AllotSku().GetDataListOrder(stockDetail);
                //stockDetail = new AllotSku().GetDataListOrder(stockDetail);
                //获取库存总表信息
                var stock = await Db.Queryable<DataStock>().FirstAsync(s => s.IsDel == "0" && s.SkuNo == "100099");
                //验证库存总表是否为空
@@ -2840,16 +2840,26 @@
                {
                    throw Oops.Bah("库存信息不存在，请核查!");
                }

                //目标储位信息
                var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.OutMode);
                if (endLocat == null)
                {
                    throw Oops.Bah("库存信息不存在，请核查!");
                }
                //if (endLocat.Status != "0")
                //{
                //    throw Oops.Bah("目标储位不是空储位，请核查!");
                //}
                int i = 0;

                //开启事务
                Db.BeginTran();

                //遍历库存信息 
                foreach (var s in stockDetail)
                {
                    //获取储位信息
                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && (l.WareHouseNo == "W01"||l.WareHouseNo == "W02"));
                    var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");

                    if (locat == null)
                    {
@@ -2863,7 +2873,7 @@
                    locat.Status = "3"; //3 出库中
                    locat.UpdateTime = serverTime; //修改时间
                    locat.UpdateUser = userId; //修改人
                                               //修改储位信息
                    //修改储位信息
                    await Db.Updateable(locat).ExecuteCommandAsync();

                    //增加库存锁定数量
@@ -2908,7 +2918,7 @@
                        Status = "1",
                        LogisticsId = 0,
                        IsAdvance = "0",
                        OutMode = model.OutMode,//出库口
                        OutMode = model.OutMode,//出库目标储位

                        CreateUser = userId,
                        CreateTime = DateTime.Now
@@ -2959,7 +2969,7 @@
                        EndRoadway = endroad,

                        Order = 999,
                        Type = locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
                        Type = PLCTypeEnum.AGV,//locat.WareHouseNo == "W01"?PLCTypeEnum.ShuttleCar : PLCTypeEnum.AGV
                    });
                    await Db.Insertable(exTask).ExecuteCommandAsync();