blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
hudong
2025-06-04 a9b773182cbae218f87bbebb0b88871180677a63 
 api/WmsSpaHelper.cs


@@ -451,17 +451,6 @@


                            }


                            foreach (var item in items.ITEM)


                            {


                              //bool v=  MaterPanduan(item.WLBM, item.SL);


                              //  if (!v)


                              //  {


                              //      result.resultMsg = "失败";


                              //      result.WLPZBH = items.HEAD.WLPZH;


                              //      result.resultCode = 1;


                              //      result.WLPZND = items.HEAD.WLPZND;


                              //      result.resultMsg = $"物料{item.WLBM}数量超过 库存总数";


                              //      simpleResults.Add(result);


                              //      continue;


                              //  }


                                ///判断是否都有冲销凭证编号


                                if (string.IsNullOrEmpty(item.CXPZH))


                                {


@@ -1224,9 +1213,10 @@


                            po.Details = new List<TN_Inbound_Detail>();


                            if (itemwlpz.ITEM.Count > 0)


                            {


                                itemwlpz.ITEM.ForEach(a =>


                                foreach (var a in itemwlpz.ITEM)


                                


                                {




                                  


                                    po.Details.Add(new TN_Inbound_Detail


                                    {


                                        S_IO_NO = itemwlpz.HEAD.WLPZH,


@@ -1248,7 +1238,7 @@


                                    });


                                    //}




                                });


                                }


                                db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();


                                db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();


                                db.CommitTran();


@@ -1262,7 +1252,7 @@


                            var Details = new List<TN_Inbound_Detail>();


                            if (itemwlpz.ITEM.Count > 0)


                            {


                                itemwlpz.ITEM.ForEach(a =>


                                foreach (var a in itemwlpz.ITEM)


                                {


                                    if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).Count() > 0)


                                    {


@@ -1292,7 +1282,7 @@


                                        });


                                    }




                                });


                                }


                                db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();


                                db.CommitTran();




@@ -1371,8 +1361,10 @@


                                po.Details = new List<TN_Inbound_Detail>();


                                if (itemwlpz.ITEM.Count > 0)


                                {


                                    itemwlpz.ITEM.ForEach(a =>


                                    foreach (var a in itemwlpz.ITEM)


                                   


                                    {


                                        


                                        #region 不需要


                                        //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//判断序列号是否为多个


                                        //{


@@ -1424,7 +1416,7 @@


                                        });


                                        //}




                                    });


                                    }


                                    db.Insertable<TN_Inbound_Order>(po).ExecuteCommand();


                                    db.Insertable<TN_Inbound_Detail>(po.Details).ExecuteCommand();


                                    db.CommitTran();


@@ -1436,7 +1428,8 @@


                                var Details = new List<TN_Inbound_Detail>();


                                if (itemwlpz.ITEM.Count > 0)


                                {


                                    itemwlpz.ITEM.ForEach(a =>


                                    foreach (var a in itemwlpz.ITEM)


                                   


                                    {


                                        if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBH).Count() > 0)


                                        {


@@ -1471,7 +1464,7 @@


                                            });


                                        }




                                    });


                                    }


                                    db.Insertable<TN_Inbound_Detail>(Details).ExecuteCommand();


                                    db.CommitTran();




@@ -1771,6 +1764,15 @@


        internal static SimpleResult InboundOrderSorting(MPSorting model)


        {


            var result = new SimpleResult();


            foreach (var a in model.MaterList)


            {


                bool v = MaterPanduan(a.item_code, a.qty);


                if (v)


                {


                    result.resultMsg = $"物料{a.item_code}数量超过 库存总数";


                    return result;


                }


            }


            //判断起始库位是否锁定


            // var db = new SqlHelper<object>().GetInstance();


            using (var db = new SqlHelper<object>().GetInstance())


@@ -1931,6 +1933,7 @@


                                   .LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE&&cir.S_CNTR_TYPE=="半托")


                                   .Where((lcr, cir) => cir.S_CNTR_CODE != null)  


                                   .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE && loc.S_AREA_CODE == "HJQ")


                                    .OrderBy((lcr, cir) => cir.T_CREATE)


                                   .Select((lcr, cir, loc) => loc).ToList()  // 返回 Location 对象


                                   .FirstOrDefault();  // 或者 Take(1).ToList()[0]


                        }


@@ -3141,7 +3144,7 @@


        [ApiExplorerSettings(IgnoreApi = true)]


        public static SimpleResult AddInboundOrder(List<Mater> MaterList, string cntr_code,string S_CNTR_TYPE)


        {


            var result = new SimpleResult();


            var result = new SimpleResult();     


            //  var db = new SqlHelper<object>().GetInstance();


            using (var db = new SqlHelper<object>().GetInstance())


            {