1

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs

@@ -9450,6 +9450,290 @@ namespace DSWeb.MvcShipping.Controllers
             return result;
         }
 
+        [HttpPost]
+        public ContentResult ImportYaHang()
+        {
+            var jsonRespose = new JsonResponse { Success = false, Message = "" };
+
+            if (Request.Files.Count != 1)
+            {
+                jsonRespose.Success = false;
+                jsonRespose.Message = "请选择上传的文件";
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            }
+
+            var file = Request.Files["LoadExcel"];
+            if (file == null)
+            {
+                jsonRespose.Success = false;
+                jsonRespose.Message = "上传文件发生未知错误，请重新上传";
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            }
+            if (Convert.ToString(Session["COMPANYID"]).ToString().Trim() == "" || Convert.ToString(Session["USERID"]).ToString().Trim() == "" || Convert.ToString(Session["CODENAME"]).ToString().Trim() == "" || Convert.ToString(Session["SHOWNAME"]).ToString().Trim() == "" || Convert.ToString(Session["DEPTNAME"]).ToString().Trim() == "")
+            {
+                var jsonRespose2 = new JsonResponse { Success = false, Message = "登录超时，请退出系统重新登录！" };
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
+            }
+            string ext = Path.GetExtension(file.FileName).ToLower();
+            if (ext == ".asp" || ext == ".aspx")
+            {
+                jsonRespose.Success = false;
+                jsonRespose.Message = "不允许上传ASP或ASPX文件";
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            }
+
+            var path = Server.MapPath("../../UploadFiles/BulkDetail");
+            var path2 = Server.MapPath("../../UploadFiles/BulkDetail/");
+
+            if (!Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
+            }
+
+            var size = file.ContentLength;
+            var name = Path.GetFileName(file.FileName);
+
+            var usercode = CookieConfig.GetCookie_UserCode(Request);
+            string filenamepath = usercode + DateTime.Now.ToString("yyyyMMddHHmmssfff") + name;
+
+            string filename = path + "\\" + filenamepath;
+
+
+
+            string excelFilePath = path2 + filenamepath;
+
+
+            if (System.IO.File.Exists(filename))
+            {
+                System.IO.File.Delete(filename);
+            }
+            file.SaveAs(filename);
+
+            if (!System.IO.File.Exists(filename))
+            {
+                jsonRespose.Success = false;
+                jsonRespose.Message = "上传的Excel不包含数据01";
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            }
+
+            Microsoft.Office.Interop.Excel.Application excel = new Microsoft.Office.Interop.Excel.Application();
+
+            if (excel == null)
+            {
+                jsonRespose.Success = false;
+                jsonRespose.Message = "无法创建Excel对象,可能您的服务器计算机未安装Excel!！";
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            }
+
+
+
+            //List<string> sheets = ExcelSheetName(filename);
+            //if (sheets.Count == 0)
+            //{
+            //    jsonRespose.Success = false;
+            //    jsonRespose.Message = "上传的Excel不包含数据02";
+            //    return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            //}
+
+            Workbook workbook = excel.Workbooks.Open(excelFilePath, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing, Type.Missing);
+            Worksheet mySheet = workbook.Sheets[1] as Worksheet;
+
+            try
+            {
+
+
+                int excelline = 5;
+                var VESSEL = "";
+                var VOYNO = "";
+                var tmpopseae = new MsOpSeae();
+                var errostr = "";
+
+                object aaa = mySheet.Cells.get_Range("A1").Value2;
+                object v11new = aaa;
+                if (v11new != null)
+                {
+                    string strtmp3 = v11new.ToString();
+                    if (strtmp3 != "")
+                        VESSEL = strtmp3;
+                }
+                aaa = mySheet.Cells.get_Range("A2").Value2;
+                v11new = aaa;
+                if (v11new != null)
+                {
+                    string strtmp3 = v11new.ToString();
+                    if (strtmp3 != "")
+                        VOYNO = strtmp3;
+                }
+                var issave = false;
+
+                var bodyList = new List<MsOpSeaeDetail>();
+                while (GetExcelValue(mySheet, "O" + excelline.ToString()) != "")
+                {
+
+                    aaa = mySheet.Cells.get_Range("A" + excelline.ToString()).Value2;
+                    v11new = aaa;
+                    if (v11new != null)
+                    {
+                        string opstr = v11new.ToString();
+                        if (opstr != "")
+                        {
+                            if (!string.IsNullOrEmpty(tmpopseae.MBLNO)&&tmpopseae.MBLNO != opstr) {
+                                issave = true;
+                                if (issave)
+                                {
+                                    var headData = new MsOpSeae();
+                                    headData.INPUTBY = Convert.ToString(Session["SHOWNAME"]);
+                                    headData.CREATETIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                                    headData.BSSTATUS = false;
+                                    headData.FEESTATUS = false;
+                                    headData.DbOperationType = DbOperationType.DbotIns;
+                                    headData.ISCANCEL = "0";
+                                    headData.MBLNO = tmpopseae.MBLNO;
+                                    headData.PORTLOAD = tmpopseae.PORTLOAD;
+                                    headData.PORTDISCHARGE = tmpopseae.PORTDISCHARGE;
+                                    headData.DESTINATION = tmpopseae.DESTINATION;
+                                    headData.SHIPPER = tmpopseae.SHIPPER;
+                                    headData.CONSIGNEE = tmpopseae.CONSIGNEE;
+                                    headData.NOTIFYPARTY = tmpopseae.NOTIFYPARTY;
+                                    headData.MARKS = tmpopseae.MARKS;
+                                    headData.DESCRIPTION = tmpopseae.DESCRIPTION;
+                                    headData.KGS = tmpopseae.KGS;
+                                    headData.GROSSWEIGHT = tmpopseae.GROSSWEIGHT;
+                                    headData.CBM = tmpopseae.CBM;
+                                    headData.MEASUREMENT = tmpopseae.MEASUREMENT;
+                                    headData.PKGS = tmpopseae.PKGS;
+                                    headData.KINDPKGS = tmpopseae.KINDPKGS;
+                                    headData.NOPKGS = tmpopseae.NOPKGS;
+                                    headData.MASTERNO = headData.BSNO;
+                                    headData.CORPID = Convert.ToString(Session["COMPANYID"]);
+                                    headData.BSDATE = DateTime.Now;
+                                    var modb = new ModelObjectDB();
+                                    var result = modb.Save(headData);
+                                    issave = false;
+                                    if (result.Success == true)
+                                    {
+                                        result = MsOpSeaeDAL.SaveDetail(headData.BSNO, bodyList, Convert.ToString(Session["USERID"]), true);
+                                        bodyList.Clear();
+                                    }
+                                    else
+                                    {
+                                        errostr = errostr + result.Message;
+                                    }
+
+                                }
+                            }
+                            tmpopseae.MBLNO = opstr;
+                            tmpopseae.PORTLOAD = GetExcelValue(mySheet, "C" + excelline.ToString());
+                            tmpopseae.PORTDISCHARGE = GetExcelValue(mySheet, "D" + excelline.ToString());
+                            tmpopseae.DESTINATION = GetExcelValue(mySheet, "E" + excelline.ToString());
+                            tmpopseae.SHIPPER = GetExcelValue(mySheet, "F" + excelline.ToString());
+                            tmpopseae.CONSIGNEE = GetExcelValue(mySheet, "G" + excelline.ToString());
+                            tmpopseae.NOTIFYPARTY = GetExcelValue(mySheet, "H" + excelline.ToString());
+                            tmpopseae.MARKS = GetExcelValue(mySheet, "I" + excelline.ToString());
+                            tmpopseae.DESCRIPTION = GetExcelValue(mySheet, "J" + excelline.ToString());
+                            tmpopseae.KGS = GetExcelValue(mySheet, "K" + excelline.ToString());
+                            tmpopseae.GROSSWEIGHT = tmpopseae.KGS + "KGS";
+                            tmpopseae.CBM = GetExcelValue(mySheet, "L" + excelline.ToString());
+                            tmpopseae.MEASUREMENT = tmpopseae.CBM + "CBM";
+                            tmpopseae.PKGS = GetExcelValue(mySheet, "M" + excelline.ToString());
+                            tmpopseae.KINDPKGS = GetExcelValue(mySheet, "N" + excelline.ToString());
+                            tmpopseae.NOPKGS = tmpopseae.PKGS + tmpopseae.KINDPKGS;
+                        }
+                    }
+
+              
+
+                    MsOpSeaeDetail data = new MsOpSeaeDetail();
+                    data.BSNO = "*";
+                    data.CTN_ID = Guid.NewGuid().ToString();
+                    data.CTNALL = GetExcelValue(mySheet, "Q" + excelline.ToString()) + GetExcelValue(mySheet, "R" + excelline.ToString());
+                    data.CNTRNO = GetExcelValue(mySheet, "O" + excelline.ToString());
+                    data.SEALNO = GetExcelValue(mySheet, "P" + excelline.ToString());
+                    try
+                    {
+                        data.PKGS = Convert.ToInt32(GetExcelValue(mySheet, "T" + excelline.ToString()));
+                        data.KINDPKGS = GetExcelValue(mySheet, "U" + excelline.ToString());
+
+                    }
+                    catch (Exception exception)
+                    {
+
+                    }
+                    data.CTNSTATUS = GetExcelValue(mySheet, "S" + excelline.ToString());
+                    var tmpkgs = GetExcelValue(mySheet, "V" + excelline.ToString());
+                    if (!string.IsNullOrEmpty(tmpkgs))
+                        data.WEIGHKGS = Convert.ToDecimal(tmpkgs);
+
+                    bodyList.Add(data);
+
+
+
+                    excelline = excelline + 1;
+            }
+
+                if (bodyList.Count != 0) {
+                    var headData = new MsOpSeae();
+                    headData.INPUTBY = Convert.ToString(Session["SHOWNAME"]);
+                    headData.CREATETIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                    headData.BSSTATUS = false;
+                    headData.FEESTATUS = false;
+                    headData.DbOperationType = DbOperationType.DbotIns;
+                    headData.ISCANCEL = "0";
+                    headData.MBLNO = tmpopseae.MBLNO;
+                    headData.PORTLOAD = tmpopseae.PORTLOAD;
+                    headData.PORTDISCHARGE = tmpopseae.PORTDISCHARGE;
+                    headData.DESTINATION = tmpopseae.DESTINATION;
+                    headData.SHIPPER = tmpopseae.SHIPPER;
+                    headData.CONSIGNEE = tmpopseae.CONSIGNEE;
+                    headData.NOTIFYPARTY = tmpopseae.NOTIFYPARTY;
+                    headData.MARKS = tmpopseae.MARKS;
+                    headData.DESCRIPTION = tmpopseae.DESCRIPTION;
+                    headData.KGS = tmpopseae.KGS;
+                    headData.GROSSWEIGHT = tmpopseae.GROSSWEIGHT;
+                    headData.CBM = tmpopseae.CBM;
+                    headData.MEASUREMENT = tmpopseae.MEASUREMENT;
+                    headData.PKGS = tmpopseae.PKGS;
+                    headData.KINDPKGS = tmpopseae.KINDPKGS;
+                    headData.NOPKGS = tmpopseae.NOPKGS;
+                    headData.MASTERNO = headData.BSNO;
+                    headData.CORPID = Convert.ToString(Session["COMPANYID"]);
+                    headData.BSDATE = DateTime.Now;
+                    var modb = new ModelObjectDB();
+                    var result = modb.Save(headData);
+                    issave = false;
+                    if (result.Success == true)
+                    {
+                        result = MsOpSeaeDAL.SaveDetail(headData.BSNO, bodyList, Convert.ToString(Session["USERID"]), true);
+                        bodyList.Clear();
+                    }
+                    else
+                    {
+                        errostr = errostr + result.Message;
+                    }
+
+                }
+
+                workbook.Close(true, Type.Missing, Type.Missing);
+                workbook = null;
+                excel.Quit();
+                excel = null;
+
+
+                var json = JsonConvert.Serialize(new { success = true, Message = "上传成功"+errostr });
+                return new ContentResult() { Content = json };
+            }
+            catch (Exception)
+            {
+                workbook.Close(true, Type.Missing, Type.Missing);
+                workbook = null;
+                excel.Quit();
+                excel = null;
+                jsonRespose.Success = false;
+                jsonRespose.Message = "读取Excel文件出错，请确认文件正确性";
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+            }
+        }
+
 
         [HttpPost]
         public ContentResult ImportMSCEdit()

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

@@ -1801,6 +1801,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
             strSql.Append(",[SHIPPERCODE],[SHIPPEREMAIL],[CONSIGNEECODE],[CONSIGNEEEMAIL],[NOTIFYPARTYCODE],[NOTIFYPARTYEMAIL],[ENTERPRISECODETYPE],[ENTERPRISECODETYPE1],[ENTERPRISECODETYPE2]");
             strSql.Append(",INLANE,USERAILWAY,USERIVER,USETRUCK,RAILWAY_ETD,RAILWAY_PORTLOAD,RAILWAY_TRANSPORT,RAILWAY_PORTDISCHARG,RAILWAY_REMARK");
             strSql.Append(",RIVER_ETD,RIVER_PORTLOAD,RIVER_TRANSPORT,RIVER_PORTDISCHARG,RIVER_REMARK,TRUCK_ETD,TRUCK_PORTLOAD,TRUCK_TRANSPORT,TRUCK_PORTDISCHARG,TRUCK_REMARK,CDESCRIPTION,ESLLINECODE");
+            strSql.Append(",DFLASH,DCPACKINGCODE,DCWEIGHT,PSNAME,MPCODE,PACKING_GROUP");
             strSql.Append(" from OP_SEAE_AMS ");
             if (!string.IsNullOrEmpty(condition))
             {
@@ -1962,6 +1963,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                     data.VAECODE = Convert.ToString(reader["VAECODE"]);//
                     data.FECCODE = Convert.ToString(reader["FECCODE"]);//
                     data.ESLLINECODE = Convert.ToString(reader["ESLLINECODE"]);//
+                    data.DFLASH = Convert.ToString(reader["DFLASH"]);//
+                    data.DCPACKINGCODE = Convert.ToString(reader["DCPACKINGCODE"]);//
+                    data.DCWEIGHT = Convert.ToString(reader["DCWEIGHT"]);//
+                    data.PSNAME = Convert.ToString(reader["PSNAME"]);//
+                    data.MPCODE = Convert.ToString(reader["MPCODE"]);//
+                    data.PACKING_GROUP = Convert.ToString(reader["PACKING_GROUP"]);//
                     #endregion
                     bodyList.Add(data);
                 }
@@ -47685,7 +47692,6 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
             var opseaelist = new List<MsOpSeae>();
             var CtnList = new List<MsOpSeaeDetail>();
             var CtnDetailList = new List<MsOpCtnDetail>();
-            var OPAMS = new MsOpSeaeAms();
             var ctnedilist= MsCodeCtnEdiDAL.GetDataList("EDINAME='MH8'", "");
             var pkgedilist = MsCodeCtnEdiDAL.GetPkgsList("EDINAME='MH8'", "");
 
@@ -47748,11 +47754,59 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 }
                 if (SHIPMENT.GetType().FullName == "NewDataSetCargoChemical")
                 {
-
                     var tmpBILL = new NewDataSetCargoChemical();
                     tmpBILL = SHIPMENT as NewDataSetCargoChemical;
-                    OPAMS.ATTN = tmpBILL.ContactName;
-                    OPAMS.ATTNTEL = tmpBILL.EmergencyPhone;
+                    var bookingid = "";
+                    var cargoid = tmpBILL.CargoId;
+                    var ctndetail = CtnDetailList.Find(x=>x.GID==cargoid.ToString());
+                    if (ctndetail != null) {
+                        var ctn = CtnList.Find(x=>x.CTN_ID==ctndetail.CTN_ID);
+                        if (ctn != null) {
+                            bookingid = ctn.PCTN_ID;
+                            var opseae = opseaelist.Find(x => x.GROUPBS == bookingid);
+                            var OPAMS = GetAmsData("BSNO='" + opseae.BSNO + "'");
+                            if (OPAMS.AMSNO=="*")
+                            {
+                                OPAMS.DbOperationType = DbOperationType.DbotIns;
+                                OPAMS.AMSNO = Guid.NewGuid().ToString();
+                            }
+                            else {
+                                OPAMS.DbOperationType = DbOperationType.DbotUpd;
+                                OPAMS.ModelUIStatus = "E";
+
+                            }
+
+                            OPAMS.ATTN = tmpBILL.ContactName;
+                            OPAMS.ATTNTEL = tmpBILL.EmergencyPhone;
+                            OPAMS.BSNO = opseae.BSNO;
+                            var tmpstr = tmpBILL.PSNCode;
+                            if (!string.IsNullOrEmpty(tmpstr))
+                            {
+                                if (tmpstr.Length > 7 && tmpstr.IndexOf("*") > 0)
+                                {
+                                    opseae.DUNNO = tmpstr.Substring(2, tmpstr.IndexOf("*") - 2);
+                                    OPAMS.PACKING_GROUP = tmpstr.Substring(tmpstr.IndexOf("*") + 1);
+                                    opseae.CARGOID = "D";
+                                }
+                            }
+                            OPAMS.DFLASH = tmpBILL.FlashPoint;
+                            if (string.IsNullOrEmpty(OPAMS.DCWEIGHT))
+                                OPAMS.DCWEIGHT = tmpBILL.DCWeight.ToString();
+                            else {
+                                OPAMS.DCWEIGHT =(Convert.ToDouble(OPAMS.DCWEIGHT)+tmpBILL.DCWeight).ToString();
+                            }
+                            OPAMS.DCPACKINGCODE = tmpBILL.DCPackingCode;
+                            OPAMS.PSNAME = tmpBILL.PSName;
+                            OPAMS.MPCODE = tmpBILL.MPCode;
+ 
+                            var modb = new ModelObjectDB();
+                            modb.Save(OPAMS);
+                        }
+
+                    }
+
+
+
 
                 }
 

DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs

@@ -2376,6 +2376,20 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
         public string ENTERPRISECODETYPE1 { get; set; }
         [ModelDB]
         public string ENTERPRISECODETYPE2 { get; set; }
+        [ModelDB]
+        public string DFLASH { get; set; }
+        [ModelDB]
+        public string DCPACKINGCODE { get; set; }
+        [ModelDB]
+        public string DCWEIGHT { get; set; }
+        [ModelDB]
+        public string PSNAME { get; set; }
+        [ModelDB]
+        public string MPCODE { get; set; }
+        [ModelDB]
+        public string PACKING_GROUP { get; set; }
+
+
         /// <summary>
         /// 通知人内容
         /// </summary>

DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js

@@ -4610,6 +4610,8 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
             var memberyf = selectedRecords[i];
 
             var newSerialno = this.GetHandleSerialNo(storeadd);
+            var isopen = '0';
+            if (memberyf.data.IsOpen == "1" || memberyf.data.IsOpen == "true" || memberyf.data.IsOpen == "True") isopen = '1';
 
             var newsort = storeadd.getCount() + 1;
 
@@ -4651,7 +4653,7 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
                 EnterDate: myDate,
                 DebitNo: '',
                 IsDebit: "0",
-                IsOpen: "0",
+                IsOpen: isopen,
                 IsAdvancedpay: "0",
                 Sort: newSerialno,
                 IsInvoice: "0",
@@ -4664,7 +4666,8 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
                 MANAGER: MANAGER,
                 MANAGERREF: MANAGERREF,
                 WmsOutBsNo: this.WMSOUTBSNO,
-                SALECORP: memberyf.data.SALECORP
+                SALECORP: memberyf.data.SALECORP,
+                ISACC: "0"
             });
 
             storeadd.add(record);
@@ -6132,6 +6135,9 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
             var memberyf = this.storeDrChFee.getAt(i);
             if (_thisAmendfee.stroplb == 'op_SeaeOrder')
                 memberyf.data.IsCrmOrderFee = '1';
+            if (memberyf.data.IsOpen == "true" || memberyf.data.IsOpen == "True") memberyf.data.IsOpen = '1';
+            else memberyf.data.IsOpen = '0';
+
             bodyDrChFeeDatas.push(memberyf);
             var ExChangerate = memberyf.data.ExChangerate;
 

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js

@@ -6352,6 +6352,29 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                             }, {
                                     fieldLabel: Zi.LAN.FECCODE, //'收货人税号',
                                     name: 'FECCODE'
+                                }, {
+                                    fieldLabel: Zi.LAN.DFLASH, //'收货人税号',
+                                    name: 'DFLASH'
+                                }, {
+                                    fieldLabel: Zi.LAN.DCPACKINGCODE, //'收货人税号',
+                                    name: 'DCPACKINGCODE'
+                                }]
+                        }, {
+                            xtype: 'container',
+                            layout: 'hbox',
+                            defaultType: 'textfield',
+                            items: [{
+                                fieldLabel: Zi.LAN.DCWEIGHT, //,
+                                name: 'DCWEIGHT'
+                            }, {
+                                    fieldLabel: Zi.LAN.PSNAME, //'收货人税号',
+                                    name: 'PSNAME'
+                            }, {
+                                    fieldLabel: Zi.LAN.MPCODE, //'收货人税号',
+                                    name: 'MPCODE'
+                            }, {
+                                    fieldLabel: Zi.LAN.PACKING_GROUP, //'收货人税号',
+                                    name: 'PACKING_GROUP'
                             }]
                         }]
 

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js

@@ -2628,9 +2628,16 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                     text: Zi.LAN.ImportBsListExcel, //"EXCEL导入",
                     iconCls: "btnexportexcel",
                     handler: function (button, event) {
-                        this.ImortBsListExcel(button, event);
+                        this.ImortBsListExcel('');
                     },
                     scope: this
+                    }, {
+                        text: Zi.LAN.ImportBsListExcel+'(YH)', //"EXCEL导入",
+                        iconCls: "btnexportexcel",
+                        handler: function (button, event) {
+                            this.onImportExcelYHClick();
+                        },
+                        scope: this
                     }, {
                         text: Zi.LAN.ImportBsListMH8, //"EXCEL导入",
                         handler: function (button, event) {
@@ -13969,6 +13976,105 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
         return;
     },
 
+
+    onImportExcelYHClick: function (button, event) {
+        var BSNO = "";
+
+        me = this;
+
+        var imgform = new Ext.FormPanel({
+            region: 'center',
+            labelWidth: 20,
+            frame: true,
+            autoScroll: false,
+            border: false,
+            fileUpload: true,
+            items: [{
+                xtype: 'fileuploadfield',
+                id: 'LoadExcel',
+                name: 'LoadExcel',
+                emptyText: Zi.LAN.LoadExcel, //'请选择EXCEL文件',
+                fieldLabel: Zi.LAN.EXCEL, //'EXCEL',
+                buttonText: Zi.LAN.LoadExcel2, //'选择文件',
+                allowBlank: false,
+                width: 200,
+                buttonCfg:
+                {
+                    iconCls: 'uploaddialog'
+                },
+                anchor: '98%'
+            }],
+            buttons: [{
+                text: Zi.LAN.submit, //'上传',
+                type: 'submit',
+                handler: function () {
+                    var UserFilePath = Ext.getCmp('LoadExcel').getValue();
+                    if (!CheckFileExt(UserFilePath, /.xls|.xlsx/i)) {
+                        Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: Zi.LAN.QingQueRenNiShangChuanDeWenJianWeiEXCELWenJian, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //'请确认你上传的文件为EXCEL文件!'
+                        return;
+                    }
+                    if (!imgform.form.isValid()) { return; }
+                    imgform.form.submit({
+                        url: '/MvcShipping/MsOpSeae/ImportYaHang',
+                        waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu,
+                        method: 'POST',
+                        params: {
+                            bsno: BSNO
+                        },
+                        success: function (form, action) {
+
+                            win.close(this);
+                            var result = action.result;
+                            if (result.success) {
+                                _this.billdata = result.data;
+                                _this.exceldata = result.billdata;
+                                _this.ctnlistdata = result.ctnlist;
+                                _this.storeList.reload();
+                                //      return;
+                            } else {
+
+
+                            }
+
+
+                            //Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '上传成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+
+
+
+                        },
+                        failure: function (form, action) {
+                            form.reset();
+                            if (action.failureType == Ext.form.Action.SERVER_INVALID)
+                                Ext.MessageBox.alert(Zi.LAN.JingGao, action.result.Message);
+                        }
+
+
+                    });
+                }
+            }, {
+                text: Zi.LAN.GuanBi, //'关闭',
+                type: 'submit',
+                handler: function () {
+                    win.close(this);
+                }
+            }]
+        });
+
+        var win = new Ext.Window({
+            title: Zi.LAN.ShangChuanEXCEL, //"上传EXCEL",
+            width: 380,
+            height: 120,
+            modal: true,
+            resizable: false,
+            border: false,
+            items: imgform
+
+        });
+        win.show();
+
+        return;
+    },
+
     //#endregion
 
     //#region 集团委托

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js

@@ -347,6 +347,12 @@ Ext.define('MsOpSeaeAms', {
         { name: 'VAECODE', type: 'string' }, //
         { name: 'FECCODE', type: 'string' }, //
         { name: 'ESLLINECODE', type: 'string' }, //
+        { name: 'DFLASH', type: 'string' }, //
+        { name: 'DCPACKINGCODE', type: 'string' }, //
+        { name: 'DCWEIGHT', type: 'string' }, //
+        { name: 'PSNAME', type: 'string' }, //
+        { name: 'MPCODE', type: 'string' }, //
+        { name: 'PACKING_GROUP', type: 'string' }, //
 				{name: 'NOTIFYPARTYID2', type: 'string' }, // Also Notify Party（第二通知人）
         		{name: 'SHIPPERCODE', type: 'string' },
         		{ name: 'SHIPPERNAME', type: 'string' },

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js

@@ -775,4 +775,9 @@ Zi.LAN.BAOCUNWEIMOBAN = "保存为模板";
 Zi.LAN.SHENBAOFENDAN = "申报分票";
 Zi.LAN.FUZHICHENGGONG = "复制成功!";
 Zi.LAN.FENDAN = "分单";
-Zi.LAN.ZHUDAN = "主单";
+Zi.LAN.ZHUDAN = "主单";
+Zi.LAN.DCPACKINGCODE = "Packing Code";
+Zi.LAN.DCWEIGHT = "DCWeight";
+Zi.LAN.PSNAME = "PSName";
+Zi.LAN.MPCODE = "MPCode";
+Zi.LAN.PACKING_GROUP = "Packing Group";

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js

@@ -804,6 +804,13 @@ Zi.LAN.SHENBAOFENDAN = "申报分票";
 Zi.LAN.FUZHICHENGGONG = "复制成功!";
 Zi.LAN.FENDAN = "分单";
 Zi.LAN.ZHUDAN = "主单";
+Zi.LAN.DCPACKINGCODE = "Packing Code";
+Zi.LAN.DCWEIGHT = "DCWeight";
+Zi.LAN.PSNAME = "PSName";
+Zi.LAN.MPCODE = "MPCode";
+Zi.LAN.PACKING_GROUP = "Packing Group";
+
+
 //Zi.LAN. = "";
 
 

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiEdit.js

@@ -1405,7 +1405,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
                     id: 'KGS',
                     blankText: Zi.LAN.QingTianXieShuZhi, //'请填写数值！',
                     allowBlank: false,
-                    regex: /^\d+(\.\d{1,4})?$/,
+                    regex: /^\d+(\.\d{1,5})?$/,
                     autoRender: true,
                     regexText: Zi.LAN.QingShuRuZhengQueDeShuZhi //'请输入正确的数值！'
                     //,
@@ -1428,7 +1428,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
                     blankText: Zi.LAN.QingTianXieShuZhi, //'请填写数值！',
                     allowBlank: false,
                     autoRender:true,
-                    regex: /^\d+(\.\d{1,4})?$/,
+                    regex: /^\d+(\.\d{1,5})?$/,
                         regexText: Zi.LAN.QingShuRuZhengQueDeShuZhi //'请输入正确的数值！'
                         //, //'请输入正确的数值！',
                         //render: function (value) {