MESWMS-WEBS.git

			@@ -19,6 +19,8 @@
			<IISExpressAnonymousAuthentication />
			<IISExpressWindowsAuthentication />
			<IISExpressUseClassicPipelineMode />
			<Use64BitIISExpress />
			<UseGlobalApplicationHostFile />
			</PropertyGroup>
			<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' ">
			<DebugSymbols>true</DebugSymbols>
			@@ -349,6 +351,9 @@
			<Content Include="Account\Web.config" />
			<Content Include="Site.Master" />
			</ItemGroup>
			<ItemGroup>
			<WCFMetadata Include="Connected Services\" />
			</ItemGroup>
			<PropertyGroup>
			<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
			<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

			@@ -14068,6 +14068,19 @@
			}
			string sJson_BatchNo = "";
			string sJson_StockPlace = "";
			string sJson_FProduceDate = "";
			string sJson_FExpiryDate = "";
			if ((oSystemParameterMain.WMS_CampanyName == "横河模具")) //客户横河模具
			{
			sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
			sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
			}
			else
			{
			sJson_FProduceDate = "";
			sJson_FExpiryDate = "";
			}

			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1") //是否启用批次管理
			{
			sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
			@@ -14159,7 +14172,8 @@
			"\"FPickingStatus\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPickingStatus"]) + "\"," +
			//
			"\"FSNUnitID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSNUnitID"]) + "\"}," +

			sJson_FProduceDate +
			sJson_FExpiryDate +
			//\"FSerialSubEntity\":[{\"FDetailID\":\"0\",
			//\"FSerialNo\":\"\",
			//\"FSerialId\":{\"FNumber\":\"\"},

	CLOUDWEB/CLOUDWEB.csproj	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CLOUDWEB/WebService1.asmx.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史