MES-WEB-API.git

			@@ -1454,7 +1454,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			if(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -2642,7 +2642,7 @@
			TopRowCount = 0,
			StartRow = 0,
			Limit = 0
			};;
			}; ;
			var _result = InvokeHelper.Query(sFormId, JsonConvert.SerializeObject(sJson));
			var _saveObj = JArray.Parse(_result);

			@@ -5295,7 +5295,7 @@
			try
			{

			DataSet ds=oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where æ æ¿ç ='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
			DataSet ds = oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where æ æ¿ç ='{HBarCode_Pack}'", "h_v_get_PackUnionBill");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -5540,7 +5540,7 @@
			{

			//å é¤åæ§å¶=========================================
			DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString() , "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");
			DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString(), "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");

			if (dds == null)
			{
			@@ -7856,7 +7856,7 @@

			#region ç³»ç»åæ°è·å
			//çäº§é¢æå-åè¿ååºæ§å¶
			if (HBillType == "1204"
			if (HBillType == "1204"
			&& oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "3"))
			@@ -8671,7 +8671,7 @@
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
			ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -8815,7 +8815,7 @@
			#endregion

			#region çäº§ç»æåæ¨¡å æ«æå®¢æ·ç®±ï¼æï¼æ¡ç -å¯è´è£ç®±å 20251103


			[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
			[HttpGet]
			public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
			@@ -9303,9 +9303,9 @@
			#region æ ¹æ®snç å¯»æ¾å¯¹åºçä¸ç®±ç
			[Route("WEBSController/getMiddleCodeBySn")]
			[HttpGet]
			public object getMiddleCodeBySn(string HBarCode,int HStockOrgID)
			public object getMiddleCodeBySn(string HBarCode, int HStockOrgID)
			{
			DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='"+ HBarCode + "'", "Gy_CaseCodeRelation");
			DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='" + HBarCode + "'", "Gy_CaseCodeRelation");

			if (dss.Tables[0].Rows[0]["HCaseCode"].ToString() == "" \|\| dss == null)
			{
			@@ -13874,11 +13874,11 @@
			/// <returns></returns>
			[Route("WEBSController/BindCarAndWH")]
			[HttpGet]
			public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID,int bindsignal)
			public object BindCarAndWH(string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID, int bindsignal)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString()+","+ bindsignal, "h_p_bindingCarintoWh");
			ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker + "'," + HStockOrgID.ToString() + "," + bindsignal, "h_p_bindingCarintoWh");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -13922,7 +13922,7 @@
			// è½¬ç§»æ¨¡å
			[Route("WEBSController/CheckHW")]
			[HttpGet]
			public object CheckHW(int HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
			public object CheckHW(int HWhID, int HSPID, int HWhID2, int HSPID2, string HBarCode, string HCarBarCode1, string HCarBarCode2, string UserID)
			{
			try
			{
			@@ -13971,7 +13971,7 @@
			[HttpGet]
			public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{


			try
			{
			WebSoBar = null;
			@@ -13983,7 +13983,7 @@
			List<string> HBillNoList = new List<string>();
			foreach (DataRow row in ds.Tables[0].Rows)
			{
			if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())){
			if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())) {
			// 2. å¤æåæ®å®¡æ ¸ç¶æï¼æ¥æ¾æªè¢«å®¡æ ¸çåæ®
			WebSoBar = oWebs.get_BillBarCode_BillCheck(row["HBillNo"].ToString(), HBillType, row["HMaker"].ToString(), HStockOrgID, ref DBUtility.ClsPub.sErrInfo);

			@@ -14038,7 +14038,7 @@
			{
			try
			{


			string sql = $"exec [h_p_Sc_ICMOBillWorkQtyStatus_Save] {HInterID}";
			ds = oCn.RunProcReturn(sql, "[h_p_Sc_ICMOBillWorkQtyStatus_Save]");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -14081,14 +14081,14 @@
			#region æ£éªå æ«ææºå æ ¹æ®åæ®ç±»å æºåç±»å æºåå· è§£æå¹¶è¿åæ£éªé¡¹ç®
			[Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
			[HttpGet]
			public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode,string user)
			public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode, string user)
			{
			try
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);
			// åèå®¢æ·
			if(oSystemParameter.omodel.WMS_CampanyName == "åè")
			if (oSystemParameter.omodel.WMS_CampanyName == "åè")
			{
			HBarCode = HBarCode.Split('-')[0];
			}
			@@ -14126,7 +14126,7 @@
			@HEntryID={HEntryID}
			", "h_p_CheckBillBarCode_CheckItem");

			if(ds.Tables[0].Rows.Count == 0)
			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -14140,7 +14140,7 @@
			if (HBillType == 7507) // åæ®ç±»åæ¯æ«ä»¶æ£éªå æ¥æ¾åæ®æ¯å¦éå¤ï¼æ£éªæ¯å¦åæ ¼ï¼åæ®éå¤éè¦è¿åä¸åçç¶æ
			{
			var ds2 = oCn.RunProcReturn($"select top 1 * from QC_ProcessCheckBillMain where HMainSourceBillNo = '{HBarCode}' order by HDate desc", "QC_ProcessCheckBillMain");
			if(ds2.Tables[0].Rows.Count > 0)
			if (ds2.Tables[0].Rows.Count > 0)
			{
			if (ds2.Tables[0].Rows[0]["HCheckerResult"].ToString() == "true") // æ£éªåæ ¼æç¤ºæ¯å¦éè¦æ°å¢
			{
			@@ -14220,14 +14220,14 @@
			#endregion

			#region æ·»åº·æ ¹æ®å°è½¦æ¡ç æ¾åºç¸åºç©æ


			[Route("WEBSController/GetMaterIDByCarBarCode")]
			[HttpGet]
			public object GetMaterIDByCarBarCode(string CarBarCode)
			{
			try
			{
			ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and å°è½¦='" + CarBarCode.ToString() + "'" , "GetMaterMesByCarBarCode");
			ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and å°è½¦='" + CarBarCode.ToString() + "'", "GetMaterMesByCarBarCode");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -14304,5 +14304,224 @@
			}
			}
			#endregion

			#region è£ç®±è¿½æº¯

			#region [è£ç®±è¿½æº¯] æ«æSNæ¡ç
			[Route("WEBSController/get_SNBarCode_PackUnionCarryUp")]
			[HttpGet]
			public object get_SNBarCode_PackUnionCarryUp(string sHBarCode, int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
			{
			if (oWebs.get_SNBarCode_PackUnionCarryUp(sHBarCode, sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] æ«æç®±æ¡ç
			[Route("WEBSController/get_BarCode_PackUnionCarryUp")]
			[HttpGet]
			public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
			{
			var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (oBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = oBar;
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] è·åè¡¨ä½ç©æä¿¡æ¯
			[Route("WEBSController/GetBillEntry_TmpList_PackUnionCarryUp")]
			[HttpGet]
			public object GetBillEntry_TmpList_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, int HStockOrgID)
			{
			DataSet oDs = oWebs.GetBillEntry_TmpList_PackUnionCarryUp(sInterID, sBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
			if (oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] å é¤
			[Route("WEBSController/set_DelPackUnionBill_Temp_Pack")]
			[HttpGet]
			public object set_DelPackUnionBill_Temp_Pack(int HInterID)
			{
			if (oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] ä¸ä¼ çå
			[Route("WEBSController/set_SavePackUnionCarryUpBill")]
			[HttpPost]
			public object set_SavePackUnionCarryUpBill(string ModRightNamePackUnionCarryUp, int sInterID,
			string HBillType, string sBillNo, string sHBarCode_Pack,
			string sMaker, int HStockOrgID)
			{
			if (!oWebs.CheckModRight(ModRightNamePackUnionCarryUp, DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sErrInfo))
			{
			// é´æ
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "é´æå¤±è´¥ï¼è¯¥ç¨æ·æ æéä¸ä¼ åæ®! "; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if(oWebs.set_SavePackUnionCarryUpBill_New(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "çæçäº§è£ç®±è¿½æº¯åæåï¼åæ®å·ä¸ºï¼" + sBillNo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çæå¤±è´¥ï¼åå :" + DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] ç¼è¾ç¼ååè¡¨åæ®
			[Route("WEBSController/TempList_Modify_Pack")]
			[HttpGet]
			public object TempList_Modify_Pack(Int64 HInterID, string HBillNo, string HBillType)
			{
			if(oWebs.TempList_Modify_Pack(HInterID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			// æå (æ å·²ä¸ä¼ è®°å½)
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;

			}
			else
			{
			// å¤±è´¥
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] è·åç¼ååè¡¨
			[Route("WEBSController/GetSc_PackUnionBill_TempList_Pack")]
			[HttpGet]
			public object GetSc_PackUnionBill_TempList(string HBillType, string HMaker, Int64 HStockOrgID)
			{
			DataSet oDs = oWebs.GetSc_PackUnionBill_TempList(HBillType, HMaker, HStockOrgID);
			if(oDs == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] å é¤ç¼ååè¡¨åæ®
			[Route("WEBSController/DeleteTemp_PackUnionBill_Pack")]
			[HttpGet]
			public object DeleteTemp_PackUnionBill_Pack(Int64 HInterID)
			{
			if(oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
			{
			// å é¤æå
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;

			}
			else
			{
			// å é¤å¤±è´¥
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#endregion
			}
			}