1

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

@@ -38,16 +38,16 @@ namespace LQKJ.K3.CZXT.Pluglus
             //对初步的查询结果进行处理，然后写回基类默认的存放查询结果的临时表
             StringBuilder sb = new StringBuilder();
             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--分拣费
+                        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

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

@@ -350,7 +350,8 @@ namespace LQKJ.K3.CZXT.Pluglus
                                 when matched then 
                                 update set t1.F_ORA_DECIMAL_QTR1 =T1.FSTOCKINQTY * CASE WHEN t2.FVOLUME = 0 THEN 1 ELSE t2.FVOLUME END * t2.F_ORA_DECIMAL_QTR1;");
                 DBUtils.Execute(this.Context, zzcxdsql);
-                //单据类型(销售退货单) 退货单(负数的)计算装车费，不计算卸车费
+                //单据类型(销售退货单) 退货单(负数的)计算卸车费，不计算装车费
+                //计算公式 发出数量*体积*卸车单价*-1 
                 string xsthdsql = ($@"/*dialect*/merge into {receBillTableS} t1 
                                 using (
                                 SELECT W.FMATERIALID,W.F_ORA_DECIMAL_83G,W.F_ORA_DECIMAL_QTR1,JB.FVOLUME
@@ -359,7 +360,7 @@ namespace LQKJ.K3.CZXT.Pluglus
                                 ) t2 
                                 on (t1.FMATERIALID=t2.FMATERIALID AND t1.FBILLNAME='销售退货单' AND t1.FSTOCKOUTQTY<0)
                                 when matched then 
-                                update set t1.F_ORA_DECIMAL_83G =t1.FSTOCKOUTQTY * CASE WHEN t2.FVOLUME = 0 THEN 1 ELSE t2.FVOLUME END * t2.F_ORA_DECIMAL_83G;");
+                                update set t1.F_ORA_DECIMAL_QTR1 =T1.FSTOCKOUTQTY * CASE WHEN t2.FVOLUME = 0 THEN 1 ELSE t2.FVOLUME END * t2.F_ORA_DECIMAL_QTR1 * -1;");
                 DBUtils.Execute(this.Context, xsthdsql);
                 //单据类型(其他出库)计算卸车费 不算装车费 （单据类型为 库存调整）
                 string qtcfsql = ($@"/*dialect*/merge into {receBillTableS} t1 

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

@@ -373,7 +373,8 @@ namespace LQKJ.K3.CZXT.Pluglus
                                 when matched then 
                                 update set t1.F_ORA_DECIMAL_QTR1 =T1.FSTOCKINQTY * CASE WHEN t2.FVOLUME = 0 THEN 1 ELSE t2.FVOLUME END * t2.F_ORA_DECIMAL_QTR1;");
                 DBUtils.Execute(this.Context, zzcxdsql);
-                //单据类型(销售退货单) 退货单(负数的)计算装车费，不计算卸车费
+                //单据类型(销售退货单) 退货单(负数的)计算卸车费，不计算装车费
+                //计算公式 发出数量*体积*卸车单价*-1 
                 string xsthdsql = ($@"/*dialect*/merge into {receBillTableS} t1 
                                 using (
                                 SELECT W.FMATERIALID,W.F_ORA_DECIMAL_83G,W.F_ORA_DECIMAL_QTR1,JB.FVOLUME
@@ -382,7 +383,7 @@ namespace LQKJ.K3.CZXT.Pluglus
                                 ) t2 
                                 on (t1.FMATERIALID=t2.FMATERIALID AND t1.FBILLNAME='销售退货单' AND t1.FSTOCKOUTQTY<0)
                                 when matched then 
-                                update set t1.F_ORA_DECIMAL_83G =t1.FSTOCKOUTQTY * CASE WHEN t2.FVOLUME = 0 THEN 1 ELSE t2.FVOLUME END * t2.F_ORA_DECIMAL_83G;");
+                                update set t1.F_ORA_DECIMAL_QTR1 =T1.FSTOCKOUTQTY * CASE WHEN t2.FVOLUME = 0 THEN 1 ELSE t2.FVOLUME END * t2.F_ORA_DECIMAL_QTR1 * -1;");
                 DBUtils.Execute(this.Context, xsthdsql);
                 //单据类型(其他出库)计算卸车费 不算装车费 （单据类型为 库存调整）
                 string qtcfsql = ($@"/*dialect*/merge into {receBillTableS} t1