From 8fe57c6ee4357225cddec528675b07c0048fd817 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 25 四月 2023 13:35:16 +0800
Subject: [PATCH] WMS扫码添加注释，工序出站汇报PDA保存时若为多工位的情况操作员改为非必填项
---
WebAPI/WebAPI.csproj | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 84fd031..1706d0b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -81,6 +81,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
@@ -276,6 +277,9 @@
<Content Include="Web References\WebS\ClsGy_BadReason_Model.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
+ <Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model.datasource">
+ <DependentUpon>Reference.map</DependentUpon>
+ </Content>
<Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model_View.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
@@ -395,7 +399,9 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcExchRecordBackBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcessSendWorkController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcExchSendWorkBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
@@ -458,6 +464,7 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill_OutController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_SplitBarCodeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\KF_BarCodeStatusChangeBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Sc_BarCodeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" />
@@ -471,6 +478,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaterTypeBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
@@ -929,6 +937,7 @@
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_MateMould\" />
<Folder Include="Views\Gy_MatePriceSup\" />
+ <Folder Include="Views\Gy_MaterTypeBill\" />
<Folder Include="Views\Gy_MouldStatus\" />
<Folder Include="Views\Gy_Operator\" />
<Folder Include="Views\Gy_PackType\" />
@@ -938,6 +947,7 @@
<Folder Include="Views\Gy_RoutingGroup\" />
<Folder Include="Views\Gy_SettleStyle\" />
<Folder Include="Views\Gy_SOPBill\" />
+ <Folder Include="Views\Gy_SplitBarCode\" />
<Folder Include="Views\Gy_Staff\" />
<Folder Include="Views\Gy_StdMinPickQty\" />
<Folder Include="Views\Gy_StockPlace_\" />
@@ -984,6 +994,8 @@
<Folder Include="Views\Sc_MouldStatusChangeBill\" />
<Folder Include="Views\Sc_ProcessExchangeIssueBill\" />
<Folder Include="Views\Sc_ProcessSendWork\" />
+ <Folder Include="Views\Sc_ProcExchRecordBackBill\" />
+ <Folder Include="Views\Sc_ProcExchSendWorkBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
@@ -1035,10 +1047,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.63.3/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1