海运出口委托管理，引入场站数据，改为用重量+皮重填充参考重量和称重重量，并将称重方式默认为累加

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs

@@ -7785,7 +7785,7 @@ namespace DSWeb.MvcShipping.Controllers
 
         #endregion
 
-        #region 获取场站数据
+        #region 获取场站数据 引入场站数据
         public ContentResult GetyardctnList(string bsno, string mblno, string yard, bool isweb = false,string jck="all")
         {
             string userid = Convert.ToString(Session["USERID"]);

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

@@ -14881,8 +14881,6 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                             var jsonresult = Ext.JSON.decode(response.responseText);
                                             if (jsonresult.Success) {
 
-
-
                                                 Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
                                             }
                                             else {
@@ -14906,28 +14904,43 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                             var sVESSEL = member.data.VESSEL;
                             var sVOYNO = member.data.VOYNO;
                             member.data.CTNALL = member.data.CTNALL.replace("HQ", "HC");
+                            var _kgs = parseFloat(member.data.KGS);
+                            var _tareweight = parseFloat(member.data.TAREWEIGHT);
+                            var _WEIGHKGS = Add(_kgs,_tareweight);
+
                             var selectrecords = DsStoreQueryBy(this.storeBodyList, 'CNTRNO', member.data.CNTRNO);
                             if (selectrecords.length > 0) {
                                 for (var i = 0; i < this.storeBodyList.getCount(); i += 1) {
                                     var memberbody = this.storeBodyList.getAt(i);
                                     if (memberbody.data.CNTRNO == member.data.CNTRNO) {
+
                                         if (member.data.SEALNO != '') {
                                             memberbody.set("SEALNO", member.data.SEALNO.trim());
                                         }
+
                                         if (sKINDPKGS != '') {
                                             memberbody.set("KINDPKGS", sKINDPKGS);
                                         } else memberbody.set("KINDPKGS", member.data.KINDPKGS);
+
                                         if (member.data.PKGS != 0) {
                                             memberbody.set("PKGS", member.data.PKGS);
                                         }
+
                                         if (member.data.KGS != 0) {
                                             memberbody.set("KGS", member.data.KGS);
                                         }
+
                                         if (member.data.CBM != 0) {
                                             memberbody.set("CBM", member.data.CBM);
-                                        } if (member.data.WEIGHKGS != 0) {
-                                            memberbody.set("WEIGHKGS", member.data.WEIGHKGS);
-                                            memberbody.set("TTLWEIGHT", member.data.WEIGHKGS);
+                                        }
+
+                                        if (member.data.TAREWEIGHT != 0) {
+                                            memberbody.set("TAREWEIGHT", member.data.TAREWEIGHT);
+                                        }
+
+                                        if (member.data.KGS != 0 && member.data.TAREWEIGHT != 0) {
+                                            memberbody.set("WEIGHKGS", _WEIGHKGS);
+                                            memberbody.set("TTLWEIGHT", _WEIGHKGS);
                                         }
                                         memberbody.commit();
 
@@ -14936,14 +14949,19 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                 }
 
 
-                            } else {
+                            }
 
+                            else
+                            {
                                 var addKINDPKGS = member.data.KINDPKGS;
                                 if (addKINDPKGS == '')
                                     addKINDPKGS = sKINDPKGS;
                                 var CTNSTATUS = member.data.CTNSTATUS;
                                 var MASTERNO = member.data.MASTERNO;
 
+                                var _kgs = parseFloat(member.data.KGS);
+                                var _tareweight = parseFloat(member.data.TAREWEIGHT);
+                                var _WEIGHKGS = Add(_kgs, _tareweight);
 
                                 var newSerialno = this.DsGetNewNo(this.storeBodyList);
                                 this.serialNo = newSerialno;
@@ -14960,9 +14978,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                     KGS: member.data.KGS,
                                     TAREWEIGHT: member.data.TAREWEIGHT,
                                     CBM: member.data.CBM,
-                                    WEIGHTYPE: member.data.WEIGHTYPE,
-                                    TTLWEIGHT: member.data.WEIGHKGS,
-                                    WEIGHKGS: member.data.WEIGHKGS,
+                                    WEIGHTYPE: "累加",
+                                    TTLWEIGHT: _WEIGHKGS,
+                                    WEIGHKGS: _WEIGHKGS,
                                     WEIGHATTN: custop,
                                     WEIGHTEL: custoptel,
                                     WEIGHSIGN: custop,
@@ -15356,8 +15374,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                                         var KINDPKGS = this.formEdit.getForm().findField('KINDPKGS').getValue();
                                         this.formEdit.getForm().findField('NOPKGS').setValue(PKGS + KINDPKGS);
                                         this.formEdit.getForm().findField('TOTALNO').setValue('SAY:' + ToEn(PKGS).toUpperCase() + ' ' + KINDPKGS + ' ONLY.');
-
-                                        Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                                        MsgTip(Zi.LAN.TiShi, jsonresult.Message);
+                                        //Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
                                     }
                                     else {
                                         Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });