~yxj/MES-WEB-API.git

			@@ -1073,7 +1073,7 @@
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag,HSeOrderSEQ " +
			",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			@@ -1082,7 +1082,7 @@
			+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
			+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString()
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString() + "," + HSourceEntryID.ToString()
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");

			@@ -832,23 +832,26 @@
			}
			}


			/// <summary>
			/// è·åä¾åºååè¡¨
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetSupplierList_Json")]
			[HttpGet]
			public object GetSupplierList_Json(string Supplier)
			public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
			{
			sWhere = " Where HStopFlag=0 and HEndFlag=1";
			sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (Supplier != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' ) ";
			sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
			}
			try
			{
			ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			WebS.WebService1 oWeb = new WebS.WebService1();
			ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			//ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";

	WarM/条码打印/Gy_BarCodeBill.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/WebAPIController.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史