From db94e0405f124e189530a5b0ee454960dddd111d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 06 一月 2023 16:58:57 +0800
Subject: [PATCH] 条码系统增加单据日期是否取界面递入日期系统参数，销售出库、生产入库上传方法日期递入值修改
---
WebAPI/DLL/ClsSc_MouldProdInBill.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_MouldProdInBill.cs b/WebAPI/DLL/ClsSc_MouldProdInBill.cs
index 90a331f..e8e74ee 100644
--- a/WebAPI/DLL/ClsSc_MouldProdInBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldProdInBill.cs
@@ -13,11 +13,11 @@
public ClsSc_MouldProdInBill()
{
- base.MvarItemKeySub = "Sc_MouldProdInBillSub";
+ base.MvarItemKeySub = "Sc_MouldStockBillSub";
base.MvarItemKeySub2 = "";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
- base.MvarItemKey = "Sc_MouldProdInBillMain";
+ base.MvarItemKey = "Sc_MouldStockBillMain";
base.MvarReportTitle = "妯″叿閲囪喘鍏ュ簱鍗�";
base.BillType = "3801";
base.HBillSubType = "3801";
@@ -41,19 +41,20 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
- //涓昏〃
- oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
+ string sql = "Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HRemark,HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
+ ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
- ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
+ ", '" + omodel.HRemark.ToString() + "','" + omodel.HMaker + "',getdate()" + /*omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" +*/
+ ", " + omodel.HSupID.ToString() + ", " + omodel.HSupTypeID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
- ") ");
+ ") ";
+ //涓昏〃
+ oCn.RunProc(sql);
//鎻掑叆瀛愯〃
foreach (Models.ClsSc_MouldProdBillSub oSub in DetailColl)
{
@@ -64,14 +65,14 @@
",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
",HDesignLife,HLeaveLife,HUseLife" +
- ",HSCSPID,HSPGroupID,HBatchNo" +
+ ",HSCSPID,HSPGroupID,HBatchNo,HStockOrgID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
"," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
- "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HStockOrgID.ToString() +
") ");
}
DataSet Ds;
@@ -120,6 +121,7 @@
",HUpDateDate=getdate()" +
//========================================
",HSupID=" + omodel.HSupID.ToString() +
+ ",HSupTypeID=" + omodel.HSupTypeID.ToString() +
",HWHID=" + omodel.HWHID.ToString() +
",HSCWHID=" + omodel.HSCWHID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
@@ -146,14 +148,14 @@
",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
",HDesignLife,HLeaveLife,HUseLife" +
- ",HSCSPID,HSPGroupID,HBatchNo" +
+ ",HSCSPID,HSPGroupID,HBatchNo,HStockOrgID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
"," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
- "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HStockOrgID.ToString() +
") ");
}
DataSet Ds;
--
Gitblit v1.9.1