From 2770c9950e43fc502ec37c966f4707ad071ad5fc Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 19 三月 2026 16:00:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/条码管理/WEBSController.cs | 1140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,105 insertions(+), 35 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index ed05dcf..b984b00 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -1454,7 +1454,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2642,7 +2642,7 @@
TopRowCount = 0,
StartRow = 0,
Limit = 0
- };;
+ }; ;
var _result = InvokeHelper.Query(sFormId, JsonConvert.SerializeObject(sJson));
var _saveObj = JArray.Parse(_result);
@@ -3353,6 +3353,10 @@
else if (lsmain[0].HMainSourceBillType == "3710")
{
websLsmain.HMainSourceBillType = "鐢熶骇璁㈠崟";
+ }
+ else if (lsmain[0].HMainSourceBillType == "1256")
+ {
+ websLsmain.HMainSourceBillType = "鐢熶骇棰嗘枡鐢宠鍗�";
}
else
{
@@ -4696,6 +4700,66 @@
#endregion
+ #region 鐢熶骇閫�搴� 涓婁紶鐢熷崟
+
+ #region 鐢熶骇閫�搴� 鏍￠獙妯″紡
+
+ /// <summary>
+ /// 鐢熶骇閫�搴撴牎楠屼笂浼�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveProductInBackBill_BillCheck_Json")]
+ [HttpPost]
+ public object set_SaveProductInBackBill_BillCheck_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+
+ try
+ {
+ List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getICStockBillMainByJson(msg1);
+
+ WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1245";
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SaveProductInBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇閫�搴撴牎楠屽け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
#region 閲囪喘閫�鏂� 涓婁紶鐢熷崟
#region 閲囪喘閫�鏂� 鏂板妯″紡
@@ -4777,6 +4841,62 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "閲囪喘閫�鏂欏崟涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 閲囪喘閫�鏂� 鏍￠獙妯″紡
+
+ /// <summary>
+ /// 閲囪喘閫�鏂欐牎楠屼笂浼�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SavePOStockInBackBill_BillCheck_Json")]
+ [HttpPost]
+ public object set_SavePOStockInBackBill_BillCheck_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+
+ try
+ {
+ List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getICStockBillMainByJson(msg1);
+
+ WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1239";
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SavePOStockInBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲囪喘閫�鏂欐牎楠屽け璐ワ紒" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -5012,6 +5132,686 @@
#endregion
+ #region 閿�鍞��璐� 鏍￠獙妯″紡
+
+ /// <summary>
+ /// 閿�鍞��璐ф牎楠屼笂浼�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveSellOutBackBill_BillCheck_Json")]
+ [HttpPost]
+ public object set_SaveSellOutBackBill_BillCheck_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+
+ try
+ {
+ List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getICStockBillMainByJson(msg1);
+
+ WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1247";
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SaveSellOutBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿�鍞��璐ф牎楠屽け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+ #region 濮斿閫�鏂� 涓婁紶鐢熷崟
+
+ #region 濮斿閫�鏂� 鏍￠獙妯″紡
+
+ /// <summary>
+ /// 濮斿閫�鏂欐牎楠屼笂浼�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveEntrustOutBackBill_BillCheck_Json")]
+ [HttpPost]
+ public object set_SaveEntrustOutBackBill_BillCheck_Json([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+
+ try
+ {
+ List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
+ ListModels oListModels = new ListModels();
+ lsmain = oListModels.getICStockBillMainByJson(msg1);
+
+ WebAPI.WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();
+
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HBillType = "1238";
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+
+ if (oWebs.set_SaveEntrustOutBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "濮斿閫�鏂欐牎楠屽け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+ #region 妫�楠屽崟 涓婁紶鐢熷崟
+
+ #region 妫�楠屽崟 鍚堟牸鍝�
+
+ /// <summary>
+ /// 妫�楠屽崟鏂板涓婁紶
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/set_SaveQCPOStockInCheckBill_Json")]
+ [HttpGet]
+ public object set_SaveQCPOStockInCheckBill_Json(Int64 HInterID, string HBillNo, string HSourceBillType, string HSourceBillNo, Int64 HSourceInterID, string sHSourceEntryID, Int64 HFirstCheckEmp, string HMaker)
+ {
+ try
+ {
+ ClsQC_POStockInCheckBillMain oMain = new ClsQC_POStockInCheckBillMain();
+ oMain.HInterID = HInterID;
+ oMain.HBillNo = HBillNo;
+ oMain.HBillType = "7503";
+ oMain.HDate = DateTime.Today;
+ oMain.HMainSourceBillType = HSourceBillType;
+ oMain.HMainSourceBillNo = HSourceBillNo;
+ oMain.HMainSourceInterID = HSourceInterID;
+ oMain.HFirstCheckEmp = HFirstCheckEmp;
+ oMain.HMaker = HMaker;
+
+ if (set_SaveQCPOStockInCheckBill(oMain, HSourceBillType, sHSourceEntryID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "妫�楠屽崟涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鐢熸垚妫�楠屽崟
+ public bool set_SaveQCPOStockInCheckBill(Model.ClsQC_POStockInCheckBillMain oMain, string HSourceBillType, string sHSourceEntryID, ref string sErrMsg)
+ {
+ string sRemark = "";
+ string HReturn;
+
+ //涓婁紶鍓嶅垽鏂�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet BfDs = oCn.RunProcReturn("exec h_p_QC_BeforeUpload_POStockInCheckBill " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + HSourceBillType + "','" + sHSourceEntryID + "'," + oMain.HFirstCheckEmp.ToString(), "h_p_QC_BeforeUpload_POStockInCheckBill");
+ if (BfDs == null || BfDs.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "涓婁紶鍓嶅垽鏂暟鎹畬鏁存�уけ璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BfDs.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛�" + DBUtility.ClsPub.isStrNull(BfDs.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ sRemark = sRemark + " 锛涗笂浼犲墠鍒ゆ柇" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //杩斿洖鎵�闇�鏁版嵁
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("exec h_p_QC_POStockInCheckBill_CLD " + oMain.HMainSourceInterID.ToString() + ",'" + sHSourceEntryID + "'," + oMain.HFirstCheckEmp.ToString(), "h_p_QC_POStockInCheckBill_CLD");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
+ {
+ sErrMsg = "鏍规嵁鏀舵枡閫氱煡鍗曪細" + oMain.HMainSourceBillNo + " 鑾峰彇鏁版嵁澶辫触锛�";
+ return false;
+ }
+ sRemark = sRemark + " 锛涜幏鍙朇LOUD鍗曟嵁API閫掑叆鍊�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //鑾峰彇鍗曟嵁涓昏〃鎵�闇�鏁版嵁
+ oMain.HSupID = Pub_Class.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ oMain.HSTOCKORGID = Pub_Class.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSTOCKORGID"]);
+
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
+ {
+ sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ return false;
+ }
+
+ try
+ {
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ sErrMsg = s;
+ return false;
+ }
+ oMain.HYear = sYear;
+ oMain.HPeriod = sPeriod;
+
+ oCn.BeginTran();
+ //鐢熸垚妫�楠屽崟
+ //鍐欏叆涓昏〃
+ oCn.RunProc("Insert Into QC_POStockInCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HSTOCKORGID,HSupID,HMaterID" +
+ ",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" +
+ ",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" +
+ ") " +
+ " values('" + oMain.HBillType + "','" + oMain.HBillType + "'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HDate.ToShortDateString() + "','" + oMain.HMaker + "',getdate()" +
+ ", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "'," + oMain.HSTOCKORGID.ToString() + "," + oMain.HSupID.ToString() + "," + oMain.HMaterID.ToString() +
+ ", " + oMain.HCheckQty.ToString() + "," + oMain.HCheckQty.ToString() + "," + oMain.HRightQty.ToString() + "," + oMain.HBadQty.ToString() + "," + oMain.HFirstCheckEmp.ToString() +
+ ",'" + oMain.HCheckerResult + "','" + oMain.HSteelStoveNo + "','" + oMain.HSteelCompReport + "','" + oMain.HAspect + "','" + oMain.HSize + "'" +
+ ") ");
+
+ //鍐欏叆瀛愯〃
+ for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
+ {
+ Model.ClsQC_POStockInCheckBillSub oSub = new Model.ClsQC_POStockInCheckBillSub();
+ oSub.HEntryID = i + 1;
+ oSub.HSourceInterID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillNo = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HSourceBillNo"]);
+ oSub.HSourceBillType = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HSourceBillType"]);
+ oSub.HResult = "鍚堟牸";
+ oSub.HProcCheckEmp = oMain.HFirstCheckEmp;
+ oSub.HMaterID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HMaterID"]);
+ oSub.HInStockQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HInStockQty"]);
+ oSub.HCheckQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HCheckQty"]);
+ oSub.HRightQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HRightQty"]);
+ oSub.HBadQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HBadQty"]);
+
+ oCn.RunProc("Insert Into QC_POStockInCheckBillSub " +
+ "(HInterID,HEntryID,HBillNo_bak,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue" +
+ ",HResult,HProcCheckEmp,HProcCheckTime" +
+ ",HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty" +
+ ") " +
+ " values(" + oMain.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oMain.HBillNo + "','" + oSub.HRemark + "'" +
+ ", " + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ ", " + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "'" +
+ ",'" + oSub.HResult + "'," + oSub.HProcCheckEmp.ToString() + ",getdate()" +
+ ", " + oSub.HMaterID.ToString() + "," + oSub.HInStockQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HRightQty.ToString() + "," + oSub.HBadQty.ToString() +
+ ") ");
+ }
+ sRemark = sRemark + " 锛涚敓鎴愭楠屽崟鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //鑾峰彇閲戣澏浜慉PI鎵�闇�閫掑叆鏁版嵁
+ string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+
+ string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{\"FBillNo\":\"" + oMain.HBillNo + "\"," +
+ //\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
+ "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" }," +
+ "\"FBusinessType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBusinessType"]) + "\"," +
+ "\"FDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDATE"]) + "\"," +
+ "\"FSourceOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSourceOrgId"]) + "\"}," +
+ "\"FInspectOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectOrgId"]) + "\"}," +
+ "\"FInspectDepId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectDepId"]) + "\"}," +
+ //"\"FInspectGroupId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectGroupId"]) + "\"}," +
+ "\"FInspectorId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectorId"]) + "\"}," +
+ //"\"FDescription\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDescription"]) + "\"," +
+ //"\"FUpScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FUpScanBox"]) + "\"," +
+ //"\"FDefScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDefScanBox"]) + "\"," +
+ //"\"FCheckQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FCheckQty"]) + "\"," +
+ //"\"FInspectValScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectValScanBox"]) + "\"," +
+ "\"FIsSynced\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FIsSynced"]) + "\"," +
+ sJson_MainCustom +
+ "\"FEntity\":[";
+ string sJson_Entry = "";
+ for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
+ {
+ if (sJson_Entry != "")
+ {
+ sJson_Entry = sJson_Entry + " , ";
+ }
+ string sJson_BatchNo = "";
+ string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
+ string sJson_FAUXPROPID = "";
+ string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
+
+ //瀛愯〃鑷畾涔夊瓧娈�
+ sJson_SubCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["SubCustom"]);
+
+ //鏄惁鍚敤鎵规绠＄悊
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1")
+ {
+ sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
+ }
+ else
+ {
+ sJson_BatchNo = "";
+ }
+
+ //鏄惁鍚敤淇濊川鏈熸帶鍒�
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ {
+ sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ }
+ else
+ {
+ sJson_FProduceDate = "";
+ sJson_FExpiryDate = "";
+ }
+
+ //鏄惁鍚敤浠撲綅
+ if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) == "")
+ {
+ sJson_StockPlace = "";
+ }
+ else
+ {
+ sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
+ }
+
+ //杈呭姪灞炴��
+ sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";
+
+ sJson_Entry = sJson_Entry + "{" +
+ //"FEntryID": 0,
+ "\"FMaterialId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMaterialId"]) + "\"}," +
+ //"FQCSchemeId": {"FNUMBER": ""},
+ "\"FUnitID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnitID"]) + "\"}," +
+ "\"FInspectQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectQty"]) + "\"," + //妫�楠屾暟閲�
+ "\"FQualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQualifiedQty"]) + "\"," + //鍚堟牸鏁伴噺
+ "\"FUnqualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnqualifiedQty"]) + "\"," + //涓嶅悎鏍兼暟閲�
+ //"FSampleDamageQty": 0,
+ //"FSUnqualifiedQty": 0,
+ "\"FInspectResult\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectResult"]) + "\"," + //妫�楠岀粨鏋�
+ "\"FQCStatus\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQCStatus"]) + "\"," + //璐ㄦ鐘舵��
+ //"FBaseSUnqualifiedQty": 0,
+ //"FSampleQty": 0,
+ //"FMemo": "",
+ "\"FIsRelated\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsRelated"]) + "\"," +
+ "\"FSrcBillType0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillType0"]) + "\"," +
+ "\"FSrcBillNo0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillNo0"]) + "\"," +
+ "\"FSrcInterId0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcInterId0"]) + "\"," +
+ "\"FSrcEntryId0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntryId0"]) + "\"," +
+ "\"FSrcEntrySeq0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntrySeq0"]) + "\"," +
+ "\"FBaseUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseUnitId"]) + "\"}," +
+ //"FQCBusinessType": "",
+ //"FBFLowId": {"FNAME": ""},
+ //"FSampleSchemeId": {"FNUMBER": ""},
+ //"FAcceptQty": 0,
+ //"FRejectQty": 0,
+ //"FInspectEndDate": "1900-01-01",
+ "\"FBaseInspectQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseInspectQty"]) + "\"," + //鍩烘湰鍗曚綅妫�楠屾暟閲�
+ "\"FSupplierId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSupplierId"]) + "\"}," +
+ //"FCustomerId": {"FNUMBER": ""},
+ //"FProductLineId": {"FNUMBER": ""},
+ //"FPrdLineLocation": {"FLOCATIONCODE": ""},
+ //"FWorkshopId": {"FNUMBER": ""},
+ "\"FStockId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockId"]) + "\"}," +
+ sJson_BatchNo +
+ "\"FInspectTimes\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectTimes"]) + "\"," + //妫�楠屾鏁�
+ sJson_StockPlace +
+ //"FConsumeTime": 0,
+ //"FInspectStartDate": "1900-01-01",
+ "\"FTimeUnit\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTimeUnit"]) + "\"," +
+ //"FBaseSampleDamageQty": 0,
+ //"FBaseUnqualifiedQty": 0,
+ //"FOperNumber": 0,
+ "\"FSampleDamageBearer\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSampleDamageBearer"]) + "\"," +
+ "\"FIsFirstInspect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsFirstInspect"]) + "\"," +
+ "\"FBaseQualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseQualifiedQty"]) + "\"," + //鍩烘湰鍗曚綅鍚堟牸鏁�
+ "\"FBaseAcceptQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseAcceptQty"]) + "\"," + //鍩烘湰鍗曚綅鎺ユ敹鏁�
+ sJson_FAUXPROPID +
+ //"FPrdUnitId": {"FNumber": ""},
+ //"FBaseReAcceptQty": 0,
+ //"FOperDescription": "",
+ //"FUnitTransHeadQty": 0,
+ //"FUnitTransOperQty": 0,
+ //"FSNUnitID": {"FNumber": ""},
+ //"FBaseWBInspectQty": 0,
+ //"FBaseUnQuaSalQty": 0,
+ //"FSupplierLot": "",
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
+ //"FNewExpiryDate": "1900-01-01",
+ "\"FCurrency\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCurrency"]) + "\"}," +
+ //"FDiscountQty": 0,
+ "\"FIsSplitRow\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsSplitRow"]) + "\"," +
+ sJson_SubCustom +
+
+ //浣跨敤鍐崇瓥琛ㄤ綋
+ "\"FPolicyDetail\": [ { " +
+ //"FDetailID": 0,
+ "\"FPolicyMaterialId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyMaterialId"]) + "\"}," +
+ "\"FPolicyStatus\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyStatus"]) + "\"," +
+ "\"FPolicyQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyQty"]) + "\"," +
+ "\"FBasePolicyQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBasePolicyQty"]) + "\"," +
+ "\"FUsePolicy\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUsePolicy"]) + "\"," +
+ //"FSerialId": { "FNUMBER": ""},
+ "\"FIsCheck\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsCheck"]) + "\"," +
+ "\"FIsDefectProcess\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsDefectProcess"]) + "\"," +
+ "\"FCanSale\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCanSale"]) + "\"," +
+ "\"FIsMRBReview\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsMRBReview"]) + "\"," +
+ "\"FIsReturn\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsReturn"]) + "\"," +
+ "\"FIsRelatedDefect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsRelatedDefect"]) + "\"" +
+ //"FMRBReviewStatus": "",
+ //"FBoxNumber": "",
+ //"FMemo1": "",
+ //"FPolicyAuxPropId": {"FPOLICYAUXPROPID__FF100005": { "FNumber": ""},"FPOLICYAUXPROPID__FF100002": { "FNumber": ""}}
+ " } ]," +
+
+ //缂洪櫡璁板綍琛ㄤ綋
+ //"\"FDefectDetail\": [ { " +
+ ////"FDetailID": 0,
+ ////"FDSerialId": {"FNUMBER": ""},
+ ////"FDefectTypeId": {"FNUMBER": ""},
+ ////"FDefectQty": 0,
+ ////"FBaseDefectQty1": 0,
+ ////"FDefectReasonId": {"FNUMBER": ""},
+ ////"FDefectLevel": "",
+ ////"FDefectResultId": {"FNUMBER": ""},
+ ////"FDefectMemo": ""
+ //" } ]," +
+
+ //妫�楠岄」鐩〃浣�
+ //"\"FItemDetail\": [ { " +
+ ////"FDetailID": 0,
+ ////"FInspectItemId": { "FNUMBER": ""},
+ ////"FInspectResult1": "",
+ ////"FAnalysisMethod": "",
+ ////"FQualityStdId": { "FNUMBER": ""},
+ ////"FUnitId2": { "FNUMBER": ""},
+ ////"FInspectValQ": 0,
+ ////"FInspectValB": { "FNUMBER": ""},
+ ////"FInspectValT": "",
+ ////"FInspectMethodId": { "FNUMBER": ""},
+ ////"FInspectInstrumentId": { "FNUMBER": ""},
+ ////"FDefectlevel1": "",
+ ////"FDestructInspect": "false",
+ ////"FKeyInspect": "false",
+ ////"FInspectBasisId": { "FNUMBER": ""},
+ ////"FSampleSchemeId1": { "FNUMBER": ""},
+ ////"FItemStatus": "",
+ ////"FCompareSymbol": "",
+ ////"FSampleQty1": 0,
+ ////"FAcceptQty1": 0,
+ ////"FRejectQty1": 0,
+ ////"FSampleDamageQty1": 0,
+ ////"FBaseSampleDamageQty1": 0,
+ ////"FItemMemo": "",
+ ////"FSUnqualifiedQty1": 0,
+ ////"FBaseSUnqualifiedQty1": 0,
+ ////"FTargetVal": "",
+ ////"FInspectVal": "",
+ ////"FUpLimit": "",
+ ////"FDownLimit": "",
+ ////"FUpOffset": "",
+ ////"FDownOffset": "",
+ ////"FInspectValKey": "",
+ ////"FTargetValKey": "",
+ ////"FUpLimitKey": "",
+ ////"FDownLimitKey": "",
+ ////"FUpOffsetKey": "",
+ ////"FDownOffsetKey": "",
+ ////"FTargetValQ": 0,
+ ////"FUpLimitQ": 0,
+ ////"FDownLimitQ": 0,
+ ////"FUpOffsetQ": 0,
+ ////"FDownOffsetQ": 0,
+ ////"FTargetValB": { "FNUMBER": ""},
+ ////"FUpLimitB": { "FNUMBER": ""},
+ ////"FDownLimitB": { "FNUMBER": ""},
+ ////"FUpOffsetB": { "FNUMBER": ""},
+ ////"FDownOffsetB": { "FNUMBER": ""},
+ ////"FTargetValT": "",
+ ////"FUpLimitT": "",
+ ////"FDownLimitT": "",
+ ////"FUpOffsetT": "",
+ ////"FDownOffsetT": "",
+ ////"FValueGrid": [
+ //// {
+ //// "FGridId": 0,
+ //// "FInspectResult2": "",
+ //// "FInspectValueB": { "FNUMBER": ""},
+ //// "FInspectValueT": "",
+ //// "FInspectValue": 0,
+ //// "FVSerialId": { "FNUMBER": ""}
+ //// }
+ ////]
+ //" } ]," +
+
+ //鍙傝�冭〃浣�
+ "\"FReferDetail\": [ { " +
+ //"FDetailID": 0,
+ "\"FSrcBillType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillType"]) + "\"," +
+ "\"FSrcBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillNo"]) + "\"," +
+ "\"FSrcInterId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcInterId"]) + "\"," +
+ "\"FSrcEntryId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntryId"]) + "\"," +
+ "\"FSrcEntrySeq\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntrySeq"]) + "\"," +
+ "\"FOrderType\":{\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderType"]) + "\"}," +
+ "\"FOrderBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderBillNo"]) + "\"," +
+ "\"FOrderId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderId"]) + "\"," +
+ "\"FOrderEntryId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderEntryId"]) + "\"," +
+ "\"FOrderEntrySeq\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderEntrySeq"]) + "\"" +
+ " } ]," +
+
+ //鍏宠仈鍏崇郴琛�
+ "\"FEntity_Link\": [ { " +
+ "\"FEntity_Link_FFlowId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FFlowId"]) + "\"," +
+ "\"FEntity_Link_FFlowLineId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FFlowLineId"]) + "\"," +
+ "\"FEntity_Link_FRuleId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FRuleId"]) + "\"," +
+ "\"FEntity_Link_FSTableName\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSTableName"]) + "\"," +
+ "\"FEntity_Link_FSBillId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSBillId"]) + "\"," +
+ "\"FEntity_Link_FSId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSId"]) + "\"," +
+ "\"FEntity_Link_FBaseAcceptQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseAcceptQty"]) + "\"," +
+ "\"FEntity_Link_FBaseAcceptQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseAcceptQtyOld"]) + "\"," +
+ "\"FEntity_Link_FBaseInspectQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseInspectQtyOld"]) + "\"," +
+ "\"FEntity_Link_FInspectQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FInspectQtyOld"]) + "\"" +
+ " } ] } ";
+ }
+ string sJson_End = " ] }}";
+ string sJson = sJson_Main + sJson_Entry + sJson_End;
+
+ //CLOUD閲戣澏浜戣处鍙峰瘑鐮佺櫥鍏�
+ var loginRet = InvokeHelper.LoginUser(oMain.HMaker);
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ sRemark = sRemark + " 锛涜幏鍙栭獙璇丆LOUD璐﹀彿瀵嗙爜" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //鐢熸垚閲戣澏浜戝崟鎹�
+ if (isSuccess == 1)
+ {
+ string result = InvokeHelper.Save("QM_InspectBill", sJson); //淇濆瓨
+ sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚妫�楠屽崟澶辫触锛侀噾铦朵簯鎻愮ず锛�" + strErrorMsg;
+ LogService.Write("鐢熸垚妫�楠屽崟澶辫触锛�" + HReturn + sJson); //鍐欏叆txt鏂囨湰
+ oCn.RollBack();
+ return false;
+ }
+ else
+ {
+ sRemark = sRemark + sJson;
+ // 鎻愪氦鍜屼繚瀛樺崟鎹�
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+ var fID = JObject.Parse(result)["Result"]["Id"].ToString();
+ var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ var json = new
+ {
+ Ids = fID,
+ };
+
+ result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
+ result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//瀹℃牳
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCn.RollBack();
+ sErrMsg = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ return false;
+ }
+ oCn.Commit();
+ }
+ }
+ else
+ {
+ sErrMsg = "鐢熸垚妫�楠屽崟澶辫触锛侀噾铦朵簯鐧诲綍澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("鐢熸垚鍥炴粴" + e.Message + sRemark);
+ sErrMsg = "鐢熸垚妫�楠屽崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+
+ if (oSystemParameter.omodel.QC_POStockInCheckBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ try
+ {
+ oCn.BeginTran();
+ //瀹℃牳WMS鍗曟嵁
+ oCn.RunProc("Update QC_POStockInCheckBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
+
+ //鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = InvokeHelper.Submit("QM_InspectBill", sJson2); //鎻愪氦
+ sRemark = sRemark + " 锛涙彁浜LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ var result3 = InvokeHelper.Audit("QM_InspectBill", sJson2); //瀹℃牳
+ sRemark = sRemark + " 锛涘鏍窩LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ HReturn = result2.ToString() + "," + result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鐢熸垚妫�楠屽崟鎴愬姛锛屽鏍稿崟鎹け璐ワ紒閲戣澏浜戞彁绀猴細" + strErrorMsg;
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark + HReturn);
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞跺鏍告楠屽崟鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚骞跺鏍告楠屽崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ LogService.Write("瀹℃牳鍥炴粴" + sRemark + HReturn);
+ sErrMsg = "瀹℃牳妫�楠屽崟澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else
+ {
+ LogService.Write("鐢熸垚妫�楠屽崟鎴愬姛锛�" + sRemark);
+ sErrMsg = "鐢熸垚妫�楠屽崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ return true;
+ }
+ }
+
+ #endregion
+
#endregion
#region 鐢熶骇缁勬墭鍗� 涓婁紶鐢熷崟
@@ -5063,7 +5863,7 @@
try
{
- DataSet ds=oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where 鏍堟澘鐮�='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
+ DataSet ds = oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where 鏍堟澘鐮�='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -5308,7 +6108,7 @@
{
//鍒犻櫎鍓嶆帶鍒�=========================================
- DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString() , "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");
+ DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString(), "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");
if (dds == null)
{
@@ -7624,7 +8424,7 @@
#region 绯荤粺鍙傛暟鑾峰彇
//鐢熶骇棰嗘枡鍗�-鍏堣繘鍏堝嚭鎺у埗
- if (HBillType == "1204"
+ if (HBillType == "1204"
&& oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "N" //鍏嶆壂鐗╂枡鏉＄爜妯″紡锛�'Y'涓轰笉鎵墿鏂欐潯鐮侊級
&& oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
&& (oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "1" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "2" || oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "3"))
@@ -8439,7 +9239,7 @@
{
try
{
- ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
+ ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -8583,7 +9383,7 @@
#endregion
#region 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿瀹㈡埛绠憋紙鎵橈級鏉＄爜 -鍑礉瑁呯鍗� 20251103
-
+
[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
[HttpGet]
public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
@@ -9066,6 +9866,29 @@
#endregion
+ #endregion
+
+ #region 鏍规嵁sn鐮佸鎵惧搴旂殑涓鐮�
+ [Route("WEBSController/getMiddleCodeBySn")]
+ [HttpGet]
+ public object getMiddleCodeBySn(string HBarCode, int HStockOrgID)
+ {
+ DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='" + HBarCode + "'", "Gy_CaseCodeRelation");
+
+ if (dss.Tables[0].Rows[0]["HCaseCode"].ToString() == "" || dss == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈壘鍒皊n鐮佹墍瀵瑰簲鐨勪腑绠辩爜";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = dss.Tables[0];
+ return objJsonResult;
+ }
#endregion
#endregion
@@ -13619,11 +14442,11 @@
/// <returns></returns>
[Route("WEBSController/BindCarAndWH")]
[HttpGet]
- public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID,int bindsignal)
+ public object BindCarAndWH(string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID, int bindsignal)
{
try
{
- ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString()+","+ bindsignal, "h_p_bindingCarintoWh");
+ ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker + "'," + HStockOrgID.ToString() + "," + bindsignal, "h_p_bindingCarintoWh");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -13667,7 +14490,7 @@
// 杞Щ妯″潡
[Route("WEBSController/CheckHW")]
[HttpGet]
- public object CheckHW(int HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
+ public object CheckHW(int HWhID, int HSPID, int HWhID2, int HSPID2, string HBarCode, string HCarBarCode1, string HCarBarCode2, string UserID)
{
try
{
@@ -13716,7 +14539,7 @@
[HttpGet]
public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
{
-
+
try
{
WebSoBar = null;
@@ -13728,7 +14551,7 @@
List<string> HBillNoList = new List<string>();
foreach (DataRow row in ds.Tables[0].Rows)
{
- if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())){
+ if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())) {
// 2. 鍒ゆ柇鍗曟嵁瀹℃牳鐘舵�侊紝鏌ユ壘鏈瀹℃牳鐨勫崟鎹�
WebSoBar = oWebs.get_BillBarCode_BillCheck(row["HBillNo"].ToString(), HBillType, row["HMaker"].ToString(), HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
@@ -13783,7 +14606,7 @@
{
try
{
-
+
string sql = $"exec [h_p_Sc_ICMOBillWorkQtyStatus_Save] {HInterID}";
ds = oCn.RunProcReturn(sql, "[h_p_Sc_ICMOBillWorkQtyStatus_Save]");
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -13826,25 +14649,29 @@
#region 妫�楠屽崟 鎵弿婧愬崟 鏍规嵁鍗曟嵁绫诲瀷 婧愬崟绫诲瀷 婧愬崟鍙� 瑙ｆ瀽骞惰繑鍥炴楠岄」鐩�
[Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
[HttpGet]
- public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode,string user)
+ public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode, string user)
{
try
{
+ string sErrMsg = "";
+ oSystemParameter.ShowBill(ref sErrMsg);
+ // 鍗庤垷瀹㈡埛
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ if (!string.IsNullOrWhiteSpace(HBarCode))
+ {
+ HBarCode = HBarCode.Split('-')[0];
+ }
+ }
+
// Mode = 1 琛ㄧず 鎵爜妯″紡 Mode = 2 琛ㄧず 閫夊崟妯″紡
- if(Mode == 1)
+ if (Mode == 1)
{
//鎵爜妯″紡闇�瑕佽В鏋愭潯鐮佽幏鍙朒InterID鍜孒EntryID
- LogService.Write($@"
- exec h_p_CheckBillBarCode_AnalysisBarcode
- @HBillType={HBillType},
- @HSourceBillType={HSourceBillType},
- @HBarCode='{HBarCode}',
- @user = '{user}'
- ");
ds = oCn.RunProcReturn($@"
exec h_p_CheckBillBarCode_AnalysisBarcode
- @HBillType={HBillType},
- @HSourceBillType={HSourceBillType},
+ @HBillType='{HBillType}',
+ @HSourceBillType='{HSourceBillType}',
@HBarCode='{HBarCode}',
@user = '{user}'
", "h_p_CheckBillBarCode_AnalysisBarcode");
@@ -13862,21 +14689,45 @@
HEntryID = ds.Tables[0].Rows[0]["HEntryID"].ToString();
}
// 閫夊崟妯″紡鐩存帴閫掑叆HInterID 鍜� HEntryID 鏍规嵁 鍙栬川妫�鏂规鏉ユ簮 鑾峰彇 妫�楠岄」鐩�
- ds = oCn.RunProcReturn($@"
- exec h_p_CheckBillBarCode_CheckItem
- @HBillType={HBillType},
- @HSourceBillType={HSourceBillType},
- @HInterID={HInterID},
- @HEntryID={HEntryID}
- ", "h_p_CheckBillBarCode_CheckItem");
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ //鍗庤垷鍋氭湯浠剁殑鏃跺�� 瑕佺煡閬撴垜杩欎釜鏉＄爜 瀵瑰簲鐨勬暟閲忔槸澶氬皯锛屽彧鑳芥妸鏉＄爜浼犲叆杩涘幓杩涜鏌ユ壘
+ ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
+ @HInterID='{HInterID}',@HEntryID='{HEntryID}',@HBarCode='{HBarCode}'", "h_p_CheckBillBarCode_CheckItem");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
+ @HInterID='{HInterID}',@HEntryID='{HEntryID}'", "h_p_CheckBillBarCode_CheckItem");
+ }
+
- if(ds.Tables[0].Rows.Count == 0)
+ if (ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛佹棤缁戝畾璐ㄦ鏂规淇℃伅";
objJsonResult.data = null;
return objJsonResult;
+ }
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ if (HBillType == 7507) // 鍗曟嵁绫诲瀷鏄湯浠舵楠屽崟 鏌ユ壘鍗曟嵁鏄惁閲嶅锛屾楠屾槸鍚﹀悎鏍硷紝鍗曟嵁閲嶅闇�瑕佽繑鍥炰笉鍚岀殑鐘舵��
+ {
+ var ds2 = oCn.RunProcReturn($"select top 1 * from QC_ProcessCheckBillMain where HMainSourceBillNo = '{HBarCode}' order by HDate desc", "QC_ProcessCheckBillMain");
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ if (ds2.Tables[0].Rows[0]["HCheckerResult"].ToString() == "true") // 妫�楠屽悎鏍兼彁绀烘槸鍚﹂渶瑕佹柊澧�
+ {
+ objJsonResult.code = "2"; // 杩斿洖Code涓�2琛ㄧず鍗曟嵁閲嶅锛岄渶瑕佹彁绀烘槸鍚﹂渶瑕佹柊澧炲崟鎹�
+ objJsonResult.count = 1;
+ objJsonResult.Message = "success锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ }
}
objJsonResult.code = "1";
@@ -13890,7 +14741,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛�" + e.Message.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -13945,14 +14796,14 @@
#endregion
#region 娣诲悍鏍规嵁灏忚溅鏉＄爜鎵惧嚭鐩稿簲鐗╂枡
-
+
[Route("WEBSController/GetMaterIDByCarBarCode")]
[HttpGet]
public object GetMaterIDByCarBarCode(string CarBarCode)
{
try
{
- ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where 灏忚溅='" + CarBarCode.ToString() + "'" , "GetMaterMesByCarBarCode");
+ ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and 灏忚溅='" + CarBarCode.ToString() + "'", "GetMaterMesByCarBarCode");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -14029,5 +14880,224 @@
}
}
#endregion
+
+ #region 瑁呯杩芥函
+
+ #region [瑁呯杩芥函] 鎵弿SN鏉＄爜
+ [Route("WEBSController/get_SNBarCode_PackUnionCarryUp")]
+ [HttpGet]
+ public object get_SNBarCode_PackUnionCarryUp(string sHBarCode, int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
+ {
+ if (oWebs.get_SNBarCode_PackUnionCarryUp(sHBarCode, sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鎵弿绠辨潯鐮�
+ [Route("WEBSController/get_BarCode_PackUnionCarryUp")]
+ [HttpGet]
+ public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
+ {
+ var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, sBillNo, HBillType, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ if (oBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = oBar;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鑾峰彇琛ㄤ綋鐗╂枡淇℃伅
+ [Route("WEBSController/GetBillEntry_TmpList_PackUnionCarryUp")]
+ [HttpGet]
+ public object GetBillEntry_TmpList_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, int HStockOrgID)
+ {
+ DataSet oDs = oWebs.GetBillEntry_TmpList_PackUnionCarryUp(sInterID, sBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
+ if (oDs == null || oDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鍒犻櫎
+ [Route("WEBSController/set_DelPackUnionBill_Temp_Pack")]
+ [HttpGet]
+ public object set_DelPackUnionBill_Temp_Pack(int HInterID)
+ {
+ if (oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 涓婁紶鐢熷崟
+ [Route("WEBSController/set_SavePackUnionCarryUpBill")]
+ [HttpPost]
+ public object set_SavePackUnionCarryUpBill(string ModRightNamePackUnionCarryUp, int sInterID,
+ string HBillType, string sBillNo, string sHBarCode_Pack,
+ string sMaker, int HStockOrgID)
+ {
+ if (!oWebs.CheckModRight(ModRightNamePackUnionCarryUp, DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sErrInfo))
+ {
+ // 閴存潈
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閴存潈澶辫触锛岃鐢ㄦ埛鏃犳潈闄愪笂浼犲崟鎹�! "; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if(oWebs.set_SavePackUnionCarryUpBill_New(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚鐢熶骇瑁呯杩芥函鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + sBillNo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 缂栬緫缂撳瓨鍒楄〃鍗曟嵁
+ [Route("WEBSController/TempList_Modify_Pack")]
+ [HttpGet]
+ public object TempList_Modify_Pack(Int64 HInterID, string HBillNo, string HBillType)
+ {
+ if(oWebs.TempList_Modify_Pack(HInterID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ // 鎴愬姛 (鏃犲凡涓婁紶璁板綍)
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ else
+ {
+ // 澶辫触
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鑾峰彇缂撳瓨鍒楄〃
+ [Route("WEBSController/GetSc_PackUnionBill_TempList_Pack")]
+ [HttpGet]
+ public object GetSc_PackUnionBill_TempList(string HBillType, string HMaker, Int64 HStockOrgID)
+ {
+ DataSet oDs = oWebs.GetSc_PackUnionBill_TempList(HBillType, HMaker, HStockOrgID);
+ if(oDs == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = oDs.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [瑁呯杩芥函] 鍒犻櫎缂撳瓨鍒楄〃鍗曟嵁
+ [Route("WEBSController/DeleteTemp_PackUnionBill_Pack")]
+ [HttpGet]
+ public object DeleteTemp_PackUnionBill_Pack(Int64 HInterID)
+ {
+ if(oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
+ {
+ // 鍒犻櫎鎴愬姛
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ else
+ {
+ // 鍒犻櫎澶辫触
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
}
}
--
Gitblit v1.9.1