From ffbcbb6ac13d3e700e51ea37063c9a5f4a8a3455 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期二, 16 一月 2024 16:15:17 +0800 Subject: [PATCH] 1.收料通知单编辑功能完善, 保存方法中,增加 反写关联数量至 采购订单的 存储过程增加超过关闭,反关闭 2.首件检验单保存方法,增加 调用 保存前控制 h_p_QC_FirstPieceCheckBill_BeforeSaveCtrl 和保存后控制 h_p_QC_FirstPieceCheckBill_AfterSaveCtrl的 存储过程。 巡检单保存方法,增加 调用 保存前控制 h_p_QC_PatrolProcCheckBill_BeforeSaveCtrl 和保存后控制 h_p_QC_PatrolProcCheckBill_AfterSaveCtrl的 存储过程。 工序检验单保存方法,增加 调用 保存前控制 h_p_QC_ProcessCheckBill_BeforeSaveCtrl 和保存后控制 h_p_QC_ProcessCheckBill_AfterSaveCtrl的 存储过程。设备保养记录单保存方法,增加 调用 保存前控制 h_p_Sb_EquipMaintainBill_BeforeSaveCtrl 和保存后控制 h_p_Sb_EquipMaintainBill_AfterSaveCtrl的 存储过程。 设备点检记录单保存方法,增加 调用 保存前控制 h_p_Sb_EquipDotCheckBill_BeforeSaveCtrl 和保存后控制 h_p_Sb_EquipDotCheckBill_AfterSaveCtrl的 存储过程。 设备故障登记单保存方法,增加 调用 保存前控制 h_p_Sb_EquipConkBookBill_BeforeSaveCtrl 和保存后控制 h_p_Sb_EquipConkBookBill_AfterSaveCtrl的 存储过程。 设备维修记录单保存方法,增加 调用 保存前控制 h_p_Sb_EquipRepairWorkBill_BeforeSaveCtrl 和保存后控制 h_p_Sb_EquipRepairWorkBill_AfterSaveCtrl的 存储过程。 --- WebAPI/WebAPI.csproj | 64 +++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 2 deletions(-) diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 3c25b9a..17bdd52 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -380,10 +380,13 @@ <Compile Include="Controllers\BLL\Xt_UserController.cs" /> <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" /> <Compile Include="Controllers\CellWidthController.cs" /> + <Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" /> <Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" /> <Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" /> + <Compile Include="Controllers\CGGL\Sup_AskPriceBillController.cs" /> + <Compile Include="Controllers\CGGL\Sup_QuotePriceBillController.cs" /> <Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" /> @@ -402,7 +405,9 @@ <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_ProcExchWWSendWorkBillController.cs" /> <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" /> + <Compile Include="Controllers\CJGL\Cj_SingleStationController.cs" /> <Compile Include="Controllers\Gy_MateMouldController.cs" /> <Compile Include="Controllers\Gy_StdMinPickQtyController.cs" /> <Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" /> @@ -410,6 +415,7 @@ <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_EquipConkBookBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" /> @@ -417,7 +423,10 @@ <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\Gy_SourceWorkStationSetController.cs" /> <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" /> + <Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" /> + <Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" /> <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" /> @@ -458,7 +467,16 @@ <Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\Sc_ProcessReportController.cs" /> + <Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" /> + <Compile Include="Controllers\XSGL\Xs_ExceptiveCheckRequestBillController.cs" /> + <Compile Include="Controllers\XSGL\Xs_CusRatingChangeBillController.cs" /> + <Compile Include="Controllers\CGGL\YF_PayMentBackBillController.cs" /> + <Compile Include="Controllers\CGGL\YF_PayMentBillController.cs" /> + <Compile Include="Controllers\XSGL\YS_ReceiveBackBillController.cs" /> + <Compile Include="Controllers\XSGL\YS_ReceiveBillController.cs" /> + <Compile Include="Controllers\XSGL\Kf_SellOutBillController.cs" /> <Compile Include="Controllers\浜轰簨绠$悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillController.cs" /> + <Compile Include="Controllers\浜轰簨绠$悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillController.cs" /> <Compile Include="Controllers\浜轰簨绠$悊\绂昏亴鐢宠\HR_EmpDimissionBillController.cs" /> <Compile Include="Controllers\浜轰簨绠$悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\濮斿鐢ㄦ枡\WW_PPBomBillController.cs" /> @@ -473,8 +491,15 @@ <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\apiController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StockOutRequestBillController.cs" /> + <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_MateOutRequestBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" /> <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_TmpController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBillController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\瀹㈣瘔澶勭悊鍗昞Crm_CustomerAppealBillController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDAController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" /> @@ -484,6 +509,9 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SettleStyleController.cs" /> @@ -501,7 +529,11 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OutApplyBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OverApplyBillController.cs" /> + <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PayMentBillController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_SalaryCalculateController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_DuSubsidyItemBillController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_ErrWorkTimesRequestBillController.cs" /> @@ -567,6 +599,7 @@ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" /> + <Compile Include="Controllers\搴旀敹绠$悊\YS_ReceiveReportController.cs" /> <Compile Include="Controllers\鏉$爜绠$悊\WEBSController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" /> @@ -576,14 +609,34 @@ <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESStopStepWorkBillController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_QualityReportStepBillController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" /> + <Compile Include="Controllers\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_ProductReportController.cs" /> <Compile Include="Controllers\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillController.cs" /> + <Compile Include="Controllers\椤圭洰绠$悊\宸ヤ綔鍛ㄨ鍒抃PM_WorkTaskWeekBillController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBillController.cs" /> + <Compile Include="Controllers\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ReportController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\椤圭洰闃舵\Gy_ProjectStageController.cs" /> <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> + <Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" /> + <Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" /> + <Compile Include="DLL\ClsGy_PoStockStyle_Ctl.cs" /> + <Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" /> + <Compile Include="DLL\ClsGy_CusType_Ctl.cs" /> + <Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" /> + <Compile Include="DLL\ClsGy_SupType_Ctl.cs" /> + <Compile Include="DLL\ClsGy_SellStyle_Ctl.cs" /> + <Compile Include="DLL\ClsGy_PostSkill_Ctl.cs" /> + <Compile Include="DLL\ClsGy_StockOutStyle_Ctl.cs" /> + <Compile Include="DLL\ClsGy_StockInStyle_Ctl.cs" /> + <Compile Include="DLL\ClsGy_StockMoveStyle_Ctl.cs" /> + <Compile Include="DLL\ClsGy_Post_Ctl.cs" /> + <Compile Include="DLL\ClsGy_QualityStd_Ctl.cs" /> + <Compile Include="DLL\ClsGy_InspectMethod_Ctl.cs" /> + <Compile Include="DLL\ClsGy_InspectValue_Ctl.cs" /> + <Compile Include="DLL\ClsGy_BadResult_Ctl.cs" /> <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" /> <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" /> <Compile Include="DLL\ClsGy_EquipFileMain.cs" /> @@ -682,6 +735,7 @@ <Compile Include="Models\鍩虹璧勬枡\ConkType.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_TemporaryArea.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" /> <Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" /> <Compile Include="Models\鍩虹璧勬枡\PackType.cs" /> @@ -940,6 +994,7 @@ <Folder Include="Views\Cj_CallGoodsBillMain\" /> <Folder Include="Views\Cj_ComplementGoodsBill\" /> <Folder Include="Views\Cj_SendGoodsBill\" /> + <Folder Include="Views\Cj_SingleStation\" /> <Folder Include="Views\Gy_BarCodeBill_Out\" /> <Folder Include="Views\Gy_COMMONCONTACTBill\" /> <Folder Include="Views\Gy_ConkType\" /> @@ -960,6 +1015,7 @@ <Folder Include="Views\Gy_RoutingGroup\" /> <Folder Include="Views\Gy_SettleStyle\" /> <Folder Include="Views\Gy_SOPBill\" /> + <Folder Include="Views\Gy_SourceWorkStationSet\" /> <Folder Include="Views\Gy_SplitBarCode\" /> <Folder Include="Views\Gy_Staff\" /> <Folder Include="Views\Gy_StdMinPickQty\" /> @@ -988,6 +1044,7 @@ <Folder Include="Views\ProductionPlanReport\" /> <Folder Include="Views\ProductionReturnBill\" /> <Folder Include="Views\QC_Management\" /> + <Folder Include="Views\QC_PatrolProcCheckBill\" /> <Folder Include="Views\Sb_EquipRepairSendWorkBill\" /> <Folder Include="Views\Sb_EquipSparepartsBill\" /> <Folder Include="Views\Sb_EquipSparepartsChangeBill\" /> @@ -1009,9 +1066,12 @@ <Folder Include="Views\Sc_ProcessSendWork\" /> <Folder Include="Views\Sc_ProcExchRecordBackBill\" /> <Folder Include="Views\Sc_ProcExchSendWorkBill\" /> + <Folder Include="Views\Sc_ProcExchWWSendWorkBill\" /> <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" /> <Folder Include="Views\Sc_WorkBillSortBill\" /> <Folder Include="Views\Sc_WorkDemandPlanBill\" /> + <Folder Include="Views\Sup_AskPriceBill\" /> + <Folder Include="Views\Sup_QuotePriceBill\" /> <Folder Include="Views\Xt_BillSubType\" /> <Folder Include="Views\Xt_CheckFlowBill\" /> <Folder Include="Views\Xt_CheckItem\" /> @@ -1060,10 +1120,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx"> + <WebReferenceUrl Include="http://192.168.63.20/WEBS-WMS/WebService1.asmx"> <UrlBehavior>Dynamic</UrlBehavior> <RelPath>Web References\WebS\</RelPath> - <UpdateFromURL>http://192.168.63.3/WEBS-WMS/WebService1.asmx</UpdateFromURL> + <UpdateFromURL>http://192.168.63.20/WEBS-WMS/WebService1.asmx</UpdateFromURL> <ServiceLocationURL> </ServiceLocationURL> <CachedDynamicPropName> -- Gitblit v1.9.1