1

Code/LQKJ.K3.CZXT.Pluglus/LQKJ_Warehouserentexpenses_PLTJ.cs

@@ -35,48 +35,59 @@ namespace LQKJ.K3.CZXT.Pluglus
                 decimal F_LQKJ_Specialloading = Convert.ToDecimal(rowData["F_LQKJ_Specialloading"]);//特殊装货
                 decimal F_LQKJ_Inspectionfee = Convert.ToDecimal(rowData["F_LQKJ_Inspectionfee"]);//检查及包装费
                 decimal F_LQKJ_Wdbczce = Convert.ToDecimal(rowData["F_LQKJ_Wdbczce"]);//未达标仓租差额
-                DateTime F_LQKJ_FDATE = Convert.ToDateTime(Convert.ToString(rowData["F_LQKJ_Date"]));//日期
-                string F_LQKJ_FDATEyf = F_LQKJ_FDATE.ToString("yyyy/MM");//设置费用的年月
-               // 动态获取当前日期
-                DateTime currentDate = DateTime.Now;
-                // 获取当前月份
-                int currentMonth = currentDate.Month;
-                // 从数据行中获取用户选择的日期
-                DateTime selectedDate = Convert.ToDateTime(Convert.ToString(rowData["F_LQKJ_Date"]));
-                // 判断逻辑
-                if (selectedDate > currentDate)
+                DateTime F_LQKJ_FDATE;
+                string F_LQKJ_FDATEyf = string.Empty;
+                object dateValue = rowData["F_LQKJ_Date"];
+                if (dateValue != null && !string.IsNullOrEmpty(dateValue.ToString()))
                 {
-                    // 如果选择的日期超过当前日期，则不允许
-                    this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
-                }
-                else if (selectedDate.Year == currentDate.Year) // 如果选择的日期是当前年份
-                {
-                    if (selectedDate.Month > currentDate.Month)
+                    F_LQKJ_FDATE = Convert.ToDateTime(Convert.ToString(rowData["F_LQKJ_Date"]));//日期
+                    F_LQKJ_FDATEyf = F_LQKJ_FDATE.ToString("yyyy/MM");//设置费用的年月
+                                                                             // 动态获取当前日期
+                    DateTime currentDate = DateTime.Now;
+                    // 获取当前月份
+                    int currentMonth = currentDate.Month;
+                    // 从数据行中获取用户选择的日期
+                    DateTime selectedDate = Convert.ToDateTime(Convert.ToString(rowData["F_LQKJ_Date"]));
+                    // 判断逻辑
+                    if (selectedDate > currentDate)
                     {
-                        // 如果选择的日期月份超过当前月份，则不允许
+                        // 如果选择的日期超过当前日期，则不允许
                         this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
                     }
-                    else if (selectedDate.Month == currentDate.Month)
+                    else if (selectedDate.Year == currentDate.Year) // 如果选择的日期是当前年份
                     {
-                        // 如果选择的日期是当前月份，则不允许
-                        this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
+                        if (selectedDate.Month > currentDate.Month)
+                        {
+                            // 如果选择的日期月份超过当前月份，则不允许
+                            this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
+                        }
+                        else if (selectedDate.Month == currentDate.Month)
+                        {
+                            // 如果选择的日期是当前月份，则不允许
+                            this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
+                        }
+                        else if (selectedDate.Month == currentDate.Month - 1)
+                        {
+                            // 如果选择的日期是上一个月的日期，则允许
+                            //Console.WriteLine("选择的日期有效。");
+                        }
                     }
-                    else if (selectedDate.Month == currentDate.Month - 1)
+                    else if (selectedDate.Year < currentDate.Year)
                     {
-                        // 如果选择的日期是上一个月的日期，则允许
+                        // 如果选择的日期是之前年份的日期，则允许
                         //Console.WriteLine("选择的日期有效。");
                     }
-                }
-                else if (selectedDate.Year < currentDate.Year)
-                {
-                    // 如果选择的日期是之前年份的日期，则允许
-                    //Console.WriteLine("选择的日期有效。");
+                    else
+                    {
+                        // 其他情况（例如选择的日期年份超过当前年份），则不允许
+                        this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
+                    }
                 }
                 else
                 {
-                    // 其他情况（例如选择的日期年份超过当前年份），则不允许
-                    this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
+                    this.View.ShowMessage($"请选日期后再设置费用");
                 }
+                
 
                 DynamicObject entityCollection = rowData["F_LQKJ_OrgId"] as DynamicObject;
                 string F_LQKJ_ORGID = Convert.ToString(entityCollection["Name"]);//组织

Code/LQKJ.K3.CZXT.Pluglus/STK_StockSummaryRpt.cs

@@ -37,16 +37,17 @@ namespace LQKJ.K3.CZXT.Pluglus
             base.BuilderReportSqlAndTempTable(filter, strTable);
             //对初步的查询结果进行处理，然后写回基类默认的存放查询结果的临时表
             StringBuilder sb = new StringBuilder();
-            string Sql = @"/*dialect*/SELECT T1.*,CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END AS F_LQKJ_Unitvolume--单位体积
-                        ,T1.FSTOCKJCQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END AS F_LQKJ_Totalvolume --总体积
-                        ,W.F_ORA_DECIMAL_QTR AS F_LQKJ_Warehouserent--仓租单价
-                        ,W.F_ORA_DECIMAL_QTR * (T1.FSTOCKJCQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END) AS F_LQKJ_Warehouse --仓租
-                        ,W.F_ORA_DECIMAL_QTR1 AS F_LQKJ_Unloadingfee --卸车单价
-                        ,W.F_ORA_DECIMAL_QTR1 * (T1.FSTOCKINQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END) AS F_LQKJ_Unloading --卸车费
-                        ,W.F_ORA_DECIMAL_83G AS F_LQKJ_Loadingfee --装车单价
-                        ,W.F_ORA_DECIMAL_83G * (T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END) AS F_LQKJ_Loading--装车费
-                        ,T2.F_LQKJ_Sortingfees AS F_LQKJ_Sortingfees--分拣费单价
-                        ,T2.F_LQKJ_Sortingfees * (T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END) AS F_LQKJ_Sorting--分拣费
+            string Sql = @"/*dialect*/SELECT T1.*,
+                        FORMAT(CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END, '0.######') AS F_LQKJ_Unitvolume--单位体积
+                       ,FORMAT(T1.FSTOCKJCQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END, '0.######') AS F_LQKJ_Totalvolume --总体积
+                       ,FORMAT(W.F_ORA_DECIMAL_QTR, '0.######') AS F_LQKJ_Warehouserent--仓租单价
+                       ,FORMAT(W.F_ORA_DECIMAL_QTR * (T1.FSTOCKJCQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END), '0.######') AS F_LQKJ_Warehouse --仓租
+                       ,FORMAT(W.F_ORA_DECIMAL_QTR1, '0.######') AS F_LQKJ_Unloadingfee --卸车单价
+                       ,FORMAT(W.F_ORA_DECIMAL_QTR1 * (T1.FSTOCKINQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END), '0.######') AS F_LQKJ_Unloading --卸车费
+                       ,FORMAT(W.F_ORA_DECIMAL_83G, '0.######') AS F_LQKJ_Loadingfee --装车单价
+                       ,FORMAT(W.F_ORA_DECIMAL_83G * (T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END), '0.######') AS F_LQKJ_Loading--装车费
+                       ,FORMAT(T2.F_LQKJ_Sortingfees, '0.######') AS F_LQKJ_Sortingfees--分拣费单价
+                       ,FORMAT(T2.F_LQKJ_Sortingfees * (T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END), '0.######') AS F_LQKJ_Sorting--分拣费
                         INTO {0}
                          FROM {1} T1
                         LEFT JOIN LQKJ_SettupParameters T2 on 1=1