'单一窗口改客户端文件解析模式，未完成'

DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs

@@ -6251,6 +6251,18 @@ namespace DSWeb.Areas.CommMng.DAL
         }
 
         #endregion
+
+        public static ContentResult GetContentResult(DBResult dbresult)
+        {
+            var jsonRespose = new JsonResponse
+            {
+                Success = dbresult.Success,
+                Message = dbresult.Message,
+                Data = null
+            };
+            if (dbresult.Data != null) jsonRespose.Data = dbresult.Data;
+            return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+        }
     }
 
 }

DSWeb/Areas/Dispatch/Content/本体及教程/手机玩/要安装模拟器来玩.txt

@@ -0,0 +1,29 @@
+因为现在的手机不再支持ROOT，且分辨率超级多。
+因此，只能在手机上。安装模拟器来玩。
+你要是电脑玩舰R就没必要下载X8，因为你电脑上 雷电、 MUMU 、这一类本身就已经是模拟器了，没必要套娃
+
+目前有两个。一个是VMOS
+https://mtcw2998.lanzoui.com/b01bce2md
+
+一个是X8沙箱
+
+https://share.weiyun.com/5AHm2W8 密码：nba123
+
+
+
+1.到网盘下载破解版VMOS
+https://mtcw2998.lanzoui.com/b01bce2md
+
+2.安装安卓5.1 极客版 rom
+
+3.下载完后，安装进入系统。点显示设置，调节分辨率 720 X 1280 DPI320
+不启用虚拟按键
+
+4.重启VMOS (如果脚本还显示红字，点击VMOS悬浮窗，滑动里边有个刷新分辨率的，再刷新一下重启)
+
+5.调节悬浮窗到最小，或者不要悬浮窗，免得影响识别
+
+6.观察，打一轮看是否哪里卡，如果卡了。估计悬浮窗挡住了取色点，拖动一下悬浮窗
+
+如果设置完毕，泡面界面是不会提示分辨率不对的红字的。
+有红字提示，证明设置有误。即便能用也会有小BUG

DSWeb/Areas/Dispatch/Views/Stock/Declare.aspx

@@ -28,7 +28,7 @@
         })
 
         $(function () {
-            $(document).attr("title", "青岛五通世纪");
+            $(document).attr("title", "青岛东胜软件");
         })
     </script>
 </asp:Content>

DSWeb/Areas/MvcShipping/Controllers/MsOpApplyController.cs

@@ -29,6 +29,8 @@ using DSWeb.MvcShipping.DAL.MsSysParamSet;
 using DSWeb.MvcShipping.DAL.ChMonthCloseDAL;
 using DSWeb.MvcShipping.DAL.MsCodeOpTemplate;
 using DSWeb.MvcShipping.DAL.MsChFeeDAL;
+using DSWeb.Areas.MvcShipping.Models.Message.VGM;
+using DSWeb.Common.DB;
 
 namespace DSWeb.MvcShipping.Controllers
 {
@@ -534,6 +536,95 @@ namespace DSWeb.MvcShipping.Controllers
             }
         }
 
+
+        /// <summary>
+        /// 由解析软件触发 建立新报关业务 或返回现有报关业务的BSNO
+        /// </summary>
+        /// <param name="MBLNO"></param>
+        /// <param name="USERID"></param>
+        /// <param name="SHOWNAME"></param>
+        /// <param name="COMPANYID"></param>
+        /// <returns></returns>
+        public ContentResult NewApply(string MBLNO, string USERID) {
+
+            MsOpApply headData = null;
+
+            var cdc = new CommonDataContext();
+
+            var userinfo = cdc.VW_user.FirstOrDefault(x => x.USERID == USERID);
+            //var COMPANYID = userinfo
+
+            headData = MsOpApplyDAL.GetData($" MBLNO='{MBLNO}' ");
+
+            if (headData == null || headData.MBLNO=="")
+            {
+
+                //建立一个新报关业务
+
+                headData = new MsOpApply();
+                headData.BSNO = "topapply" + Guid.NewGuid().ToString();
+                headData.MASTERNO = headData.BSNO;
+
+                headData.MBLNO = MBLNO;
+                headData.INPUTBY = Convert.ToString(Session["SHOWNAME"]);
+                headData.BSDATE = DateTime.Now;
+                headData.DbOperationType = DbOperationType.DbotIns;
+
+                headData.CUSTOMDATE = null;
+                headData.CLEARCUSTOMDATE = null;
+
+                headData.CORPID = userinfo.COMPANYID;
+
+                headData.INPUTBY = userinfo.SHOWNAME;
+
+                var _r = MsOpApplyDAL.getCUSTNO(headData, USERID, userinfo.SHOWNAME, userinfo.COMPANYID);
+
+                if (_r.Success)
+                {
+                    headData.CUSTNO = _r.Data.ToString();
+
+
+                    var modb = new ModelObjectDB();
+                    DBResult result = modb.Save(headData);
+                    if (result.Success)
+                    {
+                        DBResult dr = new DBResult(true, "", headData.BSNO);
+                        return BasicDataRefDAL.GetContentResult(dr);
+                    }
+                    else
+                    {
+                        return BasicDataRefDAL.GetContentResult(result);
+                    }
+                    //iscreatecustno = true;
+                    //DBResult dr = new DBResult(true,"", headData.BSNO);
+                    //return BasicDataRefDAL.GetContentResult(dr);
+                }
+                else
+                {
+                    return BasicDataRefDAL.GetContentResult(_r);
+                }
+
+            }
+            else {
+                DBResult dr = new DBResult(true, "", headData.BSNO);
+                return BasicDataRefDAL.GetContentResult(dr);
+            }
+            
+        }
+
+        /// <summary>
+        /// 由解析软件触发 令数据从dechead declist container解析至op_apply
+        /// </summary>
+        /// <param name="BSNO"></param>
+        /// <returns></returns>
+        public ContentResult SaveNewApply(string BSNO) {
+            var result = new DBResult(true,"","");
+
+
+
+            return BasicDataRefDAL.GetContentResult(result);
+        }
+
         public ContentResult Delete(string data)
         {
             var head = JsonConvert.Deserialize<MsOpApply>(data);

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

@@ -543,7 +543,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
             {
                 var SeaeDefaultSort = MsSysParamSetDAL.GetData("PARAMNAME='SeaeDefaultSort'");
                 if (SeaeDefaultSort.PARAMVALUE != "")
-                    strSql.Append(" order by " + SeaeDefaultSort.PARAMVALUE );
+                    strSql.Append(" order by " + SeaeDefaultSort.PARAMVALUE.Replace("FEESTATUS", "A.FEESTATUS").Replace("TRANSNO", "A.AMENDNO").Replace("EDIREMARK", "A.REASON").Replace("ACCDATE", "A.ACCDATE")
+                    .Replace("CREATETIME", "A.CREATETIME").Replace("REMARK", "A.REMARK").Replace("MSHIPPERID", "(select showname from [user] where gid=f.Auditoperator) ").Replace("MCONSIGNEEID", "f.AUDITDATE "));
                 else
                     strSql.Append(" order by BSDATE desc");
             }

DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnEdit.js

@@ -3682,7 +3682,6 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, {
                                 headfield.setValue(member.data.DEFVALUE);
                         };
 
-
                     } else {
 
                     }

DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnModel.js

@@ -26,6 +26,7 @@
 		{ name: 'CUSTSERVICE', type: 'string' },
 		{ name: 'SALE', type: 'string' },
 		{ name: 'CORPID', type: 'string' },
+		{ name: 'CORPREF', type: 'string' },
 		{ name: 'SALEDEPT', type: 'string' },
 		{ name: 'CREATETIME', type: 'string' },
 		{ name: 'VESSEL', type: 'string' },

DSWeb/DSWeb.csproj

@@ -1078,6 +1078,11 @@
     <Content Include="Areas\Dispatch\Content\MP\lib\weui.css" />
     <Content Include="Areas\Dispatch\Content\MP\lib\weui.min.css" />
     <Content Include="Areas\Dispatch\Content\MP\lib\zepto.js" />
+    <Content Include="Areas\Dispatch\Content\本体及教程\决战设置.jpg" />
+    <Content Include="Areas\Dispatch\Content\本体及教程\手机玩\要安装模拟器来玩.txt" />
+    <Content Include="Areas\Dispatch\Content\本体及教程\新功能设置.jpg" />
+    <Content Include="Areas\Dispatch\Content\本体及教程\电脑玩\请使用雷电模拟器并照此设置.jpg" />
+    <Content Include="Areas\Dispatch\Content\本体及教程\轮换泡澡设置.jpg" />
     <Content Include="Areas\Dispatch\Views\Booking\AuditList.aspx" />
     <Content Include="Areas\Dispatch\Views\Dispatch\DispatchFeeList.aspx" />
     <Content Include="Areas\Dispatch\Views\Dispatch\DispatchListMonth.aspx" />
@@ -4970,6 +4975,8 @@
     <Content Include="Areas\Dispatch\Content\MP\fonts\PingFang SC.ttf" />
     <Content Include="Areas\Dispatch\Content\MP\fonts\PingFang SC.woff" />
     <Content Include="Areas\Dispatch\Views\Shared\MPZC.Master" />
+    <Content Include="Areas\Dispatch\Content\本体及教程\泡面5-美食联合2.apk" />
+    <Content Include="Areas\Dispatch\Content\本体及教程\泡面新手教程.pdf" />
     <None Include="Areas\MvcShipping\Views\MsOpSeae\ViewPage1.cshtml" />
     <Content Include="Settlements\CommonPayApplicationAudit.aspx" />
     <Content Include="Settlements\CommonPayApplicationSettlement.aspx" />