MES-WEB-API.git

			@@ -4028,7 +4028,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.Message = "åæ®å·ï¼" + HBillNo + " ä¿åæåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -4045,7 +4045,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çæçäº§ç»æåå¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "çæåæ®å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -6956,6 +6956,56 @@

			#endregion

			#region çäº§ç»æåæ¨¡å æ«æç®±ï¼æï¼æ¡ç 20250630

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æç®±ï¼æï¼æ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json")]
			[HttpGet]
			public object get_PackBarCode_PackUnionBill_New_Json(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç åçéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºåä¸ªæ¡ç

			/// <summary>
			@@ -6990,6 +7040,76 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºæ¡ç 20250630

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_BarCode_PackUnionBill_New_Json")]
			[HttpGet]
			public object get_BarCode_PackUnionBill_New_Json(string HBarCode, Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HMaterNumber_Pack, string HMaker, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sMaterialCtl = "Y"; //ç»ææ¶ææ¡ç å¯¹åºç©æä¸éè¦ç»æçæ¡ç å¯¹åºç©æè¦ä¸è´ï¼Yä¸ºéä¸è´ï¼
			string sSourceBillTypeCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåç±»åæ§å¶ï¼Yä¸ºæ§å¶ï¼
			string sSourceBillNoCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåæ§å¶ï¼Yä¸ºæ§å¶ï¼
			sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
			sSourceBillTypeCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillTypeCtl.ToUpper();
			sSourceBillNoCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillNoCtl.ToUpper();

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç åçéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -7064,7 +7184,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -7324,6 +7444,112 @@

			#endregion

			#region æç®±ï¼ææï¼æ¨¡å æ«æææ¡ç 20250702

			/// <summary>
			///æç®±ï¼ææï¼æ¨¡å æ«æææ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_UnPackUnionBill_Json")]
			[HttpGet]
			public object Get_PackBarCode_UnPackUnionBill_Json(string HBarCode_Pack, string HBillSubType)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_UnPackUnionBill_New '" + HBarCode_Pack + "','" + HBillSubType + "'", "h_p_WMS_AddPackBarCode_UnPackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç å¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 0)
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æç®±ï¼ææï¼æ¨¡åï¼è·åç®±ï¼æï¼æ¡ç ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æç®±ï¼ææï¼æ¨¡å ä¸ä¼ å é¤ç»æåä¿¡æ¯ 20250702

			/// <summary>
			/// ä¸ä¼ å é¤ç»æåä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveUnPackUnionBill_Json")]
			[HttpGet]
			public object set_SaveUnPackUnionBill_Json(long HInterID, string HBillNo, string HBarCode_Pack, string HMaker)
			{
			try
			{
			string WorkList = "åæ®å·ï¼"+@HBillNo+ "ï¼å¯¹åºç®±ï¼æï¼æ¡ç ï¼" + @HBarCode_Pack+ "ï¼æç®±ï¼ææï¼æåï¼";
			string SystemName = "WMS-æç®±ï¼ææï¼æ¨¡å";
			oCn.BeginTran();
			//å é¤ç»æåè®°å½
			oCn.RunProc("Delete from Sc_PackUnionBillMain where HInterID=" + HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
			oCn.RunProc("Delete from Sc_PackUnionBillSub where HInterID=" + HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
			//åå¡«æ¡ç æ¡£æ¡ææ¡ç æ°é
			oCn.RunProc("Update Gy_BarCodeBill Set HQty=0 where HBarCodeType='æçæ¡ç ' and HBarCode='" + HBarCode_Pack+"'", ref DBUtility.ClsPub.sExeReturnInfo);
			//åå¥æ¥å¿
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','æç®±ï¼ææï¼')"
			);
			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æ¡ç ï¼" + HBarCode_Pack + " æç®±ï¼ææï¼æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æç®±ï¼ææï¼å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion