MES-WEB-API.git

parent: d489bd90 | 补丁 | 提交 | ignore whitespace

duhe

2024-08-19 2b2034300fc709f3eda43c14fe700bb6b8707e5d

乔一进站单、出站单：数量控制

2个文件已修改

	WebAPI/Controllers/CJGL/Cj_StationInBillController.cs	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -343,35 +343,35 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                
                //ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                //if (ds == null)
                //{
                //    oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "判断数量失败！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (ds.Tables[0].Rows.Count == 0)
                //{
                //    oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "判断数量失败！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
                //{
                //    oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                if (ds == null)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "判断数量失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "判断数量失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
                //判断是否是 首道工序
                ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a  " +

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -466,36 +466,36 @@
                //主表

                //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;
                //}
                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 + "");
                LogService.Write($"6.1，用时" + sw.Elapsed);

			@@ -343,35 +343,35 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			//ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
			//if (ds == null)
			//{
			// oCN.RollBack();
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "判断数量失败！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//if (ds.Tables[0].Rows.Count == 0)
			//{
			// oCN.RollBack();
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "判断数量失败！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
			//{
			// oCN.RollBack();
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
			if (ds == null)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "判断数量失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "判断数量失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
			//判断是否是首道工序
			ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +

			@@ -466,36 +466,36 @@
			//主表

			//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;
			//}
			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 + "");
			LogService.Write($"6.1，用时" + sw.Elapsed);