MES-WEB-API.git

			@@ -1501,6 +1501,106 @@
			}
			#endregion

			#region æ¡ç åå¥æ¡ç ä¸»æ¡£
			/// <summary>
			/// æ¡ç è½¬åæ¡ç ä¸»æ¡£
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Sc_BarCode/SaveBarCode_NoGenerate")]
			[HttpPost]
			public object SaveBarCode_NoGenerate([FromBody] JObject msg)
			{
			try
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string HOrgType = sArray[1].ToString();
			string HSourceBillTypeName = sArray[2].ToString();
			string HSelectBarCodeType = sArray[3].ToString();
			string CampanyName = sArray[4].ToString() == "xxx" ? "" : sArray[4].ToString();
			string UserName = sArray[5].ToString();
			string barCodeNo = sArray[6].ToString();
			ClsPub.CurUserName = UserName;

			//è·ååç
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
			DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
			HOrgNumber = "";
			if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
			{
			HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
			HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
			}
			if (HOrgID == -1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-2-055]éæ©ç»ç»æéè¯¯!";
			return objJsonResult;
			}
			if (!Sub_AllowSave(msg2, HSelectBarCodeType))//åæ®å®æ´æ§å¤æ
			{
			return objJsonResult;
			}
			if (HSelectBarCodeType == "ä»ªå¨æåæ¡ç è§å")
			{
			//å®¢æ·å®å¶
			}
			else
			{

			// æ¡ç è½¬å
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
			LogService.Write(ordrlist[0]);

			long HSourceInterID = string.IsNullOrEmpty(ordrlist[0].HMainID) == true ? 0 : ClsPub.isLong(ordrlist[0].HMainID);
			long HSourceEntryID = string.IsNullOrEmpty(ordrlist[0].HSubID) == true ? 0 : ClsPub.isLong(ordrlist[0].HSubID);
			DataSet ds1 = oCN.RunProcReturn("exec h_p_SC_BarCode_Transfer " +
			"@HBarCodeNo = N'" + barCodeNo + "'" +
			",@HSubID = " + ordrlist[0].HSubID +
			",@HMaterID = " + ordrlist[0].HMaterID +
			",@HGiveAwayFlag = " + ordrlist[0].HGiveAwayFlag +
			",@HQty = " + ordrlist[0].HQty +
			",@HUnitID = " + ordrlist[0].HUnitID +
			",@HMinQty = " + ordrlist[0].HMinQty +
			",@HSupID = " + ordrlist[0].HSupID +
			",@HBatchNo = N'" + ordrlist[0].HBatchNo + "'" +
			",@HMTONO = N'" + ordrlist[0].HMTONo + "'" +
			",@HBarCodeDate = N'" + ordrlist[0].HDate + "'" +
			",@HEmpID = " + ordrlist[0].HEmpID +
			",@HGroupID = " + ordrlist[0].HGroupID +
			",@HSourceInterID = " + HSourceInterID +
			",@HSourceEntryID = " + HSourceEntryID
			, "h_p_SC_BarCode_Transfer");

			if((bool)ds1.Tables[0].Rows[0]["returntype"] == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "[0000-1-037]è·åèµæºç»å®æ°æ®æåï¼";
			}
			else
			{
			throw new Exception(ds1.Tables[0].Rows[0]["mesg"].ToString());
			}

			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[3899-2-006]æ¡ç çæå¤±è´¥!" + e.Message;
			return objJsonResult;
			}
			return objJsonResult;
			}
			#endregion

			#region [æ¡ç çææ¥å£-è¿¦å]
			[Route("Sc_BarCode/Sub_SaveBill_JiaNan")]
			@@ -1697,6 +1797,7 @@
			barcode.HCusModel2 = ordrlist[i].HCusModel;
			barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
			barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
			barcode.HZZRQ = ordrlist[i].HZZRQ;
			ListRows.Add(barcode);

			n += 1; //æ´æ°åæ¹çæçæ¡ç æ°
			@@ -1801,6 +1902,7 @@
			barcode.HCusModel2 = ordrlist[i].HCusModel;
			barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
			barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
			barcode.HZZRQ = ordrlist[i].HZZRQ;
			ListRows.Add(barcode);

			n += 1; //æ´æ°åæ¹çæçæ¡ç æ°
			@@ -1905,6 +2007,7 @@
			barcode.HCusModel2 = ordrlist[i].HCusModel;
			barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
			barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
			barcode.HZZRQ = ordrlist[i].HZZRQ;
			ListRows.Add(barcode);

			n += 1; //æ´æ°åæ¹çæçæ¡ç æ°
			@@ -1975,6 +2078,7 @@
			string HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
			string HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
			string HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
			string HZZRQ = ClsPub.isStrNull(ListRows[i].HZZRQ);
			oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
			@@ -1983,7 +2087,7 @@
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
			",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " +
			",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HZZRQ " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
			@@ -1993,7 +2097,7 @@
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
			+ ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "'" + ")");
			+ ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HZZRQ + "'" + ")");

			}
			}