From b51ed3cea777b1809afe07db7314b0e0a8c0e9b8 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期三, 22 二月 2023 11:15:25 +0800 Subject: [PATCH] 工序出站-保存屏蔽包装标识,员工同步更改 --- WebAPI/WebAPI.csproj | 156 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 132 insertions(+), 24 deletions(-) diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index d3e9070..eaecc16 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> @@ -90,6 +94,9 @@ </Reference> <Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL"> <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath> + </Reference> + <Reference Include="RestSharp, Version=104.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\RestSharp.104.0\lib\net4\RestSharp.dll</HintPath> </Reference> <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL"> <HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath> @@ -189,6 +196,7 @@ <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml"> <Private>True</Private> </Reference> @@ -298,16 +306,16 @@ <Content Include="Web References\WebS\ClsGy_Warehouse_Model.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> - <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource"> - <DependentUpon>Reference.map</DependentUpon> - </Content> <Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource"> <DependentUpon>Reference.map</DependentUpon> </Content> - <None Include="Web References\WebS\Reference.map"> + <Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource"> + <DependentUpon>Reference.map</DependentUpon> + </Content> + <Content Include="Web References\WebS\Reference.map"> <Generator>MSDiscoCodeGenerator</Generator> - <LastGenOutput>Reference1.cs</LastGenOutput> - </None> + <LastGenOutput>Reference.cs</LastGenOutput> + </Content> <None Include="Web References\WebS\WebService1.disco" /> <Content Include="Web.config"> <SubType>Designer</SubType> @@ -320,6 +328,10 @@ <Compile Include="App_Start\SwaggerConfig.cs" /> <Compile Include="App_Start\WebApiConfig.cs" /> <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" /> <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" /> <Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" /> <Compile Include="Controllers\BaseSet\Gy_TechnologyParUnitController.cs" /> @@ -357,6 +369,7 @@ <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" /> <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" /> <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" /> + <Compile Include="Controllers\BLL\Xt_BillSubTypeController.cs" /> <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" /> <Compile Include="Controllers\BLL\Xt_UserGroupController.cs" /> <Compile Include="Controllers\BLL\Xt_XtgnbController.cs" /> @@ -384,6 +397,20 @@ <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" /> <Compile Include="Controllers\Gy_MateMouldController.cs" /> + <Compile Include="Controllers\Gy_StdMinPickQtyController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldLifeUseBillController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" /> + <Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" /> + <Compile Include="Controllers\Pay_ReportController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" /> + <Compile Include="Controllers\SBGL\SBTC\Sb_EquipStockInCheckBillController.cs" /> + <Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckSBillController.cs" /> + <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" /> + <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" /> @@ -428,14 +455,40 @@ <Compile Include="Controllers\浠撳瓨绠$悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill_OutController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鐢熸垚\KF_BarCodeStatusChangeBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\鏉$爜鐢熸垚\Sc_BarCodeController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\apiController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StockOutRequestBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" /> <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SettleStyleController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillEditController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillListController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StaffController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockPlace_Controller.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockStatusBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SupplierContactBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxMIXController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_MonthlySalaryReportController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PieceRateWageReportController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_ClassTimePrjBillController.cs" /> @@ -497,6 +550,7 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" /> + <Compile Include="Controllers\鏉$爜绠$悊\WEBSController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" /> @@ -556,9 +610,13 @@ <Compile Include="InvokeHelper.cs" /> <Compile Include="Log.cs" /> <Compile Include="Models\ClsGy_MateMould.cs" /> + <Compile Include="Models\ClsGy_SupMaterial.cs" /> <Compile Include="Models\ClsSc_AssemblyBillMain.cs" /> <Compile Include="Models\ClsSc_AssemblyBillSub.cs" /> <Compile Include="Models\Employee.cs" /> + <Compile Include="Models\Gy_UserCustomer.cs" /> + <Compile Include="Models\Gy_UserMater.cs" /> + <Compile Include="Models\Gy_UserUser.cs" /> <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" /> <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" /> <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" /> @@ -588,12 +646,23 @@ <Compile Include="Models\Sc_WorkBillSortBillSub.cs" /> <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" /> <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" /> + <Compile Include="Models\SOPBill.cs" /> + <Compile Include="Models\SOPBillSub.cs" /> <Compile Include="Models\TechnologyParameter.cs" /> <Compile Include="Models\TechnologyParameterUnit.cs" /> <Compile Include="Models\TechParamByProc.cs" /> + <Compile Include="Models\Xt_CheckFlowMain.cs" /> + <Compile Include="Models\Xt_CheckFlowSub.cs" /> + <Compile Include="Models\Xt_CheckItem.cs" /> <Compile Include="Models\鍏跺畠\ReciveBill_FastModel.cs" /> <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" /> + <Compile Include="Models\鍩虹璧勬枡\ConkType.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" /> + <Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" /> + <Compile Include="Models\鍩虹璧勬枡\PackType.cs" /> + <Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" /> <Compile Include="Models\宸ヨ祫绠$悊\ClsGy_ClassTimePrj_Model.cs" /> <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillEmp.cs" /> <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillMain.cs" /> @@ -779,11 +848,6 @@ <Compile Include="Service\YqnDal.cs" /> <Compile Include="Service\YqnQbService.cs" /> <Compile Include="Utility\Util.cs" /> - <Compile Include="Web References\WebS\Reference.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>Reference.map</DependentUpon> - </Compile> <Compile Include="Code\Common.cs" /> <Compile Include="Code\Test2.cs" /> <Compile Include="Code\TestDAL.cs" /> @@ -809,6 +873,11 @@ <Compile Include="Models\JsonResult.cs" /> <Compile Include="Models\Pensen.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Web References\WebS\Reference.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Reference.map</DependentUpon> + </Compile> <Compile Include="WebServer.cs" /> </ItemGroup> <ItemGroup> @@ -847,14 +916,38 @@ <Folder Include="Views\Cj_CallGoodsBillMain\" /> <Folder Include="Views\Cj_ComplementGoodsBill\" /> <Folder Include="Views\Cj_SendGoodsBill\" /> + <Folder Include="Views\Gy_BarCodeBill_Out\" /> + <Folder Include="Views\Gy_COMMONCONTACTBill\" /> + <Folder Include="Views\Gy_ConkType\" /> + <Folder Include="Views\Gy_CustLocation\" /> + <Folder Include="Views\Gy_DutyBill\" /> + <Folder Include="Views\Gy_EquipStatus\" /> <Folder Include="Views\Gy_EquipType\" /> <Folder Include="Views\Gy_ICBomBill\" /> <Folder Include="Views\Gy_MateMould\" /> + <Folder Include="Views\Gy_MatePriceSup\" /> + <Folder Include="Views\Gy_MouldStatus\" /> + <Folder Include="Views\Gy_Operator\" /> + <Folder Include="Views\Gy_PackType\" /> + <Folder Include="Views\Gy_PaymentConditionListBill\" /> + <Folder Include="Views\Gy_RateType\" /> + <Folder Include="Views\Gy_RecConditionBill\" /> <Folder Include="Views\Gy_RoutingGroup\" /> + <Folder Include="Views\Gy_SettleStyle\" /> + <Folder Include="Views\Gy_SOPBill\" /> + <Folder Include="Views\Gy_Staff\" /> + <Folder Include="Views\Gy_StdMinPickQty\" /> + <Folder Include="Views\Gy_StockPlace_\" /> + <Folder Include="Views\Gy_StockStatusBill\" /> + <Folder Include="Views\Gy_SupplierContactBill\" /> + <Folder Include="Views\Gy_TaxMIXMain\" /> + <Folder Include="Views\Gy_TaxRateBill\" /> <Folder Include="Views\Gy_WorkStation\" /> + <Folder Include="Views\Gy_Work\" /> <Folder Include="Views\JIT_DayPlanPlatFormBill\" /> <Folder Include="Views\JIT_DayPlanPlatFormImport\" /> <Folder Include="Views\JIT_ICMOSortBillList\" /> + <Folder Include="Views\KF_BarCodeStatusChangeBill\" /> <Folder Include="Views\KF_ICInventoryList_WMSBill\" /> <Folder Include="Views\Kf_ICStockBillMain\" /> <Folder Include="Views\Kf_ICStockInOutBill\" /> @@ -862,21 +955,36 @@ <Folder Include="Views\KF_PonderationBill\" /> <Folder Include="Views\kf_StepFoldinBill\" /> <Folder Include="Views\Kf_StepFoldOutBill\" /> + <Folder Include="Views\Kf_StockOutRequestBill\" /> <Folder Include="Views\Mes_OrderProcFlowAllReport\" /> <Folder Include="Views\MoveStockBill\" /> + <Folder Include="Views\Pay_Report\" /> <Folder Include="Views\ProductionPlanReport\" /> <Folder Include="Views\ProductionReturnBill\" /> <Folder Include="Views\QC_Management\" /> <Folder Include="Views\Sb_EquipRepairSendWorkBill\" /> + <Folder Include="Views\Sb_EquipSparepartsBill\" /> + <Folder Include="Views\Sb_EquipSparepartsChangeBill\" /> + <Folder Include="Views\Sb_EquipStatusChangeBill\" /> + <Folder Include="Views\Sb_EquipStockInCheckBill\" /> + <Folder Include="Views\Sb_EquipWorkBeforeCheckBill\" /> <Folder Include="Views\Sc_CallGoodsBackRequestBill\" /> <Folder Include="Views\Sc_ComplementGoodBill\" /> + <Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" /> <Folder Include="Views\Sc_ComplementGoods\" /> <Folder Include="Views\Sc_JIT_ComplementGoodBill\" /> + <Folder Include="Views\Sc_MouldDotCheckRuleBill\" /> + <Folder Include="Views\Sc_MouldLifeUseBill\" /> <Folder Include="Views\Sc_MouldRepairOutBill\" /> <Folder Include="Views\Sc_MouldRepairSendWorkBill\" /> + <Folder Include="Views\Sc_MouldScrapRequestBill\" /> + <Folder Include="Views\Sc_MouldStatusChangeBill\" /> <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" /> <Folder Include="Views\Sc_WorkBillSortBill\" /> <Folder Include="Views\Sc_WorkDemandPlanBill\" /> + <Folder Include="Views\Xt_BillSubType\" /> + <Folder Include="Views\Xt_CheckFlowBill\" /> + <Folder Include="Views\Xt_CheckItem\" /> <Folder Include="Views\Xt_grdAlignment_WMES\" /> </ItemGroup> <ItemGroup> @@ -890,19 +998,6 @@ <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> - </ItemGroup> - <ItemGroup> - <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx"> - <UrlBehavior>Dynamic</UrlBehavior> - <RelPath>Web References\WebS\</RelPath> - <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL> - <ServiceLocationURL> - </ServiceLocationURL> - <CachedDynamicPropName> - </CachedDynamicPropName> - <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName> - <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName> - </WebReferenceUrl> </ItemGroup> <ItemGroup> <ProjectReference Include="..\BLL\BLL.csproj"> @@ -934,6 +1029,19 @@ <Name>SQLHelper</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx"> + <UrlBehavior>Dynamic</UrlBehavior> + <RelPath>Web References\WebS\</RelPath> + <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL> + <ServiceLocationURL> + </ServiceLocationURL> + <CachedDynamicPropName> + </CachedDynamicPropName> + <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName> + <CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName> + </WebReferenceUrl> + </ItemGroup> <PropertyGroup> <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> -- Gitblit v1.9.1