Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

DSWeb.Common/DB/CommonDataContext.cs

@@ -97,7 +97,13 @@ namespace DSWeb.Common.DB
         public DbSet<V_CUSTOMER_NODR_md> V_CUSTOMER_NODR { get; set; }
         public DbSet<v_op_bill_gain_md> v_op_bill_gain { get; set; }
         public DbSet<v_op_blissuelist_Detail_md> v_op_blissuelist_Detail { get; set; }
+
+        public DbSet<tSysEnumValue_md> tSysEnumValue { get; set; }
+        
     }
 
 
+
+
+
 }

DSWeb.Common/DB/EDIFTPInfo.cs

@@ -118,4 +118,20 @@ namespace DSWeb.Common.DB
         public string PCTN_ID { get; set; }
         public string ISTEMP { get; set; }
     }
+
+
+    [Table("tSysEnumValue")]
+    public class tSysEnumValue_md
+    {
+        [Key]
+        public decimal LangID { get; set; } = 0;
+        public decimal EnumTypeID { get; set; }
+        public string EnumValueID { get; set; }
+        public string EnumValueName { get; set; }
+        public string IsDefault { get; set; } = "0";
+        public decimal DispIndex { get; set; }
+        public string VerNo { get; set; } = "1.00";
+        public string EnumValueName_2 { get; set; }
+    }
+
 }

DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs

@@ -58,6 +58,7 @@ using MimeKit.Text;
 using CommonTool.MailKit;
 using System.Web.UI.WebControls;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
+using DSWeb.SoftMng.Model;
 
 namespace DSWeb.Areas.CommMng.DAL
 {
@@ -7056,6 +7057,68 @@ namespace DSWeb.Areas.CommMng.DAL
         }
 
         #endregion
+
+        #region 枚举类型 值 添加
+        public static void SaveTsysenumvalue(decimal EnumTypeID, string EnumValueID, string EnumValueName)
+        {
+
+
+            var cdc = new CommonDataContext();
+
+            var detailList = cdc.tSysEnumValue.Where(x => x.EnumTypeID == EnumTypeID).ToList();
+
+            var needinsert = false;
+            if (detailList != null && detailList.Count > 0)
+            {
+                if (detailList.Exists(x => x.EnumValueID == EnumValueID))
+                {
+                    needinsert = false;
+                }
+                else
+                {
+                    needinsert = true;
+                }
+            }
+            else {
+                needinsert = true;
+            }
+
+            if (needinsert) {
+                var newrec = new tSysEnumValue_md();
+                newrec.EnumTypeID = EnumTypeID;
+                newrec.EnumValueID = EnumValueID;
+                newrec.EnumValueName = EnumValueName;
+
+                var index = 1;
+                if (detailList != null && detailList.Count > 0) {
+                    index = detailList.Count + 1;
+                }
+
+                newrec.DispIndex = index;
+
+                cdc.tSysEnumValue.Add(newrec);
+                cdc.SaveChanges();
+            }
+
+        }
+    #endregion
+
+    #region 枚举类型83000 综合业务的装货港卸货港 新增
+
+        public static DBResult SaveOtherPort(string PORT) {
+            var result = new DBResult();
+            
+            try
+            {
+                SaveTsysenumvalue(83000, PORT, PORT);
+                result.OK("保存成功");
+            } catch (Exception e) {
+                result.SetErrorInfo(e.Message);
+            }
+            return result;
+        }
+
+        #endregion
     }
 
     public class BarCodeDrawing

DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs

@@ -26,6 +26,7 @@ using DSWeb.Areas.SysMng.DAL.SysUser;
 using DSWeb.MvcShipping.DAL.MsCodeOpTemplate;
 using DSWeb.MvcShipping.DAL.ChMonthCloseDAL;
 using DSWeb.MvcShipping.DAL.MsChFeeDAL;
+using DSWeb.Areas.CommMng.DAL;
 
 namespace DSWeb.MvcShipping.Controllers
 {
@@ -504,6 +505,10 @@ namespace DSWeb.MvcShipping.Controllers
                 if (result.Success == true)
                 {
                     //--result = MsOpOtherDAL.SaveDetail(headData, bodyList, Convert.ToString(Session["USERID"]));
+
+                    //看装货港卸货港目前是否存在 如不存在则写入
+                    BasicDataRefDAL.SaveOtherPort(headData.PORTLOAD);
+                    BasicDataRefDAL.SaveOtherPort(headData.PORTDISCHARGE);
                 }
                 else
                 {

DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js

@@ -587,6 +587,31 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
             valueField: 'country',
             displayField: 'country'
         });
+
+
+        this.storePORTLOAD = Ext.create('DsExt.ux.RefEnumStore', {});
+        this.storePORTLOAD.load({ params: { enumTypeId: 83000 } });
+        this.comboxPORTLOAD = Ext.create('DsExt.ux.RefEnumCombox', {
+            fieldLabel: "装货港", 
+            store: this.storePORTLOAD,
+            forceSelection: false,
+            flex: 1,
+            valueField: 'EnumValueName',
+            displayField: 'EnumValueName',
+            name: 'PORTLOAD'
+        });
+
+        this.storePORTDISCHARGE = Ext.create('DsExt.ux.RefEnumStore', {});
+        this.storePORTDISCHARGE.load({ params: { enumTypeId: 83000 } });
+        this.comboxPORTDISCHARGE = Ext.create('DsExt.ux.RefEnumCombox', {
+            fieldLabel: "卸货港", 
+            store: this.storePORTDISCHARGE,
+            forceSelection: false,
+            flex: 1,
+            valueField: 'EnumValueName',
+            displayField: 'EnumValueName',
+            name: 'PORTDISCHARGE'
+        });
         //#endregion
 
 
@@ -617,13 +642,18 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
                     xtype: 'container',
                     layout: 'hbox',
                     defaultType: 'textfield',
-                    items: [this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL, {
-                        fieldLabel: '装货港',
-                        name: 'PORTLOAD'
-                    }, {
-                        fieldLabel: '卸货港',
-                        name: 'PORTDISCHARGE'
-                        }, this.comboxTRANSTYPE, this.comboxTRADETYPE]
+                    items: [this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL,
+
+                    //    {
+                    //    fieldLabel: '装货港',
+                    //    name: 'PORTLOAD'
+                    //}, {
+                    //    fieldLabel: '卸货港',
+                    //    name: 'PORTDISCHARGE'
+                    //    }
+                        , this.comboxPORTLOAD
+                        , this.comboxPORTDISCHARGE
+                        , this.comboxTRANSTYPE, this.comboxTRADETYPE]
                 }, {
                     xtype: 'container',
                     layout: 'hbox',