提交

username@email.com

2025-11-21 24ac6e50da797cc3372f67f346618be86b86c4d1

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs

@@ -93,7 +93,7 @@
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;

            }
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookSizeTxt).ThenBy(x => x.WorkBookNameTxt);

            var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
            foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
@@ -134,7 +134,8 @@
                // 统计结果
                //Count = g.Count(), // 每组人数
                //AverageSalary = g.Average(p => p.Salary), // 平均工资
                Number = g.Sum(p => p.Number) // 工资总和
                Number = g.Sum(p => p.Number), // 工资总和
                LessNumber = g.Sum(p => p.LessNumber)
            }).ToList();


@@ -153,13 +154,14 @@
                if (coreDeliverOrderItem != null)
                {
                    cmsPlanOrderItem.songhuonums = coreDeliverOrderItem.Number;
                    cmsPlanOrderItem.LessNumber = coreDeliverOrderItem.LessNumber;
                }
                    
              
                cmsPlanOrderItem.kucunnums = cmsPlanOrderItem.fahuonums - cmsPlanOrderItem.songhuonums;


                cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums;
                cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums - cmsPlanOrderItem.LessNumber;
            }


@@ -206,16 +208,16 @@
                for (int i = 0; i < fahuos.Length; i++)
                {
                    var fahuo = fahuos[i].ToInt32();
                    if (fahuo.HasValue && fahuo.Value > 0)
                    if (fahuo.HasValue && fahuo.Value != 0)
                    {
                        yanzheng = true;
                    }
                    var weifahuonums = weifahuonumss[i].ToInt32();
                    if(fahuo.Value > weifahuonums.Value)
                    {
                        JavaScript.MessageBox((i+1)+"行发货数量大于未发货数量", this);
                        return;
                    }
                    //var weifahuonums = weifahuonumss[i].ToInt32();
                    //if(fahuo.Value > weifahuonums.Value)
                    //{
                    //    JavaScript.MessageBox((i+1)+"行发货数量大于未发货数量", this);
                    //    return;
                    //}

                }

@@ -224,6 +226,7 @@
                    JavaScript.MessageBox( "没有填写发货数量", this);
                    return;
                }
                var createtimea = DateTime.Now;
                var ssss = false;
                for (int i = 0; i < fahuos.Length; i++)
                {
@@ -232,7 +235,7 @@
                    coreCmsPlanOrder.name = names[i];
                    coreCmsPlanOrder.specification = specifications[i];
                    coreCmsPlanOrder.nums = fahuos[i].ToInt32().Value;
                    coreCmsPlanOrder.createTime = DateTime.Now;
                    coreCmsPlanOrder.createTime = createtimea;
                    coreCmsPlanOrder.upDataTime = coreCmsPlanOrder.createTime;
                    coreCmsPlanOrder.createBy = CurrentUser.ShortName;
                    coreCmsPlanOrder.upDataBy = CurrentUser.ShortName;