全电发票冲红测完/业务信息发布，逻辑微调

DSWeb/Areas/Account/Controllers/Chfee_invoice_HangXinController.cs

@@ -1037,9 +1037,10 @@ namespace DSWeb.Areas.Account.Controllers
                             }
                             else
                             {
-                                jsonRespose.Success = false;
-                                jsonRespose.Message = "必须选择冲红理由！";
-                                return jsonRespose;
+                                //jsonRespose.Success = false;
+                                //jsonRespose.Message = "必须选择冲红理由！";
+                                //return jsonRespose;
+                                head.redReason = "2";
                             }
                         }
                     }
@@ -1067,9 +1068,16 @@ namespace DSWeb.Areas.Account.Controllers
                             }
                             else
                             {
-                                jsonRespose.Success = false;
-                                jsonRespose.Message = "必须选择冲红理由！";
-                                return jsonRespose;
+                                //jsonRespose.Success = false;
+                                //jsonRespose.Message = "必须选择冲红理由！";
+                                //return jsonRespose;
+
+                                head.redReason = "2";
+
+                                head.DbOperationType = DbOperationType.DbotUpd;
+                                head.ModelUIStatus = "E";
+                                var modb = new ModelObjectDB();
+                                result = modb.Save(head);
                             }
                         }
 
@@ -2029,6 +2037,10 @@ namespace DSWeb.Areas.Account.Controllers
 
 
                         result = hx.PostRedConfirm(redhead, ref head, detailList);
+                        if (result.Success == false)
+                        {
+
+                        }
                     }
                     //诺诺全电票根据红字申请单的结果读取确认单
                     modb.Save(head);

DSWeb/Areas/Account/Models/Chfee_invoice_HangXin/Chfee_Invoice.cs

@@ -975,7 +975,15 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
         //若有值，则在无需确认或购销双方已确认后去自动开红票，发票的开票单号用该值
         //public string orderNo { get { return ChInvoice_HangXin.BILLNO; } }
 
-        public string phone { get { return ChInvoice_HangXin.PUSHMOBILE; } }
+        public string phone
+        {
+            get
+            {
+                if (ChInvoice_HangXin.PUSHMOBILE == "0") return "";
+                else
+                    return ChInvoice_HangXin.PUSHMOBILE;
+            }
+        }
         public string email { get { return ChInvoice_HangXin.PUSHEMAIL; } }
     }
 
@@ -2132,8 +2140,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
                 head.INVOICECODE = info.invoiceCode;
                 head.INVOICENO = info.invoiceNo;
                 head.EINVOICESTATE = info.status;
-                head.INVOICEINFOURL = info.ofdUrl;
-                head.INVOICEPDFURL = info.paperPdfUrl;
+                head.INVOICEINFOURL = info.pdfUrl;
+                head.INVOICEPDFURL = info.pdfUrl;
 
                 head.INVOICEMAKETIME = BasicDataRefDAL.Timestamp2Datetime(info.invoiceTime).ToString("yyyy-MM-dd HH:mm:ss");
                 //if (!string.IsNullOrWhiteSpace(info.invoiceSerialNum))
@@ -2412,6 +2420,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
 
                 if (!_r.Success)
                 {
+                    if (_r.Message != "红字确认单申请中")
+                        bluehead.billUuid = "";
                     return _r;
                 }
                 else
@@ -2433,6 +2443,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
 
                     if (!result.Success)
                     {
+
                         return result;
                     }
 
@@ -2572,6 +2583,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
                     }
                     else
                     {
+
                         return result.SetErrorInfo(_return.错误信息());
                     }
 
@@ -3333,13 +3345,13 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin
 
     }
 
-    //public class InvoiceFeeSum
-    //{
-    //    public string CURR { get; set; }
-    //    public decimal amount { get; set; }
+    public class InvoiceFeeSum
+    {
+        public string CURR { get; set; }
+        public decimal amount { get; set; }
 
-    //    public decimal exchange { get; set; }
+        public decimal exchange { get; set; }
 
-    //}
+    }
 
 }

JobReqWebData/JobDs7ToWeb.cs

@@ -59,10 +59,12 @@ namespace JobReqWebData
                             using (SqlTransaction trans = db.BeginTransaction())
                             {
                                 log.Debug("插入"+ row["MBLNO"].ToString()+"-"+ row["HBLNO"].ToString());
-                                string sql = "insert into tb_order(BSNO,业务编号,提单号,分单号,客户名称,发货人,收货人,启运港,目的港,国家名称,船名,航次,箱量表示" +
-                                    ",出口类型,运输条款,预计离港,实际离港,联系客户时间,建立时间,出号时间,操作时间,船公司,PO,品名,HS编码,件数文本,重量文本,尺码文本,保险联系人)";
-                                sql = sql + " values (@BSNO,@CUSTNO,@MBLNO,@HBLNO,@CUSTOMERNAME,@SHIPPER,@CONSIGNEE,@PORTLOAD,@DESTINATION,@COUNTRY,@VESSEL,@VOYNO,@CNTRTOTAL,@BLTYPE" +
-                                    ",@SERVICE,@ETD,@ATD,@LINKCUSTTIME,@CREATETIME,@MBLNOTIME,@BSDATE,@CARRIER,@PONO,@GOODSNAME,@HSCODE,@NOPKGS,@GROSSWEIGHT,@MEASUREMENT,@INSURANCEOP)";
+                                string sql = "insert into tb_order(BSNO,业务编号,提单号,分单号,客户名称,发货人,收货人,启运港,目的港,国家名称" +
+                                    ",船名,航次,箱量表示,出口类型,运输条款,预计离港,实际离港,联系客户时间,建立时间,出号时间" +
+                                    ",操作时间,船公司,PO,品名,HS编码,件数文本,重量文本,尺码文本,保险联系人)";
+                                sql = sql + " values (@BSNO,@CUSTNO,@MBLNO,@HBLNO,@CUSTOMERNAME,@SHIPPER,@CONSIGNEE,@PORTLOAD,@DESTINATION,@COUNTRY" +
+                                    ",@VESSEL,@VOYNO,@CNTRTOTAL,@BLTYPE,@SERVICE,@ETD,@ATD,@LINKCUSTTIME,@CREATETIME,@MBLNOTIME" +
+                                    ",@BSDATE,@CARRIER,@PONO,@GOODSNAME,@HSCODE,@NOPKGS,@GROSSWEIGHT,@MEASUREMENT,@INSURANCEOP)";
                                 SqlCommand cmd = new SqlCommand(sql, db, trans);
                                 cmd.Parameters.AddWithValue("@BSNO", row["AS_ID"].ToString());
                                 cmd.Parameters.AddWithValue("@CUSTNO", row["CUSTNO"].ToString());