From fc9d6b654d1bf0b1eb6de4a55850fc1bd2aff7b1 Mon Sep 17 00:00:00 2001
From: Administrator <jinghz@oceic.com>
Date: 星期日, 21 四月 2024 12:18:49 +0800
Subject: [PATCH] 采购订单增加控制和自动审核
---
DAL/仓库管理/ClsKf_POStockInBill.cs | 39 ++++++++++++++++++++++++++++++++++++---
ProM/采购管理/Cg_POOrderBill.cs | 2 ++
WarM/仓库管理/Kf_POStockInBill.cs | 12 ++++++++++++
3 files changed, 50 insertions(+), 3 deletions(-)
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBill.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBill.cs"
index 2f64931..c8de462 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBill.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_POStockInBill.cs"
@@ -47,6 +47,10 @@
{
oCn.RunProc("exec h_p_Cg_UpDatePOInStockRelation_Back_Del " + lngBillKey.ToString());
}
+ else if (omodel.HMainSourceBillType == "閲囪喘璁㈠崟")
+ {
+ oCn.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPOStockIn_Del " + lngBillKey.ToString());
+ }
else
{
@@ -71,6 +75,10 @@
else if (omodel.HMainSourceBillType == "閫�鏂欓�氱煡鍗�")
{
oCn.RunProc("exec h_p_Cg_UpDatePOInStockRelation_Back_Add " + lngBillKey.ToString());
+ }
+ else if (omodel.HMainSourceBillType == "閲囪喘璁㈠崟")
+ {
+ oCn.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPOStockIn_Add " + lngBillKey.ToString());
}
else
{
@@ -176,8 +184,20 @@
}
//鏇存柊璁㈠崟鍏宠仈鏁伴噺
AddNewRelation(ref sReturn, omodel.HInterID);
- //鎺у埗鍏宠仈鏁伴噺
-
+ //淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_POStockInBill_AfterSaveCtrl " + lngBillKey.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_POStockInBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCn.RollBack();
+ sReturn = "鍒ゆ柇淇濆瓨鍚庢帶鍒跺け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack();
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
//
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
@@ -248,7 +268,20 @@
}
//鏇存柊璁㈠崟鍏宠仈鏁伴噺
AddNewRelation(ref sReturn, omodel.HInterID);
- //
+ //淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_POStockInBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_POStockInBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCn.RollBack();
+ sReturn = "鍒ゆ柇淇濆瓨鍚庢帶鍒跺け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCn.RollBack();
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
//
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
diff --git "a/ProM/\351\207\207\350\264\255\347\256\241\347\220\206/Cg_POOrderBill.cs" "b/ProM/\351\207\207\350\264\255\347\256\241\347\220\206/Cg_POOrderBill.cs"
index 6707d85..9a64437 100644
--- "a/ProM/\351\207\207\350\264\255\347\256\241\347\220\206/Cg_POOrderBill.cs"
+++ "b/ProM/\351\207\207\350\264\255\347\256\241\347\220\206/Cg_POOrderBill.cs"
@@ -1224,7 +1224,9 @@
{
BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
BillOld.omodel.HInterID = BillNew.omodel.HInterID;
+ this.Sub_CheckBill();
this.Sub_ShowBill();
+
}
else if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
{
diff --git "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_POStockInBill.cs" "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_POStockInBill.cs"
index a692fc8..0e68997 100644
--- "a/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_POStockInBill.cs"
+++ "b/WarM/\344\273\223\345\272\223\347\256\241\347\220\206/Kf_POStockInBill.cs"
@@ -2466,6 +2466,18 @@
grdMain.Rows[i].Cells[HPOOrderInterIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
grdMain.Rows[i].Cells[HPOOrderEntryIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
grdMain.Rows[i].Cells[HPOOrderBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ //鏍规嵁鐗╂枡鑾峰彇 閲囪喘鍗曚环
+ DAL.ClsGy_Material_View oMater = new DAL.ClsGy_Material_View();
+ if (oMater.GetInfoByID(DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value)))
+ {
+ grdMain.Rows[i].Cells[HOrderPriceCol].Value = oMater.omodel.HOrderPrice.ToString();
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HOrderPriceCol].Value = 0;
+ }
+ //
+
Sub_RowCount(i, HQtyCol);
}
--
Gitblit v1.9.1