1

DSWeb/Areas/MvcShipping/Controllers/BookingConfirmController.cs

@@ -843,7 +843,7 @@ namespace DSWeb.MvcShipping.Controllers
             var COMPANYID = Convert.ToString(Session["COMPANYID"]);
             var COMPANYNAME = Convert.ToString(Session["COMPANYNAME"]);
             //result = modb.SaveHead(OpSeaeData);
-            result = DSWeb.MvcShipping.DAL.MsOpSeaeDAL.MsOpSeaeDAL.DoSave("edit", OpSeaeData, CtnList, userid, username, COMPANYID, COMPANYNAME);
+            result = DSWeb.MvcShipping.DAL.MsOpSeaeDAL.MsOpSeaeDAL.DoSave("edit", OpSeaeData, null, userid, username, COMPANYID, COMPANYNAME);
             if (!result.Success)
             {
                 //jsonRespose.SetDBResult(result);
@@ -858,14 +858,14 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
             }
 
-            //result = modb.SaveComm("BSNO", ctnParentIDValue
+            result = modb.SaveComm("BSNO", ctnParentIDValue
-            //    , ModelObjectConvert<MsOpSeaeDetail>.ToModelObjectList(CtnList)
+                , ModelObjectConvert<MsOpSeaeDetail>.ToModelObjectList(CtnList)
-            //    ,null);
+                , null);
-            //if (!result.Success)
+            if (!result.Success)
-            //{
+            {
-            //    jsonRespose.SetDBResult(result);
+                jsonRespose.SetDBResult(result);
-            //    return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
-            //}
+            }
 
 
             foreach (var ctndetail in ChangeCtnDetailList) {

DSWeb/Areas/MvcShipping/DAL/BookingConfirm/BookingConfirmDAL.cs

@@ -543,7 +543,19 @@ namespace DSWeb.Areas.MvcShipping.DAL.BookingConfirm
         {
             var bookingDB = new BookingDB();
             var result = new DBResult(false, "", null);
-            OP_SEAE_ORDER model = bookingDB.Orders.First(o => o.BSNO == head.BSNO);
+            OP_SEAE_ORDER model = new OP_SEAE_ORDER();
+
+            var BookingOrderList= bookingDB.Orders.Where(o => o.BSNO == head.BSNO).ToList();
+
+            if (BookingOrderList == null || BookingOrderList.Count == 0)
+            {
+                //ds7的分单 是没有对应的booking数据的 因此不需要继续执行
+                result.OK();
+                return result;
+            }
+            else {
+                model = BookingOrderList[0];
+            }
 
             model.MBLNO = head.MBLNO;
             model.VESSEL = head.VESSEL;

DSWeb/Areas/MvcShipping/Viewsjs/BookingConfirm/Booking_SIEdit.js

@@ -3229,7 +3229,7 @@ Ext.extend(Shipping.Booking_SIEdit, Ext.Panel, {
                                     },
                                     items: [{
                                         fieldLabel: Zi.LAN.HSCODE,
-                                        name: 'ISHSCODE',
+                                        name: 'HSCODE',
                                         flex:1
                                     }
                                         , {