From 4f2d7168516bdc5505adfe15372c5b224d14d7e4 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 05 七月 2023 16:26:04 +0800
Subject: [PATCH] 领料出库上传生成CLOUD单据调用方法修改，根据系统参数判断生成单据日期是否取界面上日期
---
CLOUDWEB/WebService1.asmx.cs | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index b7c1b96..4aeb7b3 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -19529,6 +19529,12 @@
string s = "";
int sYear = 0;
int sPeriod = 0;
+
+ if (oSystemParameterMain.WMS_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ {
+ oMain.HDate = DateTime.Today;
+ }
+
if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
{
sErrMsg = s;
@@ -19549,7 +19555,7 @@
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
",HSTOCKORGID,HOWNERID" +
") " +
- " values('1204','1204'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "',convert(varchar(10),getdate(),120),'" + oMain.HMainSourceBillType + "'" +
+ " values('1204','1204'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HDate.ToShortDateString() + "','" + oMain.HMainSourceBillType + "'" +
", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "','" + oMain.HMaker + "',convert(varchar(10),getdate(),120)" +
", " + oMain.HSupID.ToString() + "," + oMain.HWHID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HEmpID.ToString() + "," + oMain.HManagerID.ToString() + "," + oMain.HSecManagerID.ToString() +
", " + oMain.HKeeperID.ToString() + "," + oMain.HDeptID.ToString() + ",'" + oMain.HExplanation + "','" + oMain.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(oMain.HRedBlueFlag) +
@@ -19581,14 +19587,25 @@
else
{
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+
+ if (oSystemParameterMain.WMS_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ {
+ sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
+ }
+ else
+ {
+ sJson_Date = "\"FDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDATE"]) + "\",";
+ }
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
"\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
"\"Model\": { \"FBILLNO\":\"" + oMain.HBillNo + "\"," +
//\"FID\":\"0\",
"\"FBillType\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillType"]) + "\"}," +
- "\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
+ //"\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
+ sJson_Date +
"\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
//\"FStockId0\":{\"FNumber\":\"\"},
"\"FPrdOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPrdOrgId"]) + "\"}," +
@@ -19900,6 +19917,12 @@
string s = "";
int sYear = 0;
int sPeriod = 0;
+
+ if (oSystemParameterMain.WMS_BillDateMode == "N") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ {
+ oMain.HDate = DateTime.Today;
+ }
+
if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
{
sErrMsg = s;
@@ -19920,7 +19943,7 @@
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
",HSTOCKORGID,HOWNERID" +
") " +
- " values('1204','1204'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "',convert(varchar(10),getdate(),120),'" + oMain.HMainSourceBillType + "'" +
+ " values('1204','1204'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HDate.ToShortDateString() + "','" + oMain.HMainSourceBillType + "'" +
", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "','" + oMain.HMaker + "',convert(varchar(10),getdate(),120)" +
", " + oMain.HSupID.ToString() + "," + oMain.HWHID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HEmpID.ToString() + "," + oMain.HManagerID.ToString() + "," + oMain.HSecManagerID.ToString() +
", " + oMain.HKeeperID.ToString() + "," + oMain.HDeptID.ToString() + ",'" + oMain.HExplanation + "','" + oMain.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(oMain.HRedBlueFlag) +
@@ -19952,14 +19975,25 @@
else
{
string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ string sJson_Date = ""; //鍗曟嵁鏃ユ湡
sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+
+ if (oSystemParameterMain.WMS_BillDateMode == "Y") //绯荤粺鍙傛暟 鍗曟嵁鏃ユ湡鏄惁鍙栫晫闈㈤�掑叆鏃ユ湡
+ {
+ sJson_Date = "\"FDATE\":\"" + oMain.HDate.ToShortDateString() + "\",";
+ }
+ else
+ {
+ sJson_Date = "\"FDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDATE"]) + "\",";
+ }
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
"\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
"\"Model\": { \"FBILLNO\":\"" + oMain.HBillNo + "\"," +
//\"FID\":\"0\",
"\"FBillType\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillType"]) + "\"}," +
- "\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
+ //"\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
+ sJson_Date +
"\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
//\"FStockId0\":{\"FNumber\":\"\"},
"\"FPrdOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPrdOrgId"]) + "\"}," +
--
Gitblit v1.9.1