MES-WEB-API.git

			@@ -82,6 +82,8 @@
			{
			try
			{

			var sJXCode = POStockInBillController.JX_Json(sCode, HOWNERID);
			//if (sRedBlue == true)
			//{
			// HBillType = "1239";
			@@ -90,7 +92,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			string sExpressNumber = "";
			WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			//WebSoBar = oWebs.get_ba(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			@@ -173,10 +175,12 @@

			[Route("kf_PoStockInBill/JX_Json")]
			[HttpGet]
			public Object JX_Json(string sBarCodeNew, Int64 HOrgID)
			public static string JX_Json(string sBarCodeNew, Int64 HOrgID)
			{
			try
			{
			//加了生产日期有效期至保质期标志

			string[] sArray = sBarCodeNew.Split('@');
			string HMaterNumber = "";
			HMaterNumber = sArray[0];
			@@ -184,6 +188,10 @@
			HQty = ClsPub.isInt(sArray[4]);
			string HBarchNo = "";
			HBarchNo = sArray[6];

			DateTime HSCRQ = ClsPub.isDate(sArray[3]);
			DateTime HYXQZ = ClsPub.isDate(sArray[5]);


			Int64 HMaterID = 0;

			@@ -202,40 +210,41 @@
			string HTM = "";
			HTM = HOrgNumber + HMaterID + HBarchNo;
			string ModName = "85";
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
			var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
			Int64 HSupID = 0;
			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
			",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
			") values ("
			+ "'" + HTM + "','批次条码'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
			+ ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
			+ ", 0,0,'','',0"
			+ ", 0,'',0,0,0,''"
			+ ",0,'','','',getdate()"
			+ ",0,'',''," + HSCRQ.ToShortDateString() + "," + HYXQZ.ToShortDateString() + ",'',getdate()"
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
			+ ",0,0,0"
			+ ",'" + HMaterName + "','" + HMaterModel + "','',0,'','')");
			+ ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");


			string sExpressNumber = "";
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = HTM;
			return objJsonResult;
			//objJsonResult.code = "0";
			//objJsonResult.count = 1;
			//objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			//objJsonResult.data = ;
			return HTM;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = e.Message + ";" + e.StackTrace;
			objJsonResult.data = null;
			return objJsonResult;
			//objJsonResult.code = "0";
			//objJsonResult.count = 1;
			//objJsonResult.Message = e.Message + ";" + e.StackTrace;
			//objJsonResult.data = null;
			return e.Message + ";" + e.StackTrace;
			}

			}