Merge branch 'master' into djp

test

4 天以前 e9c1fb1cae94c52d2a634f6e21a3a87354b52716

Merge branch 'master' into djp

 Pda/View/AsnSetting/productEnterQuantity.html

@@ -917,11 +917,13 @@

            }


            var isChongFu = true;
            //绑定到托盘事件
            form.on('submit(formBind)', function (data) {
                if (isChongFu == true) {
                    isChongFu = false; 

                if (xianshiyemian == 0) {
                    console.log($("#goodSelect").val());
                    if ($("#bar").val() == "") {
                        layer.msg('请选择入库单', {
                            icon: 2,
@@ -961,7 +963,8 @@
                        Origin: "PDA",
                        TableType: xianshiyemian,
                    }
                    console.log(param)
                        layer.msg('数据提交中，正在组托...');
                        setTimeout(function() {
                    //组盘
                    sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
                        if (res.code == 0) { //成功
@@ -974,6 +977,8 @@
                                $("#BOXCODE").val("");
                                $("#BOXCODE2").val("");
                                $("#QTY").val("");

                                        isChongFu = true;
                            });
                        } else { //不成功
                            layer.msg(res.msg, {
@@ -981,9 +986,12 @@
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {
                                //回调
                                        isChongFu = true;
                            });
                        }
                    });
                        }, 2000); // 延迟 1.5 秒
                        
                }
                else if (xianshiyemian == 1) {
                    if ($("#bar1").val() == "") {
@@ -1035,6 +1043,8 @@
                                //refreshTable();
                                $("#STOCKCODE").val("");
                                $("#SkuQty").val("");

                                    isChongFu = true;
                            });
                        } else { //不成功
                            layer.msg(res.msg, {
@@ -1042,10 +1052,18 @@
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {
                                //回调
                                    isChongFu = true;
                            });
                        }
                    });
                }
                }else{
                    layer.msg("请勿重复点击", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    });
                }
                

                return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
            });

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -701,9 +701,9 @@
            {
                throw Oops.Bah("托盘储位信息不存在,请检查!");
            }
            if (models.WareHouseNo != "W04")
            if (models.WareHouseNo != "W04" && models.WareHouseNo != "W02")
            {
                throw Oops.Bah("该托盘未在平库内,请检查!");
                throw Oops.Bah("该托盘未在平库内或货架库内,请检查!");
            }
            return models.LocatNo;
        }
@@ -731,7 +731,7 @@
                {
                    throw Oops.Bah("托盘储位信息不存在,请检查!");
                }
                if (models.WareHouseNo != "W04")
                if (models.WareHouseNo != "W04" && models.WareHouseNo != "W02")
                {
                    throw Oops.Bah("该托盘未在平库内,请检查!");
                }
@@ -741,8 +741,14 @@
                    throw Oops.Bah("储位信息不存在,请检查!");
                }

                
                if (models.WareHouseNo == "W02")
                {
                    storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04" && (w.AreaNo == "B01" || w.AreaNo == "B02")).OrderBy(o => o.AreaNo).ToListAsync();
                }
                else
                {
                storageArea = await Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo != storageLocat.AreaNo && w.WareHouseNo == "W04").OrderBy(o => o.AreaNo).ToListAsync();
                }
                
            }
            return storageArea;
@@ -839,7 +845,7 @@
                {
                    throw Oops.Bah("托盘储位信息不存在,请检查!");
                }
                if (stockDetail.WareHouseNo != "W04")
                if (stockDetail.WareHouseNo != "W04" && stockDetail.WareHouseNo != "W02")
                {
                    throw Oops.Bah("该托盘未在平库内,请检查!");
                }

 Wms/WMS.BLL/HttpServer.cs

@@ -144,7 +144,12 @@
                for (int i = 1; i <= 2; i++)
                {
                    var iStr = i.ToString();
                    try
                    {
                    locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "", iStr);
                    }
                    catch (Exception e)
                    { }
                    if (locate != null)
                    {
                        break;
@@ -840,7 +845,15 @@
                var roadStr = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m=>m.RoadwayNo).ToList();
                //巷道组信息
                var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo) && roadStr.Contains(m.RoadwayNo))
                    .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
                    .GroupBy(m => m.RoadwayNo)
                    .Select(m => m.RoadwayNo)
                    .ToList()
                    .OrderBy(roadwayNo =>
                    {
                        // 移除所有非数字字符，只保留数字
                        var numbersOnly = new string(roadwayNo.Where(char.IsDigit).ToArray());
                        return int.TryParse(numbersOnly, out int result) ? result : 0;
                    }).ToList();

                #endregion


 Wms/WMS.BLL/Logic/AllotLocation.cs

@@ -43,7 +43,7 @@
            {
                // 判断当前巷道(组)是否有空余储位
                 
                var locateCount = db.Queryable<SysStorageLocat>().Count(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l);
                var locateCount = db.Queryable<SysStorageLocat>().Count(m => m.IsDel=="0" && m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l);
                
                var bindNum = db.Queryable<LogTask>().Where(m => m.IsDel == "0" && (m.Status == "0" || m.Status == "1") && m.EndRoadway == l)
                            .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
@@ -312,6 +312,22 @@

                var roadList = db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) )
                    .GroupBy(m=>m.RoadwayNo).Select(m=>m.RoadwayNo).ToList();

                if (houseNo == "W02")
                {
                    //一楼巷道
                    var conveyList1 = new List<string>() { "LR01", "LR02", "LR03", "LR04", "LR05", "LR06", "LR07", "LR08" };
                    //二楼巷道
                    var conveyList2 = new List<string>() { "LR09", "LR10", "LR11", "LR12" };
                    if (ceng == "1")
                    {
                        roadList = roadList.Where(m => conveyList1.Contains(m)).ToList();
                    }
                    else if (ceng == "2")
                    {
                        roadList = roadList.Where(m => conveyList2.Contains(m)).ToList();
                    }
                }

                //数据字典(获取字典中仓库类型)
                var dic = db.Queryable<SysDictionary>().First(m => m.Id.ToString() == house.Type);
@@ -601,10 +617,10 @@
            foreach (var area in areaList)
            {
                var sql = $@"select * from SysStorageLocat where IsDel = 0 and Layer!= '3' and Flag = 0 and [Status] = 0 and RoadwayNo = '{roadwayNo}' and AreaNo = '{area}' and LocatNo not in({str}) ";
                if (!string.IsNullOrWhiteSpace(ceng))
                {
                    sql += $"and Layer = '{ceng}' ";
                }
                //if (!string.IsNullOrWhiteSpace(ceng))
                //{
                //    sql += $"and Layer = '{ceng}' ";        
                //}
                sql += "order by ";
                sql += topOrBom == 0 ? "Layer desc, " : "Layer, ";
                sql += leftOrRight == 0 ? "[Column], " : "[Column] desc, ";