From 282a3520513cee8f584eaba4a6ab3fa90a85d580 Mon Sep 17 00:00:00 2001
From: dengyu <ddlucky@sina.com>
Date: Fri, 8 Sep 2023 16:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=8F=90=E4=BA=A4=E5=92=8C?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=20=E6=94=B9=E4=B8=BA=E4=B8=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8ds7=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Partial/OP_WMS_APPPUSHINFOService.cs      | 12 ++-
 .../Services/WMS/FEE/Partial/Ch_feeService.cs | 87 ++++++++++---------
 2 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/Vue.Net/VOL.System/Services/OP_WMS_APPPUSHINFO/Partial/OP_WMS_APPPUSHINFOService.cs b/Vue.Net/VOL.System/Services/OP_WMS_APPPUSHINFO/Partial/OP_WMS_APPPUSHINFOService.cs
index 489c180c..d4cb9e13 100644
--- a/Vue.Net/VOL.System/Services/OP_WMS_APPPUSHINFO/Partial/OP_WMS_APPPUSHINFOService.cs
+++ b/Vue.Net/VOL.System/Services/OP_WMS_APPPUSHINFO/Partial/OP_WMS_APPPUSHINFOService.cs
@@ -150,12 +150,16 @@ namespace VOL.System.Services
 
             foreach (var item in statekeyList)
             {
-                var sh = SendAppMessage.SendAPPHelp(item, execution);
+                if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
+                {
+                    var sh = SendAppMessage.SendAPPHelp(item, execution);
 
-                _r = sh.DoSend();
+                    _r = sh.DoSend();
 
-                if (_r.Status == false) {
-                    return _r;
+                    if (_r.Status == false)
+                    {
+                        return _r;
+                    }
                 }
             }
 
diff --git a/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs b/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs
index 4572f247..c6eee3cc 100644
--- a/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs
+++ b/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs
@@ -512,25 +512,25 @@ namespace VOL.WMS.Services
             //}
             //return _webResponseContent.Error("");
 
-            if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
-            {
+            //if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
+            //{
 
-                var FeeIDList = feelist.Select(s => s.GID).ToList();
-                var IDs = string.Join(",", FeeIDList);
-                JObject reqObj = new JObject
-                {
-                        { "IDs",IDs},
-                        { "optype","op_wms"}
-                //,
-                //        { "USERID", userid },
-                //        { "COMPANYID", usercompanyid }
-                    };
-                var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/SubmitAuditNew_BYID");
-
-                return ds7sender.DoPost(reqObj);
-            }
-            else
-            {
+            //    var FeeIDList = feelist.Select(s => s.GID).ToList();
+            //    var IDs = string.Join(",", FeeIDList);
+            //    JObject reqObj = new JObject
+            //    {
+            //            { "IDs",IDs},
+            //            { "optype","op_wms"}
+            //    //,
+            //    //        { "USERID", userid },
+            //    //        { "COMPANYID", usercompanyid }
+            //        };
+            //    var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/SubmitAuditNew_BYID");
+
+            //    return ds7sender.DoPost(reqObj);
+            //}
+            //else
+            //{
                 //其它公司仍采用提交直接通过 撤回直接撤回的模式
 
                 ////审核通过 将feestatus=1的设为0
@@ -540,7 +540,7 @@ namespace VOL.WMS.Services
                     Ch_feeRepository.Instance.Update(item, true);
                 }
                 return _webResponseContent.OK("提交完成");
-            }
+            //}
         }
 
         private WebResponseContent DoPostFeeCancelAudit(List<Ch_fee> feelist)
@@ -581,32 +581,37 @@ namespace VOL.WMS.Services
             //    _webResponseContent.Error(e.Message);
             //}
             //return _webResponseContent.Error("");
-            if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
+
+            //20230908 改为不走审核流程
+            //if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
+            //{
+            //    var FeeIDList = feelist.Select(s => s.GID).ToList();
+            //    var IDs = string.Join(",", FeeIDList);
+            //    JObject reqObj = new JObject
+            //    {
+            //                { "IDs",IDs},
+            //                { "optype","op_wms"}
+            //        //,
+            //        //        { "USERID", userid },
+            //        //        { "COMPANYID", usercompanyid }
+            //            };
+            //    var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/CancelAudit_BYID");
+
+            //    return ds7sender.DoPost(reqObj);
+            //}
+            //else {
+            //撤回 将feestatus=0的设为1
+
+
+            foreach (var item in feelist.Where(x => x.FEESTATUS == 0).ToList())
             {
-                var FeeIDList = feelist.Select(s => s.GID).ToList();
-                var IDs = string.Join(",", FeeIDList);
-                JObject reqObj = new JObject
-                {
-                            { "IDs",IDs},
-                            { "optype","op_wms"}
-                    //,
-                    //        { "USERID", userid },
-                    //        { "COMPANYID", usercompanyid }
-                        };
-                var ds7sender = DS7Post.DS7PostHelper("/Account/Chfee_Audit/CancelAudit_BYID");
-
-                return ds7sender.DoPost(reqObj);
+                if (!chfeeCanRecall(item)) continue;
+                item.FEESTATUS = 1;
+                Ch_feeRepository.Instance.Update(item,true);
             }
-            else {
-                //撤回 将feestatus=0的设为1
-                foreach (var item in feelist.Where(x => x.FEESTATUS == 0).ToList())
-                {
-                    item.FEESTATUS = 1;
-                    Ch_feeRepository.Instance.Update(item,true);
-                }
                 //_msg = "撤回完成";
                 return _webResponseContent.OK("撤回完成");
-            }
+            //}
         }
         public override WebResponseContent Update(SaveModel saveModel)
         {