From 1f576a9551c6977486a1334c5aaf4c5a57996a16 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 11 十月 2021 17:39:15 +0800
Subject: [PATCH] 器具采购入库单 增加仓库 仓位 往来单位 等字段显示 修复页面按钮错误
---
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 6 ++++--
WebAPI/Models/ClsSc_MouldProdBillMain.cs | 5 +++--
WebAPI/DLL/ClsSc_MouldProdInBill.cs | 9 +++++----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index c3efce4..62a89db 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -406,7 +406,8 @@
{
ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
+ HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark
FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
objJsonResult.code = "0";
@@ -420,7 +421,8 @@
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
- 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
+ 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney,hwhid1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode,鏀舵枡浠撳簱 HWHName,
+ HSPID, 鏀舵枡浠撲綅浠ｇ爜 HSPCode,鏀舵枡浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark
FROM h_v_Sc_MouldProdInHouseBillList where 1=1");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
diff --git a/WebAPI/DLL/ClsSc_MouldProdInBill.cs b/WebAPI/DLL/ClsSc_MouldProdInBill.cs
index 649fbb5..49cd166 100644
--- a/WebAPI/DLL/ClsSc_MouldProdInBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldProdInBill.cs
@@ -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" +
",HRemark,HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HRemark + ",'" + omodel.HMaker + "',getdate()" + /*omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" +*/
+ ", '" + omodel.HRemark.ToString() + "','" + omodel.HMaker + "',getdate()" + /*omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" +*/
", " + omodel.HSupID.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)
{
diff --git a/WebAPI/Models/ClsSc_MouldProdBillMain.cs b/WebAPI/Models/ClsSc_MouldProdBillMain.cs
index c0cb484..962dbfc 100644
--- a/WebAPI/Models/ClsSc_MouldProdBillMain.cs
+++ b/WebAPI/Models/ClsSc_MouldProdBillMain.cs
@@ -7,8 +7,8 @@
{
public class ClsSc_MouldProdBillMain : DBUtility.ClsXt_BaseBillMain
{
- public Int64 HSupID;// int --渚涘簲鍟�
- public Int64 HWHID;// int --浠撳簱
+ public Int64 HSupID;// int --1 渚涘簲鍟嗐��2 瀹㈡埛銆� 3 杞﹂棿閮ㄩ棬
+ public Int64 HWHID = 0;// int --浠撳簱
public Int64 HSCWHID;// int --璋冨嚭浠撳簱
public Int64 HEmpID;// int --涓氬姟鍛�
public Int64 HManagerID;// int --璐熻矗浜�
@@ -19,5 +19,6 @@
public string HInnerBillNo;// varchar(50) --鍐呴儴鍗曟嵁鍙�
public string HRemark; //鍔犲伐瑕佹眰
public bool HRedBlueFlag;// bit --绾㈣摑鍗�
+ public Int64 HSupTypeID;// bit --寰�鏉ョ被鍨�
}
}
\ No newline at end of file
--
Gitblit v1.9.1