From 5820b0dcd0edbc92d688ba86973221682a7ba6d8 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 23 七月 2021 14:55:44 +0800
Subject: [PATCH] SaveMateOutBill_PPBom_CLD 方法 新增了根据客户 横河模具 增加了保质期
---
CLOUDWEB/CLOUDWEB.csproj | 5 +++++
CLOUDWEB/WebService1.asmx.cs | 15 ++++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/CLOUDWEB/CLOUDWEB.csproj b/CLOUDWEB/CLOUDWEB.csproj
index 0d632b1..95784c7 100644
--- a/CLOUDWEB/CLOUDWEB.csproj
+++ b/CLOUDWEB/CLOUDWEB.csproj
@@ -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>
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 43b5119..270fe6e 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -14068,6 +14068,18 @@
}
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_BatchNo = "";
+ }
+
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 +14171,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\":\"\"},
--
Gitblit v1.9.1