From e42e0a80cc8e79a2a92a88c1e118157644630a13 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 05 六月 2024 16:44:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DBUtility/业务单据/ClsXt_BaseBill.cs | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
index 39bffd9..6fb346f 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
@@ -218,7 +218,7 @@
//鍙嶅鏍�
public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
{
-
+ string sql = "";
if (isUse(lngBillKey, ref sReturn))
{
return false;
@@ -238,7 +238,21 @@
{
oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=1 Where HInterID=" + lngBillKey.ToString());
}
-
+
+ //鍙嶅鏍稿悗 鏇存柊鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨
+ sql = "select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString();
+ ds = oCn.RunProcReturn(sql, MvarItemKey);
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ string HBillType = ds.Tables[0].Rows[0]["HBillType"].ToString();
+ if (HBillType == "1201" || HBillType == "1202" || HBillType == "1203" || HBillType == "1247" || HBillType == "1244" || HBillType == "1251" || HBillType == "1210" || HBillType == "1204")
+ {
+ //鍙嶅鏍告洿鏂� 鍙婃椂搴撳瓨琛� 澧炲姞搴撳瓨 1201 1202 1203 1247 1244 1251 1210
+ //鍙嶅鏍告洿鏂� 鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨 1204 1202 1203 1247 1244 1251 1210
+ ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory");
+ }
+ }
+
sReturn = "";
return true;
}
@@ -292,6 +306,19 @@
oCn.RollBack();
return false;
}
+ //鍙嶅鏍稿悗 鏇存柊鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨
+ sql = "select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString();
+ ds = oCn.RunProcReturn(sql, MvarItemKey);
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ string HBillType = ds.Tables[0].Rows[0]["HBillType"].ToString();
+ if (HBillType == "1201" || HBillType == "1202" || HBillType == "1203" || HBillType == "1247" || HBillType == "1244" || HBillType == "1251" || HBillType == "1210" || HBillType == "1205" || HBillType == "1250" || HBillType == "1206" || HBillType == "1245" || HBillType == "1239")
+ {
+ //鍙嶅鏍告洿鏂� 鍙婃椂搴撳瓨琛� 澧炲姞搴撳瓨 1201 1202 1203 1247 1244 1251 1210
+ //鍙嶅鏍告洿鏂� 鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨 1205 1250 1206 1245 1239
+ ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory");
+ }
+ }
//鍐欏叆鏃ュ織
string WorkList = "鍙嶅鏍稿崟鎹紝鍗曟嵁鍙凤細" + HBillNo;
string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
@@ -314,12 +341,26 @@
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
{
-
+ string sql = "";
+ DataSet ds;
try
{
string HChecker = ClsPub.CurUserName ;
string HCheckDate =ClsPub.GetServerDate(-1);
oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HInterID=" + lngBillKey.ToString());
+ //瀹℃牳鍚� 鏇存柊鍙婃椂搴撳瓨琛� 澧炲姞搴撳瓨
+ sql = "select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString();
+ ds = oCn.RunProcReturn(sql, MvarItemKey);
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ string HBillType = ds.Tables[0].Rows[0]["HBillType"].ToString();
+ if (HBillType == "1201" || HBillType == "1202" || HBillType == "1203" || HBillType == "1247" || HBillType == "1244" || HBillType == "1251" || HBillType == "1210" || HBillType == "1204")
+ {
+ //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 澧炲姞搴撳瓨 1201 1202 1203 1247 1244 1251 1210
+ //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨 1204
+ ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory");
+ }
+ }
sReturn = "";
return true;
}
@@ -356,7 +397,7 @@
{
string HChecker = sUser;
string HCheckDate = ClsPub.GetServerDate(-1);
-
+
//寮�鍚簨鍔�
oCn.BeginTran();
@@ -378,6 +419,19 @@
oCn.RollBack();
return false;
}
+ //瀹℃牳鍚� 鏇存柊鍙婃椂搴撳瓨琛� 澧炲姞搴撳瓨
+ sql = "select * from " + MvarItemKey + " where HInterID=" + lngBillKey.ToString();
+ ds = oCn.RunProcReturn(sql, MvarItemKey);
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+ {
+ string HBillType = ds.Tables[0].Rows[0]["HBillType"].ToString();
+ if (HBillType == "1201" || HBillType == "1202" || HBillType == "1203" || HBillType == "1247" || HBillType == "1244" || HBillType == "1251" || HBillType == "1210" || HBillType == "1250" || HBillType == "1206" || HBillType == "1245" || HBillType == "1239")
+ {
+ //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 澧炲姞搴撳瓨 1201 1202 1203 1247 1244 1251 1210
+ //瀹℃牳鏇存柊 鍙婃椂搴撳瓨琛� 鍑忓皯搴撳瓨 1204 1250 1206 1245 1239
+ ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory");
+ }
+ }
//鍐欏叆鏃ュ織
string WorkList = "瀹℃牳鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
--
Gitblit v1.9.1