20240415-2

DSWeb/Areas/MvcShipping/Controllers/MsCodeCtnEdiController.cs

@@ -112,17 +112,19 @@ namespace DSWeb.MvcShipping.Controllers
             return new ContentResult() { Content = json };
         }
 
-        public ContentResult SaveLANEDetail(string body)
+        public ContentResult GetLANEList(string condition, string sort)
         {
-            DBResult result = MsCodeCtnEdiDAL.SaveLANEDetail(JsonConvert.Deserialize<List<CodeCtnEdi>>(body), Convert.ToString(base.Session["COMPANYID"]));
-            JsonResponse jsonRespose = new JsonResponse
+            List<CodeCtnEdi> dataList = MsCodeCtnEdiDAL.GetLANEList(condition, sort);
+            string json = JsonConvert.Serialize(new
             {
-                Success = result.Success,
-                Message = result.Message
-            };
+                Success = true,
+                Message = "查询成功",
+                totalCount = dataList.Count,
+                data = dataList.ToList<CodeCtnEdi>()
+            });
             return new ContentResult
             {
-                Content = JsonConvert.Serialize<JsonResponse>(jsonRespose)
+                Content = json
             };
         }
 

DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs

@@ -64,7 +64,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
             strSql.Append(" ,g.TTLDR TTLDR  ");
             strSql.Append(" ,B.OPLBNAME,B.STLNAME,B.ISGAIQIAN ");
             strSql.Append(" ,(case when (select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='提单签入')>0 then 1 else 0 end) ISQR,ob.QRDATE,ob.QCDATE ");
-            strSql.Append(" ,ose.ORDEROP   ");//订舱中心
+            strSql.Append(" ,ose.ORDEROP  ,ose.BSSOURCE ");//订舱中心
             strSql.Append(" from v_op_blissue_bill B   ");
             strSql.Append(" left join op_blissue ob on ob.BSNO=B.BSNO  ");
             strSql.Append(" left join v_op_gain_sum_ttl g on g.BSNO=B.BSNO  ");
@@ -258,6 +258,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
                     data.DOC = Convert.ToString(reader["DOC"]);
 
                     data.ORDEROP = Convert.ToString(reader["ORDEROP"]);
+                    data.BSSOURCE = Convert.ToString(reader["BSSOURCE"]);
                     #endregion
                     headList.Add(data);
                 }
@@ -692,7 +693,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
             strSql.Append(" ,g.TTLDR TTLDR  ");
             strSql.Append(" ,B.OPLBNAME,B.STLNAME,0 ISQR,ob.QRDATE,ob.QCDATE,B.ISGAIQIAN   ");
 
-            strSql.Append(" ,ose.ORDEROP   ");
+            strSql.Append(" ,ose.ORDEROP ,ose.BSSOURCE  ");
             strSql.Append(" from v_op_blissue_bill B   ");
             strSql.Append(" left join op_blissue ob on ob.BSNO=B.BSNO ");
             strSql.Append(" left join v_op_blissuelist_Detail obd on obd.BSNO=B.BSNO ");

DSWeb/Areas/MvcShipping/Models/MsOp_BLISSUE/MsOp_BLISSUE.cs

@@ -292,6 +292,9 @@ namespace DSWeb.MvcShipping.Models.MsOp_BLISSUE
             get { return _ORDEROP; }
             set { _ORDEROP = value; }
         }
+
+        public string BSSOURCE { get; set; }
+
         public string BLISSUESTATUS
         {
             get { return _BLISSUESTATUS; }

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

@@ -1164,7 +1164,15 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
         }, {
             dataIndex: 'INVNO',
             header: Zi.LAN.INVNO, //'货物标识',
-            width: 120
+            width: 120,
+            renderer: function (value, meta) {
+
+                meta.tdCls = 'mblno';
+
+                btnurl = getGridCopyButton(value);
+
+                return btnurl + value;
+            }
         }, {
             dataIndex: 'REMARK',
             header: Zi.LAN.REMARK, //'货物标识',