From 0154812526e734b095fee3345b585c84043bd83f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 四月 2024 09:03:14 +0800
Subject: [PATCH] 网页版： 采购订单 表头 增加 字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料； 表头和表体 增加字段 仓库 HWHID int ,以及 选择 表头仓库后， 表体仓库为空的 也自动填充。 网页版：收料通知单 表头 增加 字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料，并且 选择 源单 采购订单 时会带入 采购订单的项目编号；表头 增加 字段 发票编号 HInvoiceBillNo ； 以及 选择 表头仓库后， 表体 收料仓库为空的 也自动填充。 网页版：采购入库单 表头 增加字段 项目编号 HProjectID （界面显示 项目编码，项目名称）， 以及 可选择 工程项目 为 基础资料，并且 选择 源单 时会带入 源单 的项目编号；表头 增加 字段 发票编号 HInvoiceBillNo （可以源单带入）； 以及 选择 表头仓库后， 表体 收料仓库为空的 也自动填充。 表体 增加 HTaxRate税率HTaxPrice 含税单价HlineTotal 含税金额 含税单价和含税金额 根据 税率和单价 计算出来（如果不知道怎么处理，可以看下 销售订单的 几个字段 计算的公式）。 （新增，修改 功能 都测试下； 字段数据不要 缺失）
---
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index 4de8cc1..d20ec39 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -148,10 +148,12 @@
long HSCWHID = mainList[0].HSCWHID;//璋冨嚭浠撳簱
long HSecManagerID = mainList[0].HSecManagerID;//楠屾敹
long HKeeperID = mainList[0].HKeeperID;//淇濈鍛�
+ long HProjectID = mainList[0].HProjectID;//椤圭洰
+ string HInvoiceBillNo = mainList[0].HInvoiceBillNo;//鍙戠エ缂栧彿
string HExplanation = mainList[0].HExplanation;//鎽樿
string HInnerBillNo = mainList[0].HInnerBillNo;//鍐呴儴鍗曟嵁鍙�
@@ -198,12 +200,12 @@
String sql =$@"Insert Into Kf_ICStockBillMain
(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus
,HAddress,HSupID,HCurID,HWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID,HExplanation,HRemark
- ,HInnerBillNo,HSTOCKORGID,HOWNERID,HMaker,HMakeDate)
+ ,HInnerBillNo,HSTOCKORGID,HOWNERID,HMaker,HMakeDate,HProjectID,HInvoiceBillNo)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1201 + "','" +
HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
"'," + HSupID + "," + HCurID + "," + HWHID + "," + HEmpID + "," + HManagerID + "," +
HSecManagerID + ","+ HKeeperID +"," + HDeptID + ",'" + HExplanation + "','" + HRemark
- + "','" + HInnerBillNo + "'," + HSTOCKORGID + "," + HOWNERID + ",'" + HMaker + "',getdate()" +")";
+ + "','" + HInnerBillNo + "'," + HSTOCKORGID + "," + HOWNERID + ",'" + HMaker + "',getdate(),"+ HProjectID + ",'"+ HInvoiceBillNo + "')";
oCN.RunProc(sql);
}
@@ -213,7 +215,7 @@
"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
",HSupID=" + HSupID + ",HCurID=" + HCurID + ",HSecManagerID=" + HSecManagerID + ", HSTOCKORGID=" + HSTOCKORGID + ",HKeeperID=" + HKeeperID + ",HWHID = " + HWHID
+ ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID + ",HOWNERID=" + HOWNERID
- + ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "' where HInterID=" + HInterID;
+ + ",HAddress='" + HAddress + "',HInnerBillNo='" + HInnerBillNo + "',HProjectID="+ HProjectID + ",HInvoiceBillNo='"+ HInvoiceBillNo + "' where HInterID=" + HInterID;
oCN.RunProc(sql);
//鍒犻櫎瀛愯〃
@@ -329,13 +331,15 @@
,HMoney,HOrderPrice,HWHID,HSPID,HRelationQty,HBatchNo
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
,HPOOrderInterID,HPOOrderEntryID ,HPOOrderBillNo
- ,HPropertyID,HSecUnitID,HSecUnitRate,HPlanMode,HRemark,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo)
+ ,HPropertyID,HSecUnitID,HSecUnitRate,HPlanMode,HRemark,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo
+ ,HTaxRate,HTaxPrice,HlineTotal)
values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID}
,{oSub.HQtyMust},{(oSub.HQty == null ? 0 : oSub.HQty)},{oSub.HPrice},{oSub.HMoney},{oSub.HOrderPrice},{oSub.HWHID},{oSub.HSPID},{oSub.HRelationQty}
,'{oSub.HBatchNo}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}'
,{oSub.HPOOrderInterID},{oSub.HPOOrderEntryID},'{oSub.HPOOrderBillNo}'
,{(oSub.HPropertyID == null ? 0 : oSub.HPropertyID)},{(oSub.HSecUnitID == null ? 0 : oSub.HSecUnitID)},{(oSub.HSecUnitRate == null ? 0 : oSub.HSecUnitRate)}
- ,{(oSub.HPlanMode == null ? 0 : oSub.HPlanMode)},'{oSub.HRemark}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeOrderBillNo}')";
+ ,{(oSub.HPlanMode == null ? 0 : oSub.HPlanMode)},'{oSub.HRemark}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeOrderBillNo}'
+ ,{(oSub.HTaxRate == null ? 0 : oSub.HTaxRate)},{(oSub.HTaxPrice == null ? 0 : oSub.HTaxPrice)},{(oSub.HlineTotal == null ? 0 : oSub.HlineTotal)})";
//string sReturn = "";
//ds = oCN.RunProcReturn("exec h_p_Cg_POInStockBillMain " + oSub.HQty + ", '" +oSub.HSourceInterID + "', '" + oSub.HSourceEntryID + "','" + user+" '", "h_p_Cg_POInStockBillMain");
--
Gitblit v1.9.1