Browse Source

核价后台:1、床垫报价,复制报价时清空关键信息;2、修复因计算错误导致复制报价保存报错问题

chen_yjin 1 week ago
parent
commit
971b430fa2
2 changed files with 15 additions and 4 deletions
  1. 9 0
      JLHHJSvr/Excutor/SaveMattressExcutor.cs
  2. 6 4
      JLHHJSvr/Helper/MattressHelper.cs

+ 9 - 0
JLHHJSvr/Excutor/SaveMattressExcutor.cs

@@ -43,6 +43,15 @@ namespace JLHHJSvr.Excutor
                 {
                     request.mattress.mattressid = 0;
                     request.mattress.mattresscode = string.Empty;
+                    request.mattress.js1_flag = 0;
+                    request.mattress.xd_flag = 0;
+                    request.mattress.xd_auditingrep = "";
+                    request.mattress.xd_auditingdate = null;
+                    request.mattress.flag = 0;
+                    request.mattress.auditingrep = "";
+                    request.mattress.auditingdate = null;
+                    request.mattress.qr_auditingrep = "";
+                    request.mattress.qr_auditingdate = null;
 
                     foreach (var mx in request.mattressMx)
                     {

+ 6 - 4
JLHHJSvr/Helper/MattressHelper.cs

@@ -1063,22 +1063,24 @@ namespace JLHHJSvr.Helper
                 var _costamt = t.costamt.Value;
                 if (isNewFormula)
                 {
+                    decimal _dannum_rate = 0;
                     #region 计算损耗率
                     switch (mattress.dannum_type.Value)
                     {
                         case 1:
-                            _costamt = _costamt * (1 + t.dannum1_rate.Value);
+                            if (t.dannum1_rate != null) _dannum_rate = t.dannum1_rate.Value;
                             break;
                         case 2:
-                            _costamt = _costamt * (1 + t.dannum2_rate.Value);
+                            if (t.dannum2_rate != null) _dannum_rate = t.dannum2_rate.Value;
                             break;
                         case 3:
-                            _costamt = _costamt * (1 + t.dannum3_rate.Value);
+                            if (t.dannum3_rate != null) _dannum_rate = t.dannum3_rate.Value;
                             break;
                         case 4:
-                            _costamt = _costamt * (1 + t.dannum4_rate.Value);
+                            if (t.dannum4_rate != null) _dannum_rate = t.dannum4_rate.Value;
                             break;
                     }
+                    _costamt = _costamt * (1 + _dannum_rate);
                     #endregion
 
                     // 新公式排除床网计算