MES-WEB-API.git

			@@ -10,7 +10,7 @@
			<AppDesignerFolder>Properties</AppDesignerFolder>
			<RootNamespace>BaseSet</RootNamespace>
			<AssemblyName>BaseSet</AssemblyName>
			<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
			<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
			<FileUpgradeFlags>
			</FileUpgradeFlags>
			<UpgradeBackupLocation>

			@@ -19,7 +19,7 @@
			// ç±»éè¿ç±»ä¼¼äº ResGen æ Visual Studio çå·¥å·èªå¨çæçã
			// è¥è¦æ·»å æç§»é¤æåï¼è¯·ç¼è¾ .ResX æä»¶ï¼ç¶åéæ°è¿è¡ ResGen
			// (ä»¥ /str ä½ä¸ºå½ä»¤éé¡¹)ï¼æéæ°çæ VS é¡¹ç®ã
			[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
			[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
			[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
			[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
			internal class Resources {

Binary files differ

			@@ -954,7 +954,8 @@
			//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			}
			else if (CampanyName == "çä¸ç¥º") {
			else if (CampanyName == "çä¸ç¥º")
			{
			var date = DateTime.Now.ToString("yyMMdd");//æ¥æ
			if (HSourceBillTypeName == "æ¶æéç¥å")
			{
			@@ -1575,14 +1576,17 @@
			",@HEmpID = " + ordrlist[0].HEmpID +
			",@HGroupID = " + ordrlist[0].HGroupID +
			",@HSourceInterID = " + HSourceInterID +
			",@HSourceEntryID = " + HSourceEntryID
			",@HSourceEntryID = " + HSourceEntryID +
			",@HBarCodeType = " + HSelectBarCodeType +
			",@HSourceBillNo = " + ordrlist[0].HBillNo +
			",@HMaker = " + UserName
			, "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]è·åèµæºç»å®æ°æ®æåï¼";
			objJsonResult.Message = ds1.Tables[0].Rows[0]["mesg"].ToString();
			}
			else
			{

Binary files differ

	BaseSet/BaseSet.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BaseSet/Properties/Resources.Designer.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史