20230103合规校验完成

DSWeb.Common/DB/Comm.cs

@@ -535,6 +535,28 @@ namespace DSWeb.Common.DB
     }
 
 
+
+    [Table("CODE_CTN")]
+    public partial class CODE_CTN_md
+    {
+        [Key]
+        public string CTNID { get; set; } = "";
+        public string CTNSIZE { get; set; } = "";
+        public string CTNTYPE { get; set; } = "";
+        public string CTN { get; set; } = "";
+        public string EDICODE { get; set; }
+        public decimal? CTNWEIGHT { get; set; }
+        public string EEXPLAIN { get; set; }
+        public string CEXPLAIN { get; set; }
+        public string AFRCODE { get; set; }
+        public decimal? TEU { get; set; }
+        public decimal? DLIKGS { get; set; }
+
+        #region 外键 => 导航属性，ManyToMany
+
+        #endregion
+    }
+
     [Table("op_other")]
 
     public class op_other_md

DSWeb.Common/DB/CommonDataContext.cs

@@ -38,7 +38,7 @@ namespace DSWeb.Common.DB
         public DbSet<Info_Client_ACCDATE_mb> Info_Client_ACCDATE { get; set; }
 
         public DbSet<code_fee_md> code_fee { get; set; }
-
+        public DbSet<CODE_CTN_md> CODE_CTN { get; set; }
         public DbSet<op_other_md> op_other { get; set; }
         public DbSet<ch_fee_md> ch_fee { get; set; }
         public DbSet<ch_fee_invoice_md> ch_fee_invoice { get; set; }

DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs

@@ -42,6 +42,7 @@ using Quartz.Util;
 using DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL;
 using DSWeb.MvcShipping.Models.MsOpSeae;
 using DSWeb.MvcShipping.DAL.MsOpSeaeDAL;
+using Aspose.Cells.Drawing;
 
 
 namespace DSWeb.Areas.CommMng.DAL
@@ -6575,13 +6576,70 @@ namespace DSWeb.Areas.CommMng.DAL
 
                 var OpCtnlist = MsOpSeaeDAL.GetBodyList("BSNO='" + head.BSNO + "'");
 
-                //foreach (var ctn in OpCtnlist) { 
-                //    var 
-                //}
-
                 var OpCtnDetailList = MsOpSeaeDAL.GetOpCtnDetailList("[CTN_ID] in (select [CTN_ID] from op_ctn where BSNO='" + head.BSNO + "')");
 
+                if (OpCtnlist != null && OpCtnlist.Count > 0) {
+
+                    var cdc = new CommonDataContext();
+
+                    result.main.businessInfo.contaList = new List<ContaList>();
+
+                    foreach (var ctn in OpCtnlist) {
+
+                        var codectn = cdc.CODE_CTN.FirstOrDefault(x => x.CTN == ctn.CTNALL);
+
+                        var newcon = new ContaList {
+                            contaType = codectn.EDICODE,
+                            contaTypeName = ctn.CTNALL,
+                            teu = codectn.TEU.ToString(),
+                            contaNo = ctn.CNTRNO,
+                            sealNo = ctn.SEALNO,
+                            pkGs = ctn.PKGS,
+                            kindPKGs = ctn.KINDPKGS,
+                            kGs = ctn.KGS ,
+                            cbm = ctn.CBM ,
+                            tareWeight = ctn.TAREWEIGHT,
+                            contaStatus = ctn.CTNSTATUS,
+                            weighType = ctn.WEIGHTYPE,
+                            weighKGs =ctn.WEIGHKGS,
+                            weighAttn = ctn.WEIGHATTN,
+                            vgmConnCom = ctn.VGMCONNCOM,
+                            weighTel = ctn.WEIGHTEL,
+                            weighDate = ctn.WEIGHDATE,
+                            vgmAddr = ctn.VGMADDR,
+                            vgmEmail = ctn.VGMEMAIL,
+                            remark=ctn.REMARK,
+                            contaCategory=codectn.CTNSIZE=="20"?"small":"big"
+                        };
+
+                        if (OpCtnDetailList != null && OpCtnDetailList.Count > 0) {
+
+                            newcon.cargoList = new List<CargoList>();
+
+                            foreach (var detail in OpCtnDetailList) {
+                                var newdetail = new CargoList {
+                                    pKGs = detail.PKGS,
+                                    kindPKGs=detail.KINDPKGS,
+                                    kGs = detail.KGS,
+                                    cbm = detail.CBM,
+                                    hsCode = detail.HSCODE,
+                                    marks=detail.MARKS,
+                                    description=detail.DESCRIPTION,
+                                    remark=detail.REMARK
+                                };
+
+                                newcon.cargoList.Add(newdetail);
+
+                            }
+                        }
+
+                        result.main.businessInfo.contaList.Add(newcon);
+                    }
+
+                    
+                }
 
+                        
             }
 
             return result;

DSWeb/Areas/CommMng/Models/BasicDataModel.cs

@@ -976,8 +976,15 @@ namespace DSWeb.Areas.CommMng.Models
 
     public class CargoList 
     {
-        public string pKGs { get; set; }
+        public decimal? pKGs { get; set; }
         public string kindPKGs { get; set; }
+
+        public decimal? kGs { get; set; }
+        public decimal? cbm { get; set; }
+        public string hsCode { get; set; }
+        public string marks { get; set; }
+        public string description { get; set; }
+        public string remark { get; set; }
     }
     public class ContaList
     {
@@ -1004,7 +1011,7 @@ namespace DSWeb.Areas.CommMng.Models
         /// <summary>
         /// 
         /// </summary>
-        public int pkGs { get; set; }
+        public decimal? pkGs { get; set; }
         /// <summary>
         /// 
         /// </summary>
@@ -1012,15 +1019,15 @@ namespace DSWeb.Areas.CommMng.Models
         /// <summary>
         /// 
         /// </summary>
-        public int kGs { get; set; }
+        public decimal? kGs { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int cbm { get; set; }
+        public decimal? cbm { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public int tareWeight { get; set; }
+        public decimal? tareWeight { get; set; }
         /// <summary>
         /// 
         /// </summary>
@@ -1032,7 +1039,7 @@ namespace DSWeb.Areas.CommMng.Models
         /// <summary>
         /// 
         /// </summary>
-        public int weighKGs { get; set; }
+        public decimal? weighKGs { get; set; }
         /// <summary>
         /// 
         /// </summary>

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

@@ -19745,6 +19745,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
 
                         this.ruleCheckNameArr_2 = [];
 
+                        var btnWarning = Ext.getCmp('btnRuleWarning');
+                        btnWarning.setText(checkresult.length + '');
+
                         for (var idx = 0; idx < checkresult.length; idx++)
                         {
                             var item = checkresult[idx];

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

@@ -622,7 +622,7 @@ Zi.LAN.HGYDSTATUS = '运抵';
 Zi.LAN.updatectntruck = '同步车队';
 
 
-Zi.LAN.CheckRuleNames = '规则名称';
+Zi.LAN.CheckRuleNames = '规则校验';
 
 Zi.LAN.UpOcrFile = "请选择pdf、excel、word文件";
 Zi.LAN.UpOcrFileLabel = "选择文件";

ToolProject/TestForm/TestForm/Form1.Designer.cs

@@ -29,11 +29,14 @@
         private void InitializeComponent()
         {
             this.button1 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.textBox1 = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(146, 104);
+            this.button1.Location = new System.Drawing.Point(40, 12);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 0;
@@ -41,21 +44,54 @@
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(114, 53);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 1;
+            this.button2.Text = "button2";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(195, 58);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(41, 12);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "label1";
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(12, 55);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(96, 21);
+            this.textBox1.TabIndex = 3;
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(294, 181);
+            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.button2);
             this.Controls.Add(this.button1);
             this.Name = "Form1";
             this.Text = "Form1";
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
 
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox textBox1;
     }
 }
 

ToolProject/TestForm/TestForm/Form1.cs

@@ -22,5 +22,19 @@ namespace TestForm
         {
             DJYtoD7_OPSTATUS dj = new DJYtoD7_OPSTATUS();
         }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            var str = textBox1.Text;
+            var newint = 0;
+            try
+            {
+                newint = Convert.ToInt32(Convert.ToDecimal(str));
+            }catch(Exception ex)
+            {
+
+            }
+            label1.Text = newint.ToString();
+        }
     }
 }