12

DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBLEdit.js

@@ -3296,7 +3296,7 @@ Ext.extend(Shipping.MsChPayapplicationBLEdit, Ext.Panel, {
             var SALECORPID = this.formEdit.getForm().findField('SALECORPID').getValue();
             if ((SALECORPID == '') || (SALECORPID == null)) {
                 var selectedRecords2 = this.gridAddList.selModel.getSelection();
-                var rec = selectedRecords2[i];
+                var rec = selectedRecords2[0];
                 SALECORP = rec.data.SALECORP;
                 var recs = DsStoreQueryBy(this.storeSaleCompany, 'NAME', SALECORP);
                 if (recs.getCount() > 0) {

DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js

@@ -2578,8 +2578,8 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
             var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
             field = basicForm.findField('OPDATE');
             field.setValue(mydatestr);
-            field = this.formEdit.getForm().findField('CUSTOMDATE');
-            field.setValue(mydatestr);
+            //field = this.formEdit.getForm().findField('CUSTOMDATE');
+            //field.setValue(mydatestr);
 
             var mydatestr = Ext.util.Format.date(myDate, 'Y-m');
             field = basicForm.findField('ACCDATE');

DSWeb/Areas/MvcShipping/Viewsjs/WMS/WMSINEdit.js

@@ -2308,7 +2308,8 @@ Ext.extend(Shipping.WMSINEdit, Ext.Panel, {
                     this.panelFee.strBSNO = data.ASSOCIATEDNO;
                     this.panelFee.StoreDateCurr.load({ params: { optype: "op_Seai", bsno: data.ASSOCIATEDNO} });
                     this.panelFee.StoreUnit.load({ params: { bsno: data.ASSOCIATEDNO, bstype: "WMSIN"} });
-                    this.panelFee.storeBodySum.load({ params: { bsno: data.ASSOCIATEDNO} });
+                    this.panelFee.storeBodySum.load({ params: { bsno: data.ASSOCIATEDNO } });
+                    this.panelFee.storeChFeeGain.load({ params: { bsno: data.ASSOCIATEDNO, optype: "WMSIN" } });
 
                     //this.panelFee.storeDrChFee.load({ params: { billno: data.ASSOCIATEDNO, type: 1, optype: "op_Seai"} });
                     this.panelFee.LoadDrChFee2("bsno='" + data.ASSOCIATEDNO + "' and feetype=1 and isnull(wmsoutbsno,'')<>'' ");

JobSendAgentMail/JobSendAgentMail.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,6 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +43,12 @@
     <Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
     </Reference>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\packages\HtmlAgilityPack.1.11.29\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
@@ -64,6 +73,7 @@
       <HintPath>..\D7MqClient\packages\RabbitMQ.Client.6.2.2\lib\net461\RabbitMQ.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Memory">
       <HintPath>..\D7MqClient\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -77,11 +87,15 @@
   <ItemGroup>
     <Compile Include="DsSendMail.cs" />
     <Compile Include="JobDjy2D7Date.cs" />
+    <Compile Include="JobReceiveMail.cs" />
     <Compile Include="JobSendCtn.cs" />
     <Compile Include="JobSendBooking.cs" />
+    <Compile Include="MailReceiveRecordInfo.cs" />
+    <Compile Include="MailSend.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config" />
     <None Include="job_scheduling_data_2_0.xsd">
       <SubType>Designer</SubType>
     </None>
@@ -98,4 +112,12 @@
     <Folder Include="Model\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
 </Project>

JobSendAgentMail/packages.config

@@ -2,6 +2,7 @@
 <packages>
   <package id="Common.Logging" version="3.3.1" targetFramework="net40" />
   <package id="Common.Logging.Core" version="3.3.1" targetFramework="net40" />
+  <package id="EntityFramework" version="6.4.4" targetFramework="net461" />
   <package id="log4net" version="2.0.8" targetFramework="net40" requireReinstallation="true" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" />
   <package id="Quartz" version="2.6.2" targetFramework="net40" />