1111

lss

3 天以前 17e3ef45fe0a6b6f8a147b50740834ac734f9317

 HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/wms/LocationHelper.cs

@@ -84,13 +84,31 @@
                //托盘入库，相同物料内测排的货位
                var Locs = GetLocByItemCode(areaCode, itemCode, 1).OrderByDescending(b => b.N_COL).ToList();


                if (Locs.Count > 0)
                {
                    //内测排有货位，判断外侧排是否有货位
                    for (int i = Locs.Count - 1; i >= 0; i--)
                    {
                        int row = 0;
                        //判断外侧排
                        switch (list[i].N_ROW)
                        {
                            case 1:
                                row = 2;
                                break;
                            case 4:
                                row = 3;
                                break;
                            case 5:
                                row = 6;
                                break;
                            case 8:
                                row = 7;
                                break;
                        }
                        //寻找外侧货位
                        var OutLoc = db.Queryable<Location>().Where(a => a.S_AREA_CODE == Locs[i].S_AREA_CODE && a.N_LAYER == Locs[i].N_LAYER && a.N_POS == 2 && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0&&a.N_ROADWAY == Locs[i].N_ROADWAY).First();
                        var OutLoc = db.Queryable<Location>().Where(a => a.S_AREA_CODE == Locs[i].S_AREA_CODE && a.N_LAYER == Locs[i].N_LAYER && a.N_ROW == row && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.N_ROADWAY == Locs[i].N_ROADWAY).First();
                        if (OutLoc != null)
                        {
                            location = OutLoc;
@@ -127,7 +145,7 @@
        /// <param name="row">货位排</param>
        /// <param name="ItemCode">物料编码</param>
        /// <returns></returns>
        internal static Location GetLocByItemCodeOrderyTime(string areaCode, string ItemCode)
        internal static Location GetLocByItemCodeOrderyTime(string areaCode, string ItemCode, string soure = "1")
        {
            Location loc = null;
            var db = new SqlHelper<object>().GetInstance();
@@ -137,11 +155,13 @@
                var loc1 = db.Queryable<Location>()
                    .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
                    .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
                    .Where((a, b, c) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode
                     && c.S_ITEM_CODE == ItemCode && a.N_LOCK_STATE == 0)
                    .GroupBy((a, b, c) => new { a.S_CODE, c.T_INBOUND_TIME, a.N_POS })
                    .LeftJoin<Container>((a, b, c, d) => d.S_CODE == c.S_CNTR_CODE)
                    .Where((a, b, c, d) => a.N_CURRENT_NUM > 0 && a.N_LOCK_STATE == 0 && a.S_AREA_CODE == areaCode
                     && c.S_ITEM_CODE == ItemCode && d.S_SOURCE == soure)
                    .GroupBy((a, b, c) => new { a.S_CODE, c.T_INBOUND_TIME, a.N_POS, a.N_COL })
                    .OrderBy((a, b, c) => c.T_INBOUND_TIME)
                    .OrderByDescending((a, b, c) => a.N_POS)
                    .OrderBy((a, b, c) => a.N_COL)
                    .Select((a, b, c) => new
                    {
                        S_CODE = a.S_CODE,
@@ -150,8 +170,11 @@
                    })
                    .ToList();
                // var LocCodes = loc1.Select(a => a.S_CODE).First();

                if (loc1.Count > 0)
                {
                loc = db.Queryable<Location>().Where(a => a.S_CODE == loc1.First().S_CODE).First();
                }


                return loc;
            }
@@ -579,6 +602,7 @@
                db.BeginTran();
                var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == loc).ToList();
                var count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand();

                location.N_CURRENT_NUM = lcrList.Count - count;
                location.S_LOCK_STATE = "无";
                location.N_LOCK_STATE = 0;
@@ -616,6 +640,7 @@
                        count++;
                    }
                });

                location.N_CURRENT_NUM = lcrList.Count + count;
                location.N_LOCK_STATE = 0;
                location.S_LOCK_STATE = "无";