| Model/生产管理/ClsSc_QualityReportBillSub.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Model/Éú²ú¹ÜÀí/ClsSc_QualityReportBillSub.cs
@@ -27,5 +27,6 @@ public DateTime HMakeDate; public double HQty; //æ°é public string HResult; //å¤æç»æ public int HGroupID;//çç» } } WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -460,45 +460,45 @@ } //主表 LogService.Write($"5.ç³»ç»æ§å¶æ¥è¯¢å¤æï¼ç¨æ¶" + sw.Elapsed); ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl"); if (ds == null) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å¤ææ°é失败ï¼"; objJsonResult.data = null; return objJsonResult; } LogService.Write($"5.1ï¼ç¨æ¶" + sw.Elapsed); if (ds.Tables[0].Rows.Count == 0) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å¤ææ°é失败ï¼"; objJsonResult.data = null; return objJsonResult; } LogService.Write($"5.2ï¼ç¨æ¶" + sw.Elapsed); if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ°éæ§å¶," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); objJsonResult.data = null; return objJsonResult; } //LogService.Write($"5.ç³»ç»æ§å¶æ¥è¯¢å¤æï¼ç¨æ¶" + sw.Elapsed); //ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl"); //if (ds == null) //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "å¤ææ°é失败ï¼"; // objJsonResult.data = null; // return objJsonResult; //} //LogService.Write($"5.1ï¼ç¨æ¶" + sw.Elapsed); //if (ds.Tables[0].Rows.Count == 0) //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "å¤ææ°é失败ï¼"; // objJsonResult.data = null; // return objJsonResult; //} //LogService.Write($"5.2ï¼ç¨æ¶" + sw.Elapsed); //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "æ°éæ§å¶," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); // objJsonResult.data = null; // return objJsonResult; //} LogService.Write($"6.å¤æç»æï¼ç¨æ¶" + sw.Elapsed); oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + ""); oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + "," + num + ""); LogService.Write($"6.1ï¼ç¨æ¶" + sw.Elapsed); oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " "); LogService.Write($"6.2ï¼ç¨æ¶" + sw.Elapsed); oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " "); LogService.Write($"7.åå¨è¿ç¨ç»æï¼ç¨æ¶" + sw.Elapsed); //å¤ææ¯å¦æ¯ æ«éå·¥åº //å¤ææ¯å¦æ¯ æ«éå·¥åº ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " + " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " + " Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain"); WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs
@@ -631,7 +631,7 @@ #region æ交ä¿åï¼å主å表åæç»è¡¨ [Route("Sc_QualityReportBill/set_SaveBill")] [HttpGet] public object set_SaveBill(long HInterID,string HBillNo, string HChecker,string HBadReasonHQty) public object set_SaveBill(long HInterID,string HBillNo, string HChecker) { try { @@ -658,8 +658,18 @@ return objJsonResult; } //========================================================= //ä¿å oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID+",'"+ HBadReasonHQty +"'"); //ä¿å æ¹éä¿åå çå表æ¯å¦ææ°æ®,ææ°æ®å°±è¿ åå ¥ä¸»è¡¨ æç»è¡¨ 没æå°±åå¨ä¸»åæç»è¡¨ string sql = "select * from Sc_QualityReportBillSub where HInterID = '" + HInterID + "'"; ds = oCN.RunProcReturn(sql, "Sc_QualityReportBillSub"); if (ds.Tables[0].Rows.Count>0) { oCN.RunProc("exec h_p_save_Sc_QualityReportBillSum " + HInterID + ""); } else { oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID + ""); } //å¤ææ¯å¦å 许ä¿åï¼ä¸å 许ååæ» ds = oCN.RunProcReturn("exec h_p_JIT_ICMOBillQualityStatus_SaveCtrl", "h_p_JIT_ICMOBillQualityStatus_SaveCtrl"); if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") @@ -780,7 +790,7 @@ string subSql = "Insert into Sc_QualityReportBillSub " + " (HInterID,HEntryID,HBillNo_bak,HRemark" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" + ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID,HBadReasonNumber,HGroupID" + ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" + ",HBarCode,HReportType" + ",HAddr,HMaker,HMakeDate" + @@ -803,6 +813,8 @@ "," + oSub.HEmpID.ToString() + "" + "," + oSub.HSourceID.ToString() + "" + "," + oSub.HBadReasonID.ToString() + "" + ",'" + oSub.HBadReasonNumber.ToString() + "'" + ",'" + oSub.HGroupID.ToString() + "'" + "," + oSub.HICMOInterID.ToString() + "" + "," + oSub.HICMOEntryID.ToString() + "" + @@ -810,9 +822,9 @@ "," + oSub.HProcExchInterID + "" + "," + oSub.HProcExchEntryID + "" + ",'" + oSub.HProcExchBillNo + "'" + ",'" + oSub.HBarCode + "'" + ",'" + oSub.HBadReasonNumber.ToString() + "'" + ",'" + 3 + ",'" + 1 + "','" + oSub.HAddr + "'" + ",'" + msg4 + "'" + ",'" + oSub.HMakeDate.ToShortDateString() + "'" + WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
@@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\ç½ç«åå¸\æºäºMESWMS\API</_PublishTargetUrl> <History>True|2024-07-02T00:52:20.9683250Z;True|2024-07-01T15:34:19.0810024+08:00;True|2024-07-01T15:29:41.8587401+08:00;True|2024-07-01T15:06:46.7127992+08:00;True|2024-07-01T14:45:31.0703303+08:00;True|2024-07-01T14:13:18.0986061+08:00;True|2024-07-01T14:11:15.8643251+08:00;True|2024-07-01T13:29:59.6069813+08:00;True|2024-07-01T11:12:59.9147877+08:00;True|2024-07-01T10:22:37.9929084+08:00;True|2024-07-01T10:20:59.0844221+08:00;True|2024-07-01T10:17:38.9582335+08:00;True|2024-07-01T10:09:18.2084318+08:00;True|2024-07-01T10:08:49.4427785+08:00;True|2024-07-01T10:05:38.5373813+08:00;True|2024-07-01T09:47:53.4738455+08:00;</History> <History>True|2024-07-02T09:25:00.7598414Z;True|2024-07-02T16:28:16.3173719+08:00;True|2024-07-02T15:30:13.0080212+08:00;True|2024-07-02T15:24:33.5742376+08:00;True|2024-07-02T15:20:38.4269558+08:00;True|2024-07-02T15:17:35.2560555+08:00;True|2024-07-02T15:04:07.6778856+08:00;True|2024-07-02T14:52:23.2500105+08:00;True|2024-07-02T14:44:10.5580566+08:00;True|2024-07-02T09:10:05.9974988+08:00;True|2024-07-02T08:52:20.9683250+08:00;True|2024-07-01T15:34:19.0810024+08:00;True|2024-07-01T15:29:41.8587401+08:00;True|2024-07-01T15:06:46.7127992+08:00;True|2024-07-01T14:45:31.0703303+08:00;True|2024-07-01T14:13:18.0986061+08:00;True|2024-07-01T14:11:15.8643251+08:00;True|2024-07-01T13:29:59.6069813+08:00;True|2024-07-01T11:12:59.9147877+08:00;True|2024-07-01T10:22:37.9929084+08:00;True|2024-07-01T10:20:59.0844221+08:00;True|2024-07-01T10:17:38.9582335+08:00;True|2024-07-01T10:09:18.2084318+08:00;True|2024-07-01T10:08:49.4427785+08:00;True|2024-07-01T10:05:38.5373813+08:00;True|2024-07-01T09:47:53.4738455+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> @@ -21,28 +21,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>07/02/2024 08:52:03</publishTime> <publishTime>07/02/2024 17:24:51</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>07/02/2024 08:52:03</publishTime> <publishTime>07/02/2024 17:24:51</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>07/02/2024 08:52:01</publishTime> <publishTime>07/02/2024 17:24:50</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>07/02/2024 08:52:01</publishTime> <publishTime>07/02/2024 17:24:50</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>07/02/2024 08:51:59</publishTime> <publishTime>07/02/2024 17:24:47</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>07/02/2024 08:51:59</publishTime> <publishTime>07/02/2024 17:24:47</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -87,10 +87,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>07/02/2024 08:51:59</publishTime> <publishTime>07/02/2024 17:24:48</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>07/02/2024 08:51:59</publishTime> <publishTime>07/02/2024 17:24:48</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>05/25/2024 09:46:41</publishTime> @@ -123,25 +123,25 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>07/02/2024 08:51:57</publishTime> <publishTime>07/02/2024 17:24:46</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>07/02/2024 08:51:57</publishTime> <publishTime>07/02/2024 17:24:46</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>07/02/2024 08:51:57</publishTime> <publishTime>07/02/2024 17:24:47</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>07/02/2024 08:51:57</publishTime> <publishTime>07/02/2024 17:24:47</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>07/02/2024 08:51:58</publishTime> <publishTime>07/02/2024 17:24:47</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>07/02/2024 08:51:58</publishTime> <publishTime>07/02/2024 17:24:47</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> @@ -255,10 +255,10 @@ <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>07/02/2024 08:52:11</publishTime> <publishTime>07/02/2024 17:24:55</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>07/02/2024 08:52:11</publishTime> <publishTime>07/02/2024 17:24:55</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -453,7 +453,7 @@ <publishTime>05/25/2024 09:46:41</publishTime> </File> <File Include="Web.config"> <publishTime>07/02/2024 08:52:20</publishTime> <publishTime>07/02/2024 17:24:59</publishTime> </File> </ItemGroup> </Project>
