1

D7MqClient/D7MqClient/JFtoDjyBackNo.cs

@@ -80,6 +80,7 @@ namespace D7MqClient
                                     strSql2.Append("update op_seae set IRCODE='" + IRCODE + "' where BSNO='" + BSNO + "' AND ISNULL(IRCODE,'')=''");
                                     SqlCommand cmd2 = new SqlCommand(strSql2.ToString(), dbcon);
                                     cmd2.ExecuteNonQuery();
+                                    logger.Debug($"执行语句1：{strSql2.ToString()}");
                                 }
                                 if (!string.IsNullOrEmpty(CUSTNO))
                                 {
@@ -87,6 +88,7 @@ namespace D7MqClient
                                     strSql.Append("update op_seae set IRCODE='" + IRCODE + "' where CUSTNO='" + CUSTNO + "' AND ISNULL(IRCODE,'')=''");
                                     SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
                                     cmd.ExecuteNonQuery();
+                                    logger.Debug($"执行语句1：{strSql.ToString()}");
                                 }
                              }
                              else
@@ -98,33 +100,46 @@ namespace D7MqClient
                                     strSql.Append("update t_op_seae set IRCODE='" + IRCODE + "' where 业务编号='" + feeback.FeedbackData.BSNO + "'");
                                     SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
                                     cmd.ExecuteNonQuery();
+                                    logger.Debug($"执行语句1：{strSql.ToString()}");
                                 }
                                 }
                         }
                         else if (feeback.FeedbackType == "MBLNO")
                         {
 
-                            if (!string.IsNullOrEmpty(feeback.FeedbackData.BSNO) && !string.IsNullOrEmpty(feeback.FeedbackData.MBLNO))
+                            if (!string.IsNullOrEmpty(feeback.FeedbackData.MBLNO))
                             {
                                 if (DSVER == "7")
                                 {
                                     var CUSTNO = "";
                                     var BSNO = "";
+                                    var IRCODE = "";
                                     if (!string.IsNullOrEmpty(feeback.FeedbackData.BSNO)) BSNO = feeback.FeedbackData.BSNO;
                                     if (!string.IsNullOrEmpty(feeback.FeedbackData.FR)) CUSTNO = feeback.FeedbackData.FR;
+                                    if (!string.IsNullOrEmpty(feeback.FeedbackData.IRCode)) IRCODE = feeback.FeedbackData.IRCode;
                                     if (!string.IsNullOrEmpty(BSNO))
                                     {
                                         var strSql2 = new StringBuilder();
                                         strSql2.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where BSNO='" + BSNO + "' AND ISNULL(MBLNO,'')=''");
                                         SqlCommand cmd2 = new SqlCommand(strSql2.ToString(), dbcon);
                                         cmd2.ExecuteNonQuery();
+                                        logger.Debug($"执行语句1：{strSql2.ToString()}");
                                     }
                                     if (!string.IsNullOrEmpty(CUSTNO))
                                     {
                                         var strSql = new StringBuilder();
-                                        strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where CUSTNO='" + CUSTNO + "' AND ISNULL(MBLNO,'')='' ");
+                                        strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + CUSTNO + "' AND ISNULL(MBLNO,'')='' ");
+                                        SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
+                                        cmd.ExecuteNonQuery();
+                                        logger.Debug($"执行语句1：{strSql.ToString()}");
+                                    }
+                                    if (!string.IsNullOrEmpty(IRCODE))
+                                    {
+                                        var strSql = new StringBuilder();
+                                        strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + IRCODE + "' AND ISNULL(MBLNO,'')='' ");
                                         SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
                                         cmd.ExecuteNonQuery();
+                                        logger.Debug($"执行语句1：{strSql.ToString()}");
                                     }
                                 }
                                 else
@@ -133,6 +148,7 @@ namespace D7MqClient
                                     strSql.Append("update t_op_seae set 主提单号='" + feeback.FeedbackData.MBLNO + "' where 业务编号='" + feeback.FeedbackData.BSNO + "' AND  ISNULL(主提单号,'')='' ");
                                     SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
                                     cmd.ExecuteNonQuery();
+                                    logger.Debug($"执行语句1：{strSql.ToString()}");
                                 }
                             }
                         }

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs

@@ -4227,6 +4227,14 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
 
                 }
 
+                if (carrier == "ANNU" || carrier == "CMDU" || carrier == "CHNL")
+                {
+                    r.WriteLine("RFF+FF:" + bill.CUSTNO.Trim() + "'");
+                    icount = icount + 1;
+                }
+                else
+                {
+
                     if (IsNADFW == 1)
                     {
                         r.WriteLine("RFF+FF:" + bill.ORDERNO.Trim() + "'");
@@ -4241,11 +4249,13 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                             r.WriteLine("RFF+ON:" + bill.ORDERNO.Trim() + "'");
                             icount = icount + 2;
                         }
-                    else {
+                        else
+                        {
                             r.WriteLine("RFF+FF:" + bill.CUSTNO.Trim() + "'");
                             icount = icount + 1;
                         }
                     }
+                }
 
                 if (carrier != "COSU"&&!string.IsNullOrEmpty(bill.MBLNO))
                 {
@@ -4282,7 +4292,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
 
                 r.WriteLine("RFF+CT:" + formatEdiStr("txt", bill.CONTRACTNO) + "'");
 
-                r.WriteLine("RFF+FF:" + bill.CUSTNO + "'");
+                //r.WriteLine("RFF+FF:" + bill.CUSTNO + "'");
 
                 if (bill.BLFRT.IndexOf("PREPAID") >= 0)
                     r.WriteLine("CPI+4++P'");
@@ -25758,8 +25768,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                     tempstr += Convert.ToDateTime(bill.ETD).ToString("yyyyMMdd");//22 //Booking Date//M//X(8)//191 //198 //YYYYMMDD 
                 }
                 //tempstr += eta;//23 //Slot Owner//M//X(3)//199 //201 //
-                tempstr += GetSpaceStr("PI", 3);//24 //Cntr Operator//M//X(3)//202 //204 //
-                tempstr += GetSpaceStr("PI", 3);//25 //Filler//M//X(46)//205 //250 //Spaces
+                tempstr += GetSpaceStr("PIL", 3);//24 //Cntr Operator//M//X(3)//202 //204 //
+                tempstr += GetSpaceStr("PIL", 3);//25 //Filler//M//X(46)//205 //250 //Spaces
                 r.WriteLine(GetSpaceStr(tempstr, 250));
                 #endregion
 

DSWeb/Areas/SysMng/Controllers/USERINFOController.cs

@@ -129,6 +129,8 @@ namespace DSWeb.Areas.SysMng.Controllers
                 headData.DbOperationType = DbOperationType.DbotUpd;
                 headData.ModelUIStatus = "E";
             //}
+
+
             var modb = new ModelObjectRepository();
             result = modb.Save(headData,
                    ModelObjectConvert<USERINFOmb>.ToModelObjectList(bodyList),