解决电子运单分单影响出港理货分单自动更新并发送的问题

@@ -5,7 +5,8 @@
 *.suo
 *.suo
 *.user
 *.user
 *.sln.docstates
 *.sln.docstates
-
+*.csproj
+*.sln
 # Build results
 # Build results
 
 
 [Dd]ebug/
 [Dd]ebug/

@@ -460,9 +460,21 @@ namespace CustomsCargoSystem.ExchangeDataStorageService
                 if ("EDEP" == innerText2)
                 if ("EDEP" == innerText2)
                 {
                 {
                     CustomsCargoSystem.Model.TallySecondary tallySecondary = CustomsCargoSystem.Parser.TallySecondary.Parse(xmlDoc, "FZE_DEP");
                     CustomsCargoSystem.Model.TallySecondary tallySecondary = CustomsCargoSystem.Parser.TallySecondary.Parse(xmlDoc, "FZE_DEP");
-                    text = tallySecondary.WAYBILLNOSECONDARY;
+                    text = tallySecondary.WAYBILLNOMASTER;
                     Log.WriteMessage("FZE_DEP", tallySecondary.WAYBILLNOMASTER, xmlDoc.InnerXml);
                     Log.WriteMessage("FZE_DEP", tallySecondary.WAYBILLNOMASTER, xmlDoc.InnerXml);
-                    num = CustomsCargoSystem.Data.TallySecondary.Save(connectionString, tallySecondary);
+
+                    //ADD BY MRZ 解决电子运单过来分单造成出港理货分单不更新及自动发送问题。
+                    IEnumerable<CustomsCargoSystem.Model.TallySecondary> source5 = CustomsCargoSystem.Data.TallySecondary.TallySecondaryIsExist(connectionString, text, tallySecondary.WAYBILLNOSECONDARY);
+                    if (source5.Count() == 0)
+                    {
+                        num = CustomsCargoSystem.Data.TallySecondary.Save(connectionString, tallySecondary);
+                    }
+                    else if (source5.Count() > 0)
+                    {
+                        tallySecondary.TALLYMASTERID = source5.FirstOrDefault().TALLYMASTERID;
+                        tallySecondary.AUTOID = source5.FirstOrDefault().AUTOID;
+                        CustomsCargoSystem.Data.TallySecondary.Update(connectionString, tallySecondary);
+                    }
                 }
                 }
                 if ("URCF" == innerText2)
                 if ("URCF" == innerText2)
                 {
                 {