From 105bb5f0f4edd01d8f915ffda28ccd37afbfddc8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 四月 2023 08:29:41 +0800
Subject: [PATCH] 基础资料 添加校验控制 进站单出站单扫完流转卡默认带出最大工序汇报数量（获取 上一道的 合格数量（如果拆分后，上道合格数量大于流转卡数量时，仍取流转卡数量），如果是第一道则获取流转卡数量） 拆卡必须最大工序出站之后才允许拆卡，汇报过的工序拆卡出来不需要显示 增加生产订单 复制功能； 流转卡添加复制功能 工艺路线 增加 上一行 下一行 刷新流水号 按钮功能， 可以调整 工序上下次序； 以及重新刷新流水号
---
WebAPI/WebAPI.csproj | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5f317b8..d4467a4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -65,6 +65,10 @@
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
+ <Reference Include="Kingdee.BOS.WebApi.Client, Version=7.2.904.6, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>C:\Users\37327\Desktop\Kingdee.BOS.WebApi.Client.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Azure.AppService.ApiApps.Service, Version=0.9.16.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.AppService.ApiApps.Service.0.9.16\lib\net45\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath>
<Private>True</Private>
@@ -77,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">
@@ -272,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>
@@ -391,6 +399,10 @@
<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" />
<Compile Include="Controllers\Gy_StdMinPickQtyController.cs" />
@@ -465,6 +477,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" />
@@ -612,6 +625,7 @@
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\Gy_UserCustomer.cs" />
<Compile Include="Models\Gy_UserMater.cs" />
+ <Compile Include="Models\Gy_UserProcess.cs" />
<Compile Include="Models\Gy_UserUser.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
@@ -922,6 +936,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\" />
@@ -975,6 +990,10 @@
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
<Folder Include="Views\Sc_MouldScrapRequestBill\" />
<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\" />
@@ -1026,10 +1045,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://192.168.63.7/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.63.7/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.63.3/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1