From 92bc347f39b0c9b03c394b8fb918de2bd018b986 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 29 六月 2025 19:03:31 +0800
Subject: [PATCH] 物料标准包装模块；送货单添加保存前后存储过程控制；
---
DAL/SCM/ClsSupMaterPackBill.cs | 200 ++++++++++++++++++++++++++++++++++++++++
DAL/采购管理/ClsCg_POInStockBill.cs | 54 ++++++++--
DAL/DAL.csproj | 3
Model/WMS/ClsGy_BarCodeBill_WMS_Model.cs | 1
Model/SCM/ClsSupMaterPackBillSub.cs | 17 +++
Model/Model.csproj | 2
Model/SCM/ClsSupMaterPackBillMain.cs | 17 +++
7 files changed, 283 insertions(+), 11 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 1a7e1ba..db2b82b 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -64,7 +64,7 @@
</Reference>
<Reference Include="SQLHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\DLL\SQLHelper.dll</HintPath>
+ <HintPath>..\..\..\..\缃戠珯鍙戝竷\渚涘簲鍟嗗钩鍙癨SRMAPI\bin\SQLHelper.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -93,6 +93,7 @@
<Compile Include="SCM\ClsSup_AskPriceBill.cs" />
<Compile Include="SCM\ClsSup_EvaluateBill.cs" />
<Compile Include="SCM\ClsSup_EvaluateSchemeBill.cs" />
+ <Compile Include="SCM\ClsSupMaterPackBill.cs" />
<Compile Include="SCM\ClsSup_QuotePriceBill.cs" />
<Compile Include="SCM\ClsSup_SampleRequestBill.cs" />
<Compile Include="SCM\ClsSup_SampleTestBill.cs" />
diff --git a/DAL/SCM/ClsSupMaterPackBill.cs b/DAL/SCM/ClsSupMaterPackBill.cs
new file mode 100644
index 0000000..ec525c9
--- /dev/null
+++ b/DAL/SCM/ClsSupMaterPackBill.cs
@@ -0,0 +1,200 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsSupMaterPackBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSupMaterPackBillMain omodel = new Model.ClsSupMaterPackBillMain();
+ public List<Model.ClsSupMaterPackBillSub> DetailColl = new List<Model.ClsSupMaterPackBillSub>();
+ public List<Model.ClsSupMaterPackBillSub> DetailColl_Source = new List<Model.ClsSupMaterPackBillSub>();
+
+ public ClsSupMaterPackBill()
+ {
+ base.MvarItemKeyForWeb = "h_v_SRM_SupMaterPackMain_ForWeb";
+ base.MvarItemKeySubForWeb = "h_v_SRM_SupMaterPackSub_ForWeb";
+ base.MvarItemKeySub = "SRM_SupMaterPackSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="SRM_SupMaterPackMain";
+ base.MvarReportTitle="鐗╂枡鏈�灏忓寘瑁�";
+ base.BillType= "10001";
+ base.HBillSubType = "10001";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSupMaterPackBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate SRM_SupMaterPackMain set " +
+ "HRemark='" + omodel.HRemark + "'" +
+ ",HModifyEmp='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HModifyTime=getdate()" +
+ //========================================
+ ",HSupID=" + omodel.HSupID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSupMaterPackBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into SRM_SupMaterPackSub " +
+ " (HInterID,HEntryID,HRemark,HMaterID,HMinPackQty,HInBoxPackQty,HOutBoxPackQty,HPriority" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HMaterID + "," + oSub.HMinPackQty + "," + oSub.HInBoxPackQty + "," + oSub.HOutBoxPackQty + "," + oSub.HPriority +
+ ") ");
+ }
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into SRM_SupMaterPackMain " +
+ "(HInterID,HMakeTime,HMakeEmp,HRemark,HUSEORGID,HCREATEORGID,HSupID,HBeginDate,HEndDate" +
+ ") values(" + omodel.HInterID.ToString() + ",getdate(),'" + omodel.HMakeEmp + "','" + omodel.HRemark + "'," + omodel.HUSEORGID + "," + omodel.HCREATEORGID + "," + omodel.HSupID + ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSupMaterPackBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into SRM_SupMaterPackSub " +
+ " (HInterID,HEntryID,HRemark,HMaterID,HMinPackQty,HInBoxPackQty,HOutBoxPackQty,HPriority" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HMaterID + "," + oSub.HMinPackQty + "," + oSub.HInBoxPackQty + "," + oSub.HOutBoxPackQty + "," + oSub.HPriority +
+ ") ");
+ }
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from SRM_SupMaterPackMain Where HInterID=" + lngBillKey.ToString(), "SRM_SupMaterPackMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ omodel.HBeginDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBeginDate"]);
+ omodel.HEndDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HEndDate"]);
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from SRM_SupMaterPackSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "SRM_SupMaterPackSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSupMaterPackBillSub oSub = new Model.ClsSupMaterPackBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+
+
+
+ }
+
+}
diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
index e3a602c..dfb22c9 100644
--- "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
@@ -74,16 +74,24 @@
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
",HDeliveryNo='" + omodel.HDeliveryNo + "'" +
",HDHDate='" + omodel.HDHDate + "'" +
+ ",HExpressSupplier='" + omodel.HExpressSupplier + "'" +
+ ",HReceiveGoodsMan='" + omodel.HReceiveGoodsMan + "'" +
+ ",HReceiveGoodsLink='" + omodel.HReceiveGoodsLink + "'" +
+ ",HSendGoodsMan='" + omodel.HSendGoodsMan + "'" +
+ ",HSendGoodsAddr='" + omodel.HSendGoodsAddr + "'" +
+ ",HSendGoodsLink='" + omodel.HSendGoodsLink + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
- DeleteRelation(ref sReturn, lngBillKey);
+ //DeleteRelation(ref sReturn, lngBillKey);
+ oCn.RunProc("exec H_p_SRM_POInStockBill_UpdateBillRelateData_back " + lngBillKey.ToString());
//鍒犻櫎瀛愯〃
- DeleteBillSub(lngBillKey);
+ //DeleteBillSub(lngBillKey);
+ oCn.RunProc("delete from Cg_POInStockBillSub where HInterID = " + lngBillKey.ToString());
//鎻掑叆瀛愯〃
- omodel.HInterID = lngBillKey;
+ omodel.HInterID = lngBillKey;
+ //鍑礉濂堢壒 HSupBatchNo锛孒SupMaterNumber
foreach (Model.ClsCg_POInStockBillSub oSub in DetailColl)
{
-
oCn.RunProc("Insert into Cg_POInStockBillSub " +
" (HInterID,HEntryID,HMaterID,HUnitID" +
",HDate,HKFDate,HKFPeriod,HQty,HCheckQty,HPassQty,HBadQty,HPrice" +
@@ -92,16 +100,17 @@
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HRelationQty,HRelationMoney" +
",HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HWWOrderDetaiLID" +
",HPropertyID,HSecUnitID,HSecUnitRate,HTaxPrice,HTaxMoney,HMainSourceInterID,HBatChNo" +
- ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID) values("
+ ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD,HExpressNumberSub" +
+ ",HExpressSupplierSub,HPlanArrivalDate,HBoxNumber,HSupBatchNo,HSupMaterNumber,HTAXPRICE_T) values("//
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
",'" + oSub.HDate + "','" + oSub.HKFDate + "'," + oSub.HKFPeriod.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HPassQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HPrice.ToString() +
"," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HStatus + "," + oSub.HSPID.ToString() + ",'','" + oSub.HEntryCloseDate +
- "',0,''," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType.ToString() +
+ "',0,'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType.ToString() +
"'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HRelationQty + "," + oSub.HRelationMoney +
"," + oSub.HWWOrderInterID.ToString() + "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HWWOrderDetaiLID.ToString() +
"," + oSub.HPropertyID.ToString() + ",0," + oSub.HSecUnitRate.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HMainSourceInterID.ToString() + ",'" + oSub.HBatChNo +
- "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() +
- ") ");
+ "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() + "','" + oSub.HExpressNumberSub + "','" + oSub.HExpressSupplierSub + "','" + oSub.HPlanArrivalDate + "','" + oSub.HBoxNumber + "','" + oSub.HSupBatchNo +
+ "','" + oSub.HSupMaterNumber + "'," + oSub.HTAXPRICE_T + ") ");//鐗╂祦鍗曞彿涓虹憺涓庣惇浣跨敤
}
//
Ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString(), "H_p_SRM_POInStockBill_UpdateBillRelateData");
@@ -135,11 +144,25 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (omodel.HInterID == 0 || omodel.HInterID.ToString() == null || omodel.HInterID.ToString() == "undefined")
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
//omodel.HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ Ds = oCn.RunProcReturn("Exec h_p_SRM_POInStockBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "',1 ", " h_p_SRM_POInStockBill_BeforeSaveCtrl ");
+ if (Ds == null || DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //=========================================================
+
//涓昏〃
//鍑礉濂堢壒: HExpressSupplier,HReceiveGoodsMan,HReceiveGoodsLink
oCn.RunProc("Insert Into Cg_POInStockBillMain " +
@@ -150,7 +173,7 @@
",HMainSourceInterID,HBillStatus,HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HBackDate,HExpressSupplier,HReceiveGoodsMan"+
",HReceiveGoodsLink,HSendGoodsAddr,HSendGoodsMan,HSendGoodsLink,HPURCHASEORGID) " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
",'" + omodel.HAddress + "'," + omodel.HSupID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HExRate.ToString() + ",'" + omodel.HDHDate + "'" +
", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HDeliveryNo + "','" + omodel.HMainSourceBillType + "','" + omodel.HMainSourceBillNo + "'," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID +
"," + omodel.HBillStatus + "," + omodel.HCheckItemNowID + "," + omodel.HCheckItemNextID + "," + omodel.HCheckFlowID + ",'','" + omodel.HBackDate + "','" + omodel.HExpressSupplier + "','" + omodel.HReceiveGoodsMan + "','" + omodel.HReceiveGoodsLink + "','" + omodel.HSendGoodsAddr + "','" + omodel.HSendGoodsMan + "','" + omodel.HSendGoodsLink + "'," + omodel.HPURCHASEORGID + ") ");
@@ -205,6 +228,17 @@
//oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_Check " + omodel.HInterID.ToString() + "," + omodel.HBillerID.ToString());
////鏇存柊搴撳瓨
//oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_RelationInfoCtrl " + omodel.HInterID.ToString());
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ Ds = oCn.RunProcReturn("Exec h_p_SRM_POInStockBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "',1 ", " h_p_SRM_POInStockBill_AfterSaveCtrl ");
+ if (Ds == null || DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //=========================================================
+
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 83e556d..0c32da3 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -142,7 +142,9 @@
<Compile Include="SCM\ClsSup_EvaluateBillSub.cs" />
<Compile Include="SCM\ClsSup_EvaluateSchemeBillMain.cs" />
<Compile Include="SCM\ClsSup_EvaluateSchemeBillSub.cs" />
+ <Compile Include="SCM\ClsSupMaterPackBillMain.cs" />
<Compile Include="SCM\ClsSup_QuotePriceBillMain.cs" />
+ <Compile Include="SCM\ClsSupMaterPackBillSub.cs" />
<Compile Include="SCM\ClsSup_QuotePriceBillSub.cs" />
<Compile Include="SCM\ClsSup_SampleRequestBillMain.cs" />
<Compile Include="SCM\ClsSup_SampleRequestBillSub.cs" />
diff --git a/Model/SCM/ClsSupMaterPackBillMain.cs b/Model/SCM/ClsSupMaterPackBillMain.cs
new file mode 100644
index 0000000..f4c720c
--- /dev/null
+++ b/Model/SCM/ClsSupMaterPackBillMain.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSupMaterPackBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HSupID;// int --供应商
+ public string HBeginDate;// datetime --生效日期
+ public string HEndDate;// datetime --失效日期
+ public string HMakeEmp;// --创建人
+ public DateTime HMakeTime;// datetime --创建日期
+ public Int64 HUSEORGID;// datetime --使用组织
+ public Int64 HCREATEORGID;// datetime --创建组织
+ }
+}
diff --git a/Model/SCM/ClsSupMaterPackBillSub.cs b/Model/SCM/ClsSupMaterPackBillSub.cs
new file mode 100644
index 0000000..f108128
--- /dev/null
+++ b/Model/SCM/ClsSupMaterPackBillSub.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSupMaterPackBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+
+ public Int64 HMaterID;// int --物料内码(h_v_K3_Material)（比录，可编辑，带出物料代码，物料名称，规格，单位）
+ public Int64 HUnitID;// int --单位内码(h_v_K3_Unit)（比录，可编辑，带出单位代码，单位名称）
+ public decimal HMinPackQty;// dec(18,2) --最小包装数
+ public decimal HInBoxPackQty;// dec(18,2) --内箱包装数
+ public decimal HOutBoxPackQty;// dec(18,2) --外箱包装数
+ public int HPriority;// 优先级
+ }
+}
diff --git a/Model/WMS/ClsGy_BarCodeBill_WMS_Model.cs b/Model/WMS/ClsGy_BarCodeBill_WMS_Model.cs
index 2c91276..923fd97 100644
--- a/Model/WMS/ClsGy_BarCodeBill_WMS_Model.cs
+++ b/Model/WMS/ClsGy_BarCodeBill_WMS_Model.cs
@@ -36,5 +36,6 @@
public string HSupBatchNo; //供应商批次（凯贝）
public string HSupMaterNumber; //供应商料号 （凯贝）
public Int64 HISKFPERIOD; //是否启用保质期
+ public string HMaterNumber; //物料代码
}
}
--
Gitblit v1.9.1