From 407efcbc6d807adb735218159e684a74eacceec8 Mon Sep 17 00:00:00 2001
From: yangtm <vivianyang@valueics.com>
Date: Wed, 28 Feb 2024 16:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8F=8F=E8=BF=B0=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ICSSoft.FromERP/ICSSoft.FromERP/App.config    |   2 +-
 .../Root/ICSSoft.Frame.Data.Entity.dll        | Bin 143360 -> 143360 bytes
 .../NFine.Application/WMS/BasicSettingsApp.cs |   2 +-
 .../WMS/Views/BasicSettings/ICSDNSync.cshtml  |   6 ++++--
 .../PublishProfiles/FolderProfile.pubxml      |   8 ++++----
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/App.config b/ICSSoft.FromERP/ICSSoft.FromERP/App.config
index b72646a..ffa00a3 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP/App.config
+++ b/ICSSoft.FromERP/ICSSoft.FromERP/App.config
@@ -9,7 +9,7 @@
     <add key="ERPDB" value="[192.168.1.218].[ICS_WMS_NW]"/>
     <add key="WHCode" value=""/>
     <add key="Date" value=""/>
-    <add key="DocNo" value="010002926978"/>
+    <add key="DocNo" value="010002935014"/>
     <!--测试-->
     <!--<add key="HGpostUrlStr" value="http://58.210.216.118:8382/api/jobs/CFG-IMP-ORDINI"/>-->
     <!--正式-->
diff --git a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll
index 22bcbc9629ad87d2b716484fdf3ac2ca17925292..1e304a958ecf90cfe28f2a7436b24557a7be8d73 100644
GIT binary patch
delta 109
zcmZp8z|ru4V?qbBK+K)S?ycR7g4YG|Z}=8nZYg(LZ=73esczJ}ea&^o3%(!~)9Y24
zB=z_Nza4M)+wR?~<hbh37o#<d3=9meRxvLZ?tDIbU5u%L?(<!HpRQ<(fl$-esWQFV
KzCn#CfD-^lgfVXb

delta 89
zcmV-f0H*(d;0S==2#|;aa;DOOi?xdZ5!Vm}R_eOefMG(b_NlP7Z}?uftk(h1O#^bK
v(wBcF0vQ(f_su}UYwJU`9kWLowa5wq0000)I+w;J0_u}M0T{QiCIV0in<FQ@

diff --git a/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs b/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
index bffab2b..ac02d4a 100644
--- a/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
+++ b/WMS-BS/NFine.Application/WMS/BasicSettingsApp.cs
@@ -3717,7 +3717,7 @@ SELECT distinct ID,GroupName FROM ICSInspectionGroup  where WorkPoint='{0}'";
                                   ,CreateDateTime='" + Convert.ToDateTime(HeadInfo.VDATUM) + "',POID='" + HeadInfo.AUFNR + @"'
                                   ,DNID='" + HeadInfo.EBELN + "',DNDetailID='" + HeadInfo.EBELP + "',Quantity=" + Item.HGMENGE + @"
                                   ,SAPSequence=" + Item.L_LME.ToString() + ",WHCode='" + Item.LGORT.Trim() + "',EATTRIBUTE1='" + Item.MEMO + @"'
-                                  ,ExtensionID='" + ExtensionID + "',InspectionType='" + HeadInfo.ART + "',InvoDescribe='" + HeadInfo.ART + @"'
+                                  ,ExtensionID='" + ExtensionID + "',InspectionType='" + HeadInfo.ART + "',InvoDescribe='" + Item.MAKTX + @"'
                                   ,Unity='" + Item.MEINS + "',StockIndicator='" + Item.SOBKZ + "',DepositArea='" + Item.LTKZA + @"'
                                   ,ModificationDate='" + HeadInfo.TEST1 + "',TrackingNumber='" + HeadInfo.TEST2 + @"'
                                   ,NonconformingForm='" + HeadInfo.TEST3 + "',EATTRIBUTE2='" + HeadInfo.TEST4 + @"'
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSDNSync.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSDNSync.cshtml
index 66e4a66..5e9ac47 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSDNSync.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/BasicSettings/ICSDNSync.cshtml
@@ -2,6 +2,7 @@
     ViewBag.Title = "Index";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<script src="~/Content/js/datepicker/WdatePicker.js"></script>
 <script>
 
     debugger;
@@ -63,7 +64,7 @@
     }
     //*审核到货单生成条码
     function gridList() {
-        
+
 
     }
 
@@ -136,7 +137,8 @@
                 <td style="text-align:right;"><label class="lglabel" for="txt_StartTime">&nbsp;&nbsp;&nbsp;&nbsp;同步开始时间</label>：</td>
                 <td>
                     <div class="input-group">
-                        <input id="txt_StartTime" type="datetime" class="form-control" style="width: 100px;">
+                        @*<input id="txt_StartTime" type="datetime" class="form-control" style="width: 100px;">*@
+                        <input type="text" name="PRODUCTDATE" id="txt_StartTime" class="form-control required" onclick="WdatePicker({ dateFmt: 'yyyy-MM-dd' })" placeholder="开始时间" />
                     </div>
                 </td>
             </tr>
diff --git a/WMS-BS/NFine.Web/Properties/PublishProfiles/FolderProfile.pubxml b/WMS-BS/NFine.Web/Properties/PublishProfiles/FolderProfile.pubxml
index 802ea1a..901e54d 100644
--- a/WMS-BS/NFine.Web/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/WMS-BS/NFine.Web/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,9 +10,9 @@
     <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <publishUrl>D:\智合诚公司文件\项目\纽威\代码发布\BS</publishUrl>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>E:\projects\纽威</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file