From ba808fd016da0c89a12eee4de142365c5b83c3c8 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 29 十月 2021 10:41:12 +0800
Subject: [PATCH] 采购订单重新生成送货单方法重写 增加字段物流单号
---
WebAPI/Models/ClsCg_POInStockBillSubs.cs | 3
WebAPI/ListModels.cs | 12 ++
WebAPI/DLL/ClsCg_POInStockBills.cs | 316 ++++++++++++++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/POInStockController.cs | 14 +-
WebAPI/Models/ClsCg_POInStockBillMains.cs | 2
WebAPI/WebAPI.csproj | 1
6 files changed, 341 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 4e93d06..ae6a731 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -289,12 +289,12 @@
ListModels oListModels = new ListModels();
try
{
- DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
- List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>();
+ DAL.ClsCg_POInStockBills oBill = new DAL.ClsCg_POInStockBills();
+ List<Model.ClsCg_POInStockBillMains> lsmain = new List<Model.ClsCg_POInStockBillMains>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_POInStockMain(msg2);
- foreach (Model.ClsCg_POInStockBillMain oItem in lsmain)
+ lsmain = oListModels.getObjectByJson_POInStockMains(msg2);
+ foreach (Model.ClsCg_POInStockBillMains oItem in lsmain)
{
//oItem.HMaker = "";
UserName = oItem.HMaker;
@@ -322,10 +322,10 @@
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsCg_POInStockBillSub> ls = new List<Model.ClsCg_POInStockBillSub>();
- ls = oListModels.getObjectByJson_POInStockSub(msg3);
+ List<Model.ClsCg_POInStockBillSubs> ls = new List<Model.ClsCg_POInStockBillSubs>();
+ ls = oListModels.getObjectByJson_POInStockSubs(msg3);
int i = 0;
- foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
+ foreach (Model.ClsCg_POInStockBillSubs oItemSub in ls)
{
i++;
if (oItemSub.HQty <= 0)
diff --git a/WebAPI/DLL/ClsCg_POInStockBills.cs b/WebAPI/DLL/ClsCg_POInStockBills.cs
new file mode 100644
index 0000000..74df3b7
--- /dev/null
+++ b/WebAPI/DLL/ClsCg_POInStockBills.cs
@@ -0,0 +1,316 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+using WebAPI.Code;
+
+namespace DAL
+{
+ public class ClsCg_POInStockBills:DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsCg_POInStockBillMains omodel = new Model.ClsCg_POInStockBillMains();
+ public List<Model.ClsCg_POInStockBillSubs> DetailColl = new List<Model.ClsCg_POInStockBillSubs>();
+
+ public ClsCg_POInStockBills()
+ {
+ base.MvarItemKeySub = "Cg_POInStockBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="Cg_POInStockBillMain";
+ base.MvarReportTitle="鏀舵枡閫氱煡鍗�";
+ base.BillType="1103";
+ base.HBillSubType = "1103";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsCg_POInStockBills()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Cg_POInStockBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HDeliveryNo='" + omodel.HDeliveryNo + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HAddress='" + omodel.HAddress + "'" +
+ ",HSupID=" + omodel.HSupID.ToString() +
+ ",HCurID=" + omodel.HCurID.ToString() +
+ ",HWHID=" + omodel.HWHID.ToString() +
+ ",HExRate=" + omodel.HExRate.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsCg_POInStockBillSubs oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Cg_POInStockBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxPrice,HTaxMoney,HWHID" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HCheckQty,HPassQty,HBadQty" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HWHID.ToString() +
+ "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HCheckQty.ToString() + "," + oSub.HPassQty.ToString() + "," + oSub.HBadQty.ToString() +
+ ") ");
+ }
+ //
+ //鏇存柊璁㈠崟鍏宠仈鏁伴噺
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //鎺у埗鍏宠仈鏁伴噺
+ 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);
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
+ {
+ omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ }
+ if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ //
+ oCn.BeginTran();
+ //涓昏〃
+ string sql = "Insert Into Cg_POInStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
+ ",HYear,HPeriod,HRemark,HDeliveryNo,HMaker,HMakeDate" +
+ ",HAddress,HSupID,HCurID,HWHID,HExRate" +
+ ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMainSourceBillType + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HDeliveryNo + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ",'" + omodel.HAddress + "'," + omodel.HSupID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HExRate.ToString() +
+ ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ ") ";
+ LogService.Write(sql);
+ oCn.RunProc(sql);
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsCg_POInStockBillSubs oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Cg_POInStockBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxPrice,HTaxMoney,HWHID" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HCheckQty,HPassQty,HBadQty" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HWHID.ToString() +
+ "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HCheckQty.ToString() +","+oSub.HPassQty.ToString() +"," +oSub.HBadQty.ToString() +
+ ") ");
+ }
+ //
+ //鏇存柊婧愬崟鍗曞叧鑱旀暟閲� 锛堥噰璐鍗曪紝濮斿璁㈠崟锛�
+ AddNewRelation(ref sReturn, omodel.HInterID);
+ //
+ 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 Cg_POInStockBillMain Where HInterID=" + lngBillKey.ToString(), "Cg_POInStockBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ 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.HAddress = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAddress"]);
+ omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]);
+ omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
+ omodel.HExRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HExRate"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Cg_POInStockBillSub Where HInterID=" + lngBillKey.ToString(), "Cg_POInStockBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsCg_POInStockBillSubs oSub = new Model.ClsCg_POInStockBillSubs();
+ // 鍥哄畾璧嬪��===============================================
+ 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"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPassQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPassQty"]);
+ oSub.HBadQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HBadQty"]);
+ oSub.HCheckQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HCheckQty"]);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HTaxPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTaxPrice"]);
+ oSub.HTaxMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HTaxMoney"]);
+ oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ //鍒犻櫎鍏宠仈
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //澧炲姞閲囪喘璁㈠崟鍜屽澶栬鍗曞叧鑱旀暟閲�
+ try
+ {
+ if (omodel.HMainSourceBillType == "閲囪喘璁㈠崟")
+ {
+ oCn.RunProc("exec h_p_Cg_UpDatePOOrderRelation_Del " + lngBillKey.ToString());
+ }
+ else if (omodel.HMainSourceBillType == "濮斿璁㈠崟")
+ {
+ oCn.RunProc("exec h_p_WW_UpDateEntrustOrderRelation_Del " + lngBillKey.ToString());
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //鏂板鍏宠仈
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ //澧炲姞閲囪喘璁㈠崟鍜屽澶栬鍗曞叧鑱旀暟閲�
+ try
+ {
+ if (omodel.HMainSourceBillType == "閲囪喘璁㈠崟")
+ {
+ oCn.RunProc("exec h_p_Cg_UpDatePOOrderRelation_Add " + lngBillKey.ToString());
+ }
+ else if (omodel.HMainSourceBillType == "濮斿璁㈠崟")
+ {
+ oCn.RunProc("exec h_p_WW_UpDateEntrustOrderRelation_Add " + lngBillKey.ToString());
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 5bd2e11..c87ab0a 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -43,6 +43,12 @@
// return ls;
//}
}
+ public List<Model.ClsCg_POInStockBillSubs> getObjectByJson_POInStockSubs(string jsonString)
+ {
+ jsonString = "[" + jsonString + "]";
+ List<Model.ClsCg_POInStockBillSubs> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_POInStockBillSubs>>(jsonString);
+ return list;
+ }
/// <summary>
/// 灏唈son鏁版嵁杞崲鎴愬瓙琛ㄥ疄浣撶被
/// </summary>
@@ -67,6 +73,12 @@
List<Model.ClsCg_POInStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_POInStockBillMain>>(jsonString);
return list;
}
+ public List<Model.ClsCg_POInStockBillMains> getObjectByJson_POInStockMains(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_POInStockBillMains> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_POInStockBillMains>>(jsonString);
+ return list;
+ }
public List<Model.ClsGy_BarCodeBill_WMS_Model> getObjectByJson_BarCode(string jsonString)
{
jsonString = "[" + jsonString + "]";
diff --git a/WebAPI/Models/ClsCg_POInStockBillMains.cs b/WebAPI/Models/ClsCg_POInStockBillMains.cs
index a3817f0..15ffcd8 100644
--- a/WebAPI/Models/ClsCg_POInStockBillMains.cs
+++ b/WebAPI/Models/ClsCg_POInStockBillMains.cs
@@ -16,5 +16,7 @@
public Int64 HDeptID;// int --部门 (Gy_Employee)
public string HExplanation;// varchar(200) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
+ public DateTime HDHDate; //预计到货日期
+ public string HDeliveryNo; //物流单号
}
}
diff --git a/WebAPI/Models/ClsCg_POInStockBillSubs.cs b/WebAPI/Models/ClsCg_POInStockBillSubs.cs
index 38aab2f..2de33e3 100644
--- a/WebAPI/Models/ClsCg_POInStockBillSubs.cs
+++ b/WebAPI/Models/ClsCg_POInStockBillSubs.cs
@@ -22,5 +22,8 @@
public Int64 HPOOrderInterID;//
public Int64 HPOOrderEntryID;//
public string HPOOrderBillNo;//
+ public double HRQty;//未关联数量
+ public string HBatChNo; //批号
+
}
}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6c29760..3eba779 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -172,6 +172,7 @@
<Compile Include="Controllers\POOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportController.cs" />
+ <Compile Include="DLL\ClsCg_POInStockBills.cs" />
<Compile Include="ListModels.cs" />
<Compile Include="Models\ClsCg_POInStockBill.cs" />
<Compile Include="Models\ClsCg_POInStockBillMains.cs" />
--
Gitblit v1.9.1