From 1fde6fd8aaf744e5c8e94894f077b872fa202d7d Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 08 九月 2021 08:29:45 +0800
Subject: [PATCH] 报工台上料防错扫码接口判断获取备料信息
---
WebAPI/ListModels.cs | 24 +
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 192 ++++++------
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 7
DAL/DAL.csproj | 1
WebAPI/WebAPI.csproj.user | 2
Model/Model.csproj | 1
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
DAL/MES/ClsSc_MESMaterToSourceBill .cs | 291 ++++++++++++++++++
Model/车间管理/ClsSc_MaterToSourceBillSub_Item.cs | 20 +
WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs | 416 +++++++++++++++++++++++++
10 files changed, 850 insertions(+), 106 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 016a791..4269c89 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -75,6 +75,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
+ <Compile Include="MES\ClsSc_MESMaterToSourceBill .cs" />
<Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProject_View.cs" />
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList.cs" />
diff --git a/DAL/MES/ClsSc_MESMaterToSourceBill .cs b/DAL/MES/ClsSc_MESMaterToSourceBill .cs
new file mode 100644
index 0000000..217041e
--- /dev/null
+++ b/DAL/MES/ClsSc_MESMaterToSourceBill .cs
@@ -0,0 +1,291 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsSc_MESMaterToSourceBill: DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSc_MaterToSourceBillMain omodel = new Model.ClsSc_MaterToSourceBillMain();
+ public List<Model.ClsSc_MaterToSourceBillSub> DetailColl = new List<Model.ClsSc_MaterToSourceBillSub>();
+ public List<Model.ClsSc_MaterToSourceBillSub_Item> DetailColl1 = new List<Model.ClsSc_MaterToSourceBillSub_Item>();
+ public ClsSc_MESMaterToSourceBill()
+ {
+ base.MvarItemKeySub = "Sc_MaterToSourceBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Sc_MaterToSourceBillMain";
+ base.MvarReportTitle="涓婃枡闃查敊鍗�";
+ base.BillType= "3786";
+ base.HBillSubType = "3786";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSc_MESMaterToSourceBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_MaterToSourceBillMain set " +
+ //鍥哄畾璧嬪��===============
+ " HBillNo='" + omodel.HBillNo + "'" +
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HProcExchInterID=" + omodel.HProcExchInterID.ToString() +
+ ",HProcExchEntryID=" + omodel.HProcExchEntryID.ToString() +
+ ",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
+ ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ ",HSourceID=" + omodel.HSourceID.ToString() +
+ ",HProcID=" + omodel.HProcID.ToString() +
+ ",HMaterID=" + omodel.HMaterID.ToString() +
+ ",HSourceBarCode='" + omodel.HSourceBarCode + "'" +
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HWorkerID=" + omodel.HWorkerID.ToString() +
+ ",HWorkerBarCode='" + omodel.HWorkerBarCode + "'" +
+ ",HGroupID=" + omodel.HGroupID.ToString() +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSc_MaterToSourceBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MaterToSourceBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty,HPieceQty,HScanDate" +
+ ",HBarCode,HBarCode_Pack,HBillNo_bak" +
+ ") 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.HPieceQty.ToString() + ",'" + oSub.HScanDate.ToShortDateString() + "'" +
+ ",'" + oSub.HBarCode + "','" + oSub.HBarCode_Pack + "','" + oSub.HBillNo_bak + "'" +
+ ") ");
+ }
+ 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 Sc_MaterToSourceBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HICMOInterID,HICMOBillNo" +
+ ",HSourceID,HProcID,HMaterID,HSourceBarCode,HEquipID,HWorkerID,HWorkerBarCode" +
+ ",HGroupID" +
+ ") " +
+ " 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.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'" +
+ "," + omodel.HSourceID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HMaterID.ToString() + ",'" + omodel.HSourceBarCode + "'," + omodel.HEquipID.ToString() + "," + omodel.HWorkerID.ToString() + ",'" + omodel.HWorkerBarCode + "'" +
+ "," + omodel.HGroupID.ToString() +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSc_MaterToSourceBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MaterToSourceBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HUnitID,HQty,HPieceQty,HScanDate" +
+ ",HBarCode,HBarCode_Pack,HBillNo_bak" +
+ ") 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.HPieceQty.ToString() + ",'" + oSub.HScanDate.ToShortDateString() + "'" +
+ ",'" + oSub.HBarCode + "','" + oSub.HBarCode_Pack + "','" + oSub.HBillNo_bak + "'" +
+ ") ");
+ }
+ //鍐嶆楠岃瘉 淇濆瓨鏄惁 鍚堢悊
+ DataSet ds = oCn.RunProcReturn("exec h_p_Sc_MaterToSourceBill_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_Sc_MaterToSourceBill_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "鏃犻獙璇佹暟鎹紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = omodel.HInterID.ToString();
+
+ 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 Sc_MaterToSourceBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_MaterToSourceBillMain");
+ 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.HBackRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
+ 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.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
+ omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
+ omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
+ omodel.HPrintQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPrintQty"]);
+ //========================================================
+ omodel.HProcExchInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcExchInterID"]);
+ omodel.HProcExchEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcExchEntryID"]);
+ omodel.HProcExchBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcExchBillNo"]);
+ omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HICMOBillNo"]);
+ omodel.HSourceID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSourceID"]);
+ omodel.HProcID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcID"]);
+ omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
+ omodel.HSourceBarCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBarCode"]);
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HWorkerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWorkerID"]);
+ omodel.HWorkerBarCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HWorkerBarCode"]);
+ omodel.HGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"]);
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sc_MaterToSourceBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MaterToSourceBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSc_MaterToSourceBillSub oSub = new Model.ClsSc_MaterToSourceBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBillNo_bak"]);
+ 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"].ToString());
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"].ToString());
+ oSub.HQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HQty"].ToString());
+ oSub.HPieceQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HPieceQty"].ToString());
+ oSub.HScanDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HScanDate"].ToString());
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCode"]);
+ oSub.HBarCode_Pack = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCode_Pack"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //瀹℃牳
+ public bool CheckBill(Int64 lngBillKey, ref string sReturn)
+ {
+
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ //鐢熸垚璋冩嫧鍗�
+ //寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
+ //long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
+ //string NewBillNo = DBUtility.ClsPub.CreateBillCode("1207", ref DBUtility.ClsPub.sExeReturnInfo, true);//寰楀埌鏂板崟鍙�
+ //oCn.RunProc("exec h_p_Kf_MoveStockBill_Add " + lngBillKey.ToString() + "," + NewInterID.ToString() + ",'" + NewBillNo + "','" + HChecker + "'");
+ //
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+
+
+
+ }
+}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index f2e5661..4d27b62 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -605,6 +605,7 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_MaterDownBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_MaterDownBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_MaterToSourceBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_MaterToSourceBillSub_Item.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_MaterToSourceBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_PackDoubleBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_PackDoubleBillSub.cs" />
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBillSub_Item.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBillSub_Item.cs"
new file mode 100644
index 0000000..2294e9e
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBillSub_Item.cs"
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MaterToSourceBillSub_Item: DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo_bak;// varchar(50) --单据号（备份，以免内码丢失，找不到对应主表）
+
+ public Int64 HMouldID;// int --治具内码
+ public Int64 HUnitID;// int --单位ID
+ public Single HQty;// money --数量
+ public Single HPieceQty;// money --件量
+ public DateTime HScanDate;// datetime --扫描时间
+ public string HBarCode;// varchar(50) --条形码
+ public string HBarCode_Pack;// varchar(50) --箱号条码
+
+ }
+}
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 4fee0ba..0151f9b 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -746,7 +746,12 @@
omodel.Sc_ICMOReportBill_FirstCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
+ //=========上料防错单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MaterToSourceBill_AutoCheck")
+ {
+ omodel.Sc_MaterToSourceBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
}
sReturn = "显示单据成功！";
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 6bd830f..f68aa18 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -209,6 +209,8 @@
public string Sc_ICMOBillWorkQtyStatus_AutoCheck; //自动审核
//质量汇报单
public string Sc_ICMOBillQualityStatus_AutoCheck; //自动审核
+ //上料防错单
+ public string Sc_MaterToSourceBill_AutoCheck; //自动审核
//QMS
diff --git a/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs b/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
index be96551..5f84dac 100644
--- a/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
@@ -4,6 +4,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Data;
+using System.Linq;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
@@ -20,6 +21,9 @@
DataSet ds;
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ public DAL.ClsSc_MESMaterToSourceBill BillNew = new DAL.ClsSc_MESMaterToSourceBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSc_MESMaterToSourceBill BillOld = new DAL.ClsSc_MESMaterToSourceBill(); //瀵瑰簲鍗曟嵁绫�
/// <summary>
@@ -115,7 +119,7 @@
#region 鎶ュ伐骞冲彴涓婃枡闃查敊涓�閿壂鐮佹柟娉�
[Route("Sc_MaterToSourceBill/get_CheckTypeByBarCode_Json")]
[HttpGet]
- public object get_CheckTypeByBarCode_Json(string HBarCode,string HSourceID)
+ public object get_CheckTypeByBarCode_Json(string HBarCode,string HSourceID,string HICMOInterID,string HICMOEntryID)
{
//鏍规嵁閫掑叆鐨勬潯鐮佸墠涓変綅锛屽垽鏂潯鐮佺被鍨嬶紙鐢熶骇璧勬簮銆佺墿鏂欐潯鐮侊級
@@ -124,9 +128,54 @@
//鏃犺繑鍥炴暟鎹垯涓虹墿鏂欐潯鐮�
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- //1.鏌ヨ鏉″舰鐮佸湪鏉＄爜妗ｆ琛ㄤ腑鏄惁瀛樺湪
- //2.鍖归厤鐢ㄦ枡娓呭崟鐨勭墿鏂欑紪鐮佹槸鍚︿竴鑷�
-
+ //1.鏌ヨ鏉″舰鐮佸湪鏉＄爜妗ｆ琛ㄤ腑鏄惁瀛樺湪
+ DataSet ds0 = oCN.RunProcReturn(" select HMaterID from Gy_BarCodeBill where HBarCode= '" + HBarCode + "'", "Gy_BarCodeBill");
+ if (ds0 == null || ds0.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜妗ｆ涓笉瀛樺湪姝ょ墿鏂欐潯鐮侊紝鏉＄爜鏃犳晥锛�";
+ return objJsonResult;
+ }
+ else
+ {
+ //2.鍖归厤鐢ㄦ枡娓呭崟鐨勭墿鏂欑紪鐮佹槸鍚︿竴鑷�
+ string sql = string.Format(@"select b.HMaterID,m.HNumber,m.HName,m.HModel,a.HQty HMQty, b.HQty,b.HUnitID,u.HName HUnitName from sc_PPbomBillMain a
+ inner join Sc_PPBomBillSub b on a.HInterID=b.HInterID
+ left join Gy_Material m on b.HMaterID=m.HItemID
+ left join Gy_Unit u on b.HUnitID=u.HItemID
+ where a.HICMOInterID='" + HICMOInterID + "' and a.HICMOEntryID='"+ HICMOEntryID + "'");
+ ds = oCN.RunProcReturn(sql, "Sc_PPBomBillSub");
+ if (ds.Tables[0].Rows.Count > 0) //鏈夌敤鏂欐竻鍗曡褰�
+ {
+ //var dt0 = ds.Tables[0].AsEnumerable().Where<DataRow>(C => C["HMaterID"].ToString() == "133927").CopyToDataTable();
+ DataTable dt = ds.Tables[0].AsEnumerable().Where<DataRow>(W => W["HMaterID"].ToString() == ds0.Tables[0].Rows[0]["HMaterID"].ToString()).CopyToDataTable(); //鍒ゆ柇褰撳墠鏁版嵁(涓�鏉℃垨澶氭潯)涓渶缁堝垽瀹氭槸鍚︽湁鍚堟牸
+ if (dt == null || dt.Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鏃犳晥锛屼笉瀛樺湪浜庣敤鏂欐竻鍗曚腑锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鐢ㄦ枡娓呭崟鏁版嵁鎴愬姛锛�";
+ objJsonResult.Verify = "鐢ㄦ枡娓呭崟鐗╂枡鏉＄爜";
+ objJsonResult.data = dt;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鐢熶骇璁㈠崟鏃犵敤鏂欐竻鍗曡褰曪紒";
+ return objJsonResult;
+ }
+ }
}
else
{
@@ -140,7 +189,8 @@
//閮ㄩ棬鏉＄爜
if (sBarBillName == "鐢熶骇璧勬簮")
{
- DAL.ClsGy_Source_View dal = new DAL.ClsGy_Source_View();
+ //DAL.ClsGy_Source_View dal = new DAL.ClsGy_Source_View();
+
//灏嗛�掑叆鐨勬潯鐮佸幓鎺夊墠涓変綅鍚庤浆鍖栨垚鏁村舰
int ID;
if (int.TryParse(HBarCode.Remove(0, 3), out ID))
@@ -154,13 +204,14 @@
}
else
{
- if (dal.GetInfoByID(ID))
+ ds = oCN.RunProcReturn("Select * from Gy_Source Where HItemID='" + ID + "'", "Gy_Source");
+ if(ds.Tables[0].Rows.Count>0) //if (dal.GetInfoByID(ID))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
objJsonResult.Verify = "璧勬簮鏉＄爜";
- objJsonResult.data = dal;
+ objJsonResult.data = ds;
return objJsonResult;
}
else
@@ -176,7 +227,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "閿欒鐨勯儴闂ㄦ潯鐮侊紒";
+ objJsonResult.Message = "閿欒鐨勮祫婧愭潯鐮侊紒";
return objJsonResult;
}
}
@@ -205,5 +256,354 @@
return objJsonResult;
}
#endregion
+
+ #region 鎶ュ伐鍙颁笂鏂欓槻閿欎繚瀛�
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MaterToSourceBill/SaveGetMaterToSourceFrom")]
+ [HttpPost]
+ public object SaveGetMaterToSourceFrom([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+
+ //淇濆瓨鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("MES_MaterToSourceBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DAL.ClsSc_MESMaterToSourceBill oBill = new DAL.ClsSc_MESMaterToSourceBill();
+ List<Model.ClsSc_MaterToSourceBillMain> lsmain = new List<Model.ClsSc_MaterToSourceBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_MaterToSourceBillMain(msg2);
+ foreach (Model.ClsSc_MaterToSourceBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ DBUtility.ClsPub.CurUserName = UserName;
+ oItem.HBillType = "3786";
+ oItem.HBillSubType = "3786";
+
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HProcExchBillNo = ""; //娴佽浆鍗″彿
+ oItem.HProcExchInterID = 0; //娴佽浆鍗′富鍐呯爜
+ oItem.HProcExchEntryID = 0; //娴佽浆鍗″瓙鍐呯爜
+ oItem.HProcID = 0; //宸ュ簭ID
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //閰嶆枡璁板綍琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_MaterToSourceBillSub> ls = new List<Model.ClsSc_MaterToSourceBillSub>();
+ ls = oListModels.getObjectByJson_Sc_MaterToSourceBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_MaterToSourceBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //閰嶄欢椤硅〃浣撴暟鎹�
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_MaterToSourceBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [鎶ュ伐骞冲彴涓婃枡闃查敊鍗曞鏍搞�佸弽瀹℃牳]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MaterToSourceBill/AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "MES_MaterToSourceBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DAL.ClsSc_MESMaterToSourceBill oBill = new DAL.ClsSc_MESMaterToSourceBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 1c5c267..2de7082 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1255,5 +1255,29 @@
return list;
}
+ /// <summary>
+ /// 鎶ュ伐骞冲彴鏂板涓婃枡闃查敊鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MaterToSourceBillMain> getObjectByJson_Sc_MaterToSourceBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MaterToSourceBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MaterToSourceBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 鎶ュ伐骞冲彴鏂板涓婃枡闃查敊鍗曞瓙琛�(閰嶆枡)鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MaterToSourceBillSub> getObjectByJson_Sc_MaterToSourceBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MaterToSourceBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MaterToSourceBillSub>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index dad924f..86fbb62 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,40 +9,40 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/06/2021 14:33:42</publishTime>
+ <publishTime>09/07/2021 11:09:13</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/06/2021 14:33:42</publishTime>
+ <publishTime>09/07/2021 11:09:13</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/06/2021 14:33:41</publishTime>
+ <publishTime>09/07/2021 11:09:12</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/06/2021 14:33:41</publishTime>
+ <publishTime>09/07/2021 11:09:12</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 22:52:40</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:10</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:10</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/25/2021 20:46:09</publishTime>
+ <publishTime>08/09/2021 09:06:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/19/2015 01:02:50</publishTime>
+ <publishTime>03/18/2015 17:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 19:48:56</publishTime>
+ <publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:10</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:10</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/04/2014 04:33:56</publishTime>
+ <publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/06/2021 14:33:38</publishTime>
+ <publishTime>09/07/2021 11:09:08</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/06/2021 14:33:38</publishTime>
+ <publishTime>09/07/2021 11:09:08</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:09</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:09</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:09</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/06/2021 14:33:39</publishTime>
+ <publishTime>09/07/2021 11:09:09</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/16/2015 01:57:08</publishTime>
+ <publishTime>02/15/2015 17:57:08</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
+ <publishTime>08/19/2014 10:03:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 21:00:36</publishTime>
+ <publishTime>11/28/2018 13:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 20:58:44</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 21:01:26</publishTime>
+ <publishTime>11/28/2018 13:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 21:01:00</publishTime>
+ <publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 12:02:18</publishTime>
+ <publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 23:26:04</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 12:02:32</publishTime>
+ <publishTime>01/28/2015 04:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 19:18:48</publishTime>
+ <publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/06/2021 14:33:43</publishTime>
+ <publishTime>09/07/2021 11:09:15</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/06/2021 14:33:43</publishTime>
+ <publishTime>09/07/2021 11:09:15</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/18/2013 01:03:52</publishTime>
+ <publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 21:26:02</publishTime>
+ <publishTime>11/29/2018 13:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 21:26:30</publishTime>
+ <publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/09/2021 09:06:27</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:51</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/10/2021 08:30:52</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/06/2021 14:33:48</publishTime>
+ <publishTime>09/07/2021 11:09:24</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index e627b17..c934955 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>D:\Git浠撳簱\椤圭洰\MESWMS\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1