From 6bb8899afd83cab8cbe03c77a68cdc82e7d495cd Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期五, 07 五月 2021 20:51:19 +0800
Subject: [PATCH] 委外派工下推委外工序计划汇报单完成
---
WebAPI/Models/ClsWW_EntrustProcessReportBillMain.cs | 42 +++
WebAPI/ListModels.cs | 24 +
WebAPI/Models/WW_EntrustProcSendWorkViewModel.cs | 75 +++++
WebAPI/Controllers/Sc_ProcessMangementController.cs | 148 ++++++++++
WebAPI/Models/ClsWW_EntrustProcessReportBillSub.cs | 181 ++++++++++++
WebAPI/Properties/PublishProfiles/API.pubxml.user | 17
WebAPI/DLL/ClsWW_EntrustProcessReportBill.cs | 298 +++++++++++++++++++++
WebAPI/WebAPI.csproj | 4
8 files changed, 784 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index dc74d15..03ed5f1 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1602,5 +1602,153 @@
}
+ /// <summary>
+ /// 淇濆瓨濮斿姹囨姤鍗曚俊鎭�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWW_EntrustProcessReportBill")]
+ [HttpPost]
+ public object SaveWW_EntrustProcessReportBill([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 UserName = "";
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ WebAPI.DLL.ClsWW_EntrustProcessReportBill Sendwork = new WebAPI.DLL.ClsWW_EntrustProcessReportBill();
+ List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain> lsmain = new List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_WW_EntrustProcessReportBillMain(msg2);
+ foreach (WebAPI.Models.ClsWW_EntrustProcessReportBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DateTime.Now;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+ Sendwork.omodel = oItem;
+
+
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<WebAPI.Models.WW_EntrustProcSendWorkViewModel> ls = new List<WebAPI.Models.WW_EntrustProcSendWorkViewModel>();
+ ls = oListModels.getObjectByJson_WW_EntrustProcSendWork(msg3);
+ int i = 0;
+ List<Models.ClsWW_EntrustProcessReportBillSub> lss = new List<Models.ClsWW_EntrustProcessReportBillSub>();
+ foreach (WebAPI.Models.WW_EntrustProcSendWorkViewModel oItemSub in ls)
+ {
+
+ i++;
+ Models.ClsWW_EntrustProcessReportBillSub sendworksub = new Models.ClsWW_EntrustProcessReportBillSub();
+ sendworksub.HProcID = 0;//--宸ュ簭ID
+ sendworksub.HSourceInterID = (long)oItemSub.hmainid;//婧愬崟id
+ sendworksub.HSourceEntryID = (long)oItemSub.hsubid; //--婧愬崟瀛怚D
+ sendworksub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿
+ sendworksub.HSourceBillType = oItemSub.HBillType; //--婧愬崟绫诲瀷
+ sendworksub.HQty = (decimal)oItemSub.鏁伴噺; //--鏁伴噺
+ sendworksub.HICMOBillNo = ""; //--浠诲姟鍗曞彿
+ sendworksub.HSeOrderBillNo = ""; //--閿�鍞鍗曞彿
+ sendworksub.HSeOrderEntryID = 0; //--閿�鍞瓙ID
+ sendworksub.HSeOrderInterID = 0; //--閿�鍞鍗曚富ID
+ sendworksub.HTimes = 0; //--璁″垝宸ユ椂
+ if (oItemSub.鏁伴噺 <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (Convert.ToInt32(sendworksub.HQty) > Convert.ToInt32(oItemSub.鏁伴噺))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屽澶栨眹鎶ユ暟閲忎笉鑳藉ぇ浜庡澶栨淳宸ュ崟鏁伴噺锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+
+ sendworksub.HEntryID = i;
+ sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ sendworksub.HRemark = "";
+ sendworksub.HCloseMan = "";
+ sendworksub.HCloseType = false;
+ lss.Add(sendworksub);//鍏堟妸鏁版嵁瀛樻斁鍒版淳宸ュ崟瀛愯〃闆嗗悎閲�
+
+
+ }
+ if (lss.Count > 0)
+ {
+ //鐒跺悗鍐嶅惊鐜繚瀛樺埌娲惧伐鍗曞瓙琛ㄧ殑闆嗗悎閲�
+ foreach (Models.ClsWW_EntrustProcessReportBillSub Itemsendwork in lss)
+ {
+ Sendwork.DetailColl.Add(Itemsendwork);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛乴ss闆嗗悎灏忎簬0";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (Sendwork.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = Sendwork.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = Sendwork.ModifyBill(Sendwork.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ 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;
+ }
+ }
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsWW_EntrustProcessReportBill.cs b/WebAPI/DLL/ClsWW_EntrustProcessReportBill.cs
new file mode 100644
index 0000000..0d9516e
--- /dev/null
+++ b/WebAPI/DLL/ClsWW_EntrustProcessReportBill.cs
@@ -0,0 +1,298 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsWW_EntrustProcessReportBill : DBUtility.ClsXt_BaseBill
+ {
+ public WebAPI.Models.ClsWW_EntrustProcessReportBillMain omodel = new WebAPI.Models.ClsWW_EntrustProcessReportBillMain();
+ public List<WebAPI.Models.ClsWW_EntrustProcessReportBillSub> DetailColl = new List<WebAPI.Models.ClsWW_EntrustProcessReportBillSub>();
+
+ public ClsWW_EntrustProcessReportBill()
+ {
+
+ base.MvarItemKeySub = "WW_EntrustProcessReportBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "WW_EntrustProcessReportBillMain";
+ base.MvarReportTitle = "濮斿宸ュ簭璁″垝姹囨姤鍗�";
+ base.BillType = "3742";
+ base.HBillSubType = "3742";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsWW_EntrustProcessReportBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+
+ #region
+ ////淇敼鍗曟嵁
+ //public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ //{
+ // try
+ // {
+ // //
+ // oCn.BeginTran();
+ // //鏇存柊涓昏〃
+ // oCn.RunProc("UpDate Sc_ProcessSendWorkMain set " +
+ // " HYear=" + omodel.HYear.ToString() +
+ // ",HPeriod=" + omodel.HPeriod.ToString() +
+ // ",HInterID=" + omodel.HInterID.ToString() +
+ // ",HDate='" + omodel.HDate.ToShortDateString() + "'" +
+ // ",HBillNo='" + omodel.HBillNo + "'" +
+ // ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ // ",HCheckItemNowID=" + omodel.HCheckItemNowID.ToString() +
+ // ",HCheckItemNextID=" + omodel.HCheckItemNextID.ToString() +
+ // ",HCheckFlowID=" + omodel.HCheckFlowID.ToString() +
+ // ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ // ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ // ",HProcPlanBillNo='" + omodel.HProcPlanBillNo + "'" +
+ // ",HPlanBeginDate='" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ // ",HPlanEndDate='" + omodel.HPlanEndDate.ToShortDateString() + "'" +
+ // ",HBatchNo='" + omodel.HBatchNo + "'" +
+ // ",HSeOrderInterID=" + omodel.HSeOrderInterID.ToString() +
+ // ",HSeOrderEntryID=" + omodel.HSeOrderEntryID.ToString() +
+ // ",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
+ // ",HProcID=" + omodel.HProcID.ToString() +
+ // ",HProcNumber='" + omodel.HProcNumber + "'" +
+ // ",HDeptID=" + omodel.HDeptID.ToString() +
+ // ",HDeptNumber='" + omodel.HDeptNumber + "'" +
+ // ",HGroupID=" + omodel.HGroupID.ToString() +
+ // ",HGroupNumber='" + omodel.HGroupNumber + "'" +
+ // ",HMaterID=" + omodel.HMaterID.ToString() +
+ // ",HMaterNumber='" + omodel.HMaterNumber + "'" +
+ // ",HUnitID=" + omodel.HUnitID.ToString() +
+ // ",HUnitNumber='" + omodel.HUnitNumber + "'" +
+ // ",HRoutingInterID=" + omodel.HRoutingInterID.ToString() +
+ // ",HPlanQty=" + omodel.HPlanQty.ToString() +
+ // ",HExplanation='" + omodel.HExplanation + "'" +
+ // ",HRemark='" + omodel.HRemark + "'" +
+ // ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ // ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ // ",HUpDateDate=getdate()" +
+ // ",HSupID=" + omodel.HSupID.ToString() +
+ // " where HInterID=" + lngBillKey.ToString());
+ // //鍒犻櫎鍏宠仈
+ // DeleteRelation(ref sReturn, lngBillKey);
+ // //鍒犻櫎瀛愯〃
+ // DeleteBillSub(lngBillKey);
+ // //鎻掑叆瀛愯〃
+ // omodel.HInterID = lngBillKey;
+ // foreach (Model.ClsSc_ProcessSendWorkSub oSub in DetailColl)
+ // {
+ // oCn.RunProc("Insert into Sc_ProcessSendWorkSub " +
+ // " (HInterID,HEntryID,HProcID,HProcNumber,HGroupID,HSourceID,HSourceNumber" +
+ // ",HGroupNumber,HWorkerID,HWorkerNumber,HQty,HPlanBeginDate" +
+ // ",HPlanEndDate,HPlanTimes,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ // ",HICMOBillNo,HICMOInterID,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
+ // ",HCloseMan,HCloseType,HRemark,HSourceInterID,HSourceEntryID" +
+ // ",HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ // ") values("
+ // + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "'," + oSub.HGroupID.ToString() + "," + oSub.HSourceID.ToString() + ",'" + oSub.HSourceNumber + "'" +
+ // ",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HQty.ToString() + ",'" + oSub.HPlanBeginDate + "'" +
+ // ",'" + oSub.HPlanEndDate + "'," + oSub.HPlanTimes.ToString() + "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ // ",'" + oSub.HICMOBillNo + "'," + oSub.HICMOInterID.ToString() + "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
+ // ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() +
+ // ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ // ") ");
+ // }
+ // sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ // oCn.Commit();
+ // return true;
+ // }
+ // catch (Exception e)
+ // {
+ // sReturn = e.Message;
+ // oCn.RollBack();
+ // throw (e);
+ // }
+ //}
+ #endregion
+ //鏂板鍗曟嵁
+ 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 WW_EntrustProcessReportBillMain " +
+ "(HYear, HPeriod, HBillType, HBillSubType, HInterID" +
+ ",HDate, HBillNo, HBillStatus, HCheckItemNowID, HCheckItemNextID" +
+ ",HCheckFlowID, HRemark, HBacker, HBackDate, HBackRemark" +
+ ",HChecker, HCheckDate, HMaker, HMakeDate, HUpDater" +
+ ",HUpDateDate, HCloseMan, HCloseDate, HCloseType,HDeleteMan" +
+ ",HDeleteDate,HMainSourceBillType, HMainSourceInterID, HMainSourceEntryID, HMainSourceBillNo" +
+ ",[HPrintQty], [HDeptID], [HSupID], [HEmpID], [HExplanation], [HInnerBillNo]" +
+ ") " +
+ " values(" + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + this.BillType + "','" + omodel.HBillSubType + "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + omodel.HBillStatus + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() +
+ "," + omodel.HCheckFlowID.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBacker + "','" + omodel.HBackDate + "','" + omodel.HBackRemark + "'" +
+ ",'" + omodel.HChecker + "','" + omodel.HCheckDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HUpDater + "'" +
+ ",'" + omodel.HUpDateDate + "','" + omodel.HCloseMan + "','" + omodel.HCloseDate + "'," + Convert.ToString(omodel.HCloseType ? 1 : 0) + ",'" + omodel.HDeleteMan + "'" +
+ ",'" + omodel.HDeleteDate + "','" + omodel.HMainSourceBillType + "'," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "'" +
+ ",'" + omodel.HPrintQty + "','" + omodel.HDeptID + "','" + omodel.HSupID + "','" + omodel.HEmpID +"'"+
+ ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsWW_EntrustProcessReportBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into WW_EntrustProcessReportBillSub " +
+"([HInterID], [HBillNo_bak], [HEntryID], [HCloseMan], [HEntryCloseDate], [HCloseType], [HRemark], [HSourceInterID]" +
+",[HSourceEntryID], [HSourceBillNo], [HSourceBillType], [HRelationQty], [HRelationMoney], [HProcID]" +
+", [HSupFlag], [HMaterID], [HTimes], [HQty],[HCheckQty], [HBadCount], [HWasterQty], [HWasterQty2], [HWeight]" +
+", [HPrice], [HMoney], [HBatchNo], [HBadPrirce], [HBadMoney], [HWasterPrice], [HWasterMoney],[HQualityRate]" +
+", [HUsingQty], [HSelfBadCount], [HPreBadCount], [HPayMentQty], [HPackType],[HCheckEmpID], [HProcPlanInterID]" +
+", [HProcPlanEntryID], [HProcPlanBillNo], [HICMOInterID],[HICMOEntryID], [HICMOBillNo], [HSeOrderInterID]" +
+", [HSeOrderEntryID], [HSeOrderBillNo]" +
+") " +
+"values(" + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + 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.HProcID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HMaterID.ToString() + "," + oSub.HTimes.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HBadCount.ToString() + "," + oSub.HWasterQty.ToString() + "," + oSub.HWasterQty2.ToString() +
+ "," + oSub.HWeight.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HBadPrirce.ToString() +
+ "," + oSub.HBadMoney.ToString() + "," + oSub.HWasterPrice.ToString() + "," + oSub.HWasterMoney.ToString() + "," + oSub.HQualityRate.ToString() + "," + oSub.HUsingQty + "," + oSub.HSelfBadCount + "," + oSub.HPreBadCount.ToString() +
+ "," + oSub.HPayMentQty.ToString() + ",'" + oSub.HPackType + "'," + oSub.HCheckEmpID.ToString() + "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() +
+ ",'" + oSub.HICMOBillNo + "','" + oSub.HSeOrderInterID + "','" + oSub.HSeOrderEntryID + "','" + oSub.HSeOrderBillNo + "'" +
+ ") ");
+
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from WW_EntrustProcessReportBillMain Where HInterID=" + lngBillKey.ToString(), "WW_EntrustProcessReportBillMain");
+ 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 = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillNo"]);
+ 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.HSupID = (int)DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ omodel.HDeptID = (int)DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+ //
+ omodel.HBacker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBacker"]);
+ omodel.HBackDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackDate"]);
+ omodel.HChecker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HChecker"]);
+ omodel.HCheckDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckDate"]);
+ omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
+ omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
+ omodel.HUpDater = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDater"]);
+ omodel.HUpDateDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDateDate"]);
+ omodel.HCloseMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseMan"]);
+ omodel.HCloseDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCloseDate"]);
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteMan"]);
+ omodel.HDeleteDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeleteDate"]);
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sc_ProcessReportSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_ProcessReportSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Models.ClsWW_EntrustProcessReportBillSub oSub = new Models.ClsWW_EntrustProcessReportBillSub();
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ //
+ oSub.HMaterID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HProcID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcID"]);
+ oSub.HTimes = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HTimes"]);
+ oSub.HQty = (decimal)DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HCheckQty = (decimal)DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HCheckQty"]);
+ oSub.HBadCount = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HBadCount"]);
+ oSub.HWasterQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HWasterQty"]);
+ oSub.HWasterQty2 = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HWasterQty2"]);
+ oSub.HPrice = (decimal)DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
+ oSub.HMoney = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HMoney"]);
+ //addnew
+ oSub.HBadPrirce = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HBadPrirce"]);
+ oSub.HBadMoney = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HBadMoney"]);
+ oSub.HWasterPrice = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HWasterPrice"]);
+ oSub.HWasterMoney = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HWasterMoney"]);
+ oSub.HQualityRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HQualityRate"]);
+
+ oSub.HUsingQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HUsingQty"]);
+ oSub.HSelfBadCount = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSelfBadCount"]);
+ oSub.HPreBadCount = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HPreBadCount"]);
+
+ oSub.HPayMentQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HPayMentQty"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
+
+ oSub.HPackType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPackType"]);
+ oSub.HCheckEmpID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCheckEmpID"]);
+
+ //
+ oSub.HProcPlanInterID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanInterID"]);
+ oSub.HProcPlanEntryID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanEntryID"]);
+ oSub.HProcPlanBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcPlanBillNo"]);
+ oSub.HICMOInterID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOInterID"]);
+ oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HICMOBillNo"]);
+ oSub.HSeOrderInterID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = (int)DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ //
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillNo"]);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceBillType"]);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 70c4593..91a74a4 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -261,7 +261,29 @@
return list;
}
-
+ /// <summary>
+ /// 濮斿姹囨姤鍗曚富琛╦son澶勭悊
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain> getObjectByJson_WW_EntrustProcessReportBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 濮斿娲惧伐鍗曡鍥炬ā鍨媕son澶勭悊
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<WebAPI.Models.WW_EntrustProcSendWorkViewModel> getObjectByJson_WW_EntrustProcSendWork(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<WebAPI.Models.WW_EntrustProcSendWorkViewModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.WW_EntrustProcSendWorkViewModel>>(jsonString);
+ return list;
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsWW_EntrustProcessReportBillMain.cs b/WebAPI/Models/ClsWW_EntrustProcessReportBillMain.cs
new file mode 100644
index 0000000..032567b
--- /dev/null
+++ b/WebAPI/Models/ClsWW_EntrustProcessReportBillMain.cs
@@ -0,0 +1,42 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsWW_EntrustProcessReportBillMain: DBUtility.ClsXt_BaseBillMain
+ {
+ /// <summary>
+ /// HDeptID int --閮ㄩ棬ID(Gy_Department)
+ /// </summary>
+ public int? HDeptID { get; set; }//
+
+ /// <summary>
+ /// HSupID int --渚涘簲鍟嗭紙Gy_Supplier锛�
+ /// </summary>
+ public int? HSupID { get; set; }//
+
+ /// <summary>
+ /// HEmpID int --鑱屽憳锛圙y_Employee锛�
+ /// </summary>
+ public int? HEmpID { get; set; }//
+
+ /// <summary>
+ /// HExplanation varchar(500) --鎽樿
+ /// </summary>
+ public string HExplanation { get; set; }//
+
+ /// <summary>
+ /// HInnerBillNo varchar(50) --鍐呴儴鍗曟嵁鍙�
+ /// </summary>
+ public string HInnerBillNo { get; set; }//
+
+ /// <summary>
+ /// HPrintQty int --鎵撳嵃娆℃暟
+ /// </summary>
+ public int? HPrintQty { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsWW_EntrustProcessReportBillSub.cs b/WebAPI/Models/ClsWW_EntrustProcessReportBillSub.cs
new file mode 100644
index 0000000..c3f333c
--- /dev/null
+++ b/WebAPI/Models/ClsWW_EntrustProcessReportBillSub.cs
@@ -0,0 +1,181 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsWW_EntrustProcessReportBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ /// <summary>
+ /// HBillNo_bak varchar(50) --鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ /// </summary>
+ public string HBillNo_bak { get; set; }
+
+ /// <summary>
+ /// HProcID int --宸ュ簭 锛坓y_Process锛�
+ /// </summary>
+ public int HProcID { get; set; }
+
+ /// <summary>
+ /// HSupFlag bit --濮斿鏍囪
+ /// </summary>
+ public bool HSupFlag { get; set; }
+
+ /// <summary>
+ /// HMaterID int --浜у搧ID(Gy_Material)
+ /// </summary>
+ public int HMaterID { get; set; }
+
+ /// <summary>
+ /// HTimes money --瀹炰綔鏃堕棿
+ /// </summary>
+ public double HTimes { get; set; }
+
+ /// <summary>
+ /// HQty dec(18,8) --瀹炰綔鏁伴噺
+ /// </summary>
+ public decimal HQty { get; set; }
+
+ /// <summary>
+ /// HCheckQty dec(18,8) --鍚堟牸鏁伴噺
+ /// </summary>
+ public decimal HCheckQty { get; set; }
+
+ /// <summary>
+ /// HBadCount money --涓嶈壇鍝佹暟
+ /// </summary>
+ public double HBadCount { get; set; }
+
+ /// <summary>
+ /// HWasterQty money --鍥犲伐鎶ュ簾鏁伴噺
+ /// </summary>
+ public double HWasterQty { get; set; }
+
+ /// <summary>
+ /// HWasterQty2 money --鍥犳枡鎶ュ簾鏁伴噺
+ /// </summary>
+ public double HWasterQty2 { get; set; }
+
+ /// <summary>
+ /// HWeight dec(18,8) --閲嶉噺 addnew
+ /// </summary>
+ public decimal HWeight { get; set; }
+
+ /// <summary>
+ /// HPrice dec(18,8) --鍔犲伐璐�
+ /// </summary>
+ public decimal HPrice { get; set; }
+
+ /// <summary>
+ /// HMoney money -- 閲戦
+ /// </summary>
+ public double HMoney { get; set; }
+
+ /// <summary>
+ /// HBatchNo varchar(100) -- 鎵规
+ /// </summary>
+ public string HBatchNo { get; set; }
+
+ /// <summary>
+ /// HBadPrirce money --涓嶈壇鍗曚环 --addnew
+ /// </summary>
+ public double HBadPrirce { get; set; }
+
+ /// <summary>
+ /// HBadMoney money --涓嶈壇閲戦 --addnew
+ /// </summary>
+ public double HBadMoney { get; set; }
+
+ /// <summary>
+ /// HWasterPrice money --鎶ュ簾鍗曚环 --addnew
+ /// </summary>
+ public double HWasterPrice { get; set; }
+
+ /// <summary>
+ /// HWasterMoney money --鎶ュ簾閲戦 --addnew
+ /// </summary>
+ public double HWasterMoney { get; set; }
+
+ /// <summary>
+ /// HQualityRate money --璐ㄩ噺绯绘暟 --addnew
+ /// </summary>
+ public double HQualityRate { get; set; }
+
+ /// <summary>
+ /// HUsingQty money --璁╂鏁伴噺 --addnew
+ /// </summary>
+ public double HUsingQty { get; set; }
+
+ /// <summary>
+ /// HSelfBadCount money --鏈亾杩斿伐 --addnew
+ /// </summary>
+ public double HSelfBadCount { get; set; }
+
+ /// <summary>
+ /// HPreBadCount money --鍓嶉亾涓嶈壇鏁� --addnew
+ /// </summary>
+ public double HPreBadCount { get; set; }
+
+ /// <summary>
+ /// HPayMentQty money --缁撶畻鏁伴噺 --addnew
+ /// </summary>
+ public double HPayMentQty { get; set; }
+
+ /// <summary>
+ /// HPackType varchar(50) --鍖呰绫诲瀷 --addnew
+ /// </summary>
+ public string HPackType { get; set; }
+
+ /// <summary>
+ /// HCheckEmpID int --妫�楠屽憳(gy_employee) --addnew
+ /// </summary>
+ public int HCheckEmpID { get; set; }
+
+ /// <summary>
+ /// HProcPlanInterID int --宸ュ簭璁″垝鍗旾D
+ /// </summary>
+ public int HProcPlanInterID { get; set; }
+
+ /// <summary>
+ /// HProcPlanEntryID int --宸ュ簭璁″垝鍗曞瓙ID
+ /// </summary>
+ public int HProcPlanEntryID { get; set; }
+
+ /// <summary>
+ /// HProcPlanBillNo varchar(50) --宸ュ簭璁″垝鍗曞彿
+ /// </summary>
+ public string HProcPlanBillNo { get; set; }
+
+ /// <summary>
+ /// HICMOInterID int --浠诲姟鍗旾D
+ /// </summary>
+ public int HICMOInterID { get; set; }
+
+ /// <summary>
+ /// HICMOEntryID int --浠诲姟鍗旾D
+ /// </summary>
+ public int HICMOEntryID { get; set; }
+
+ /// <summary>
+ /// HICMOBillNo varchar(50) --浠诲姟鍗曞彿
+ /// </summary>
+ public string HICMOBillNo { get; set; }
+
+ /// <summary>
+ /// HSeOrderInterID int --閿�鍞鍗曚富ID
+ /// </summary>
+ public int HSeOrderInterID { get; set; }
+
+ /// <summary>
+ /// HSeOrderEntryID int --閿�鍞瓙ID
+ /// </summary>
+ public int HSeOrderEntryID { get; set; }
+
+ /// <summary>
+ /// HSeOrderBillNo varchar(50) --閿�鍞鍗曞彿
+ /// </summary>
+ public string HSeOrderBillNo { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/WW_EntrustProcSendWorkViewModel.cs b/WebAPI/Models/WW_EntrustProcSendWorkViewModel.cs
new file mode 100644
index 0000000..f70f523
--- /dev/null
+++ b/WebAPI/Models/WW_EntrustProcSendWorkViewModel.cs
@@ -0,0 +1,75 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class WW_EntrustProcSendWorkViewModel
+ {
+ public int? hmainid { get; set; }
+ public DateTime? 鏃ユ湡 { get; set; }
+ public string 鍗曟嵁鍙� { get; set; }
+ public int? HDeptID { get; set; }
+ public string 閮ㄩ棬浠ｇ爜 { get; set; }
+ public string 閮ㄩ棬 { get; set; }
+ public int? HMaterID { get; set; }
+ public string 鐗╂枡浠ｇ爜 { get; set; }
+ public string 瑙勬牸鍨嬪彿 { get; set; }
+ public int? HUnitID { get; set; }
+ public string 璁￠噺鍗曚綅浠ｇ爜 { get; set; }
+ public string 璁￠噺鍗曚綅 { get; set; }
+ public int? HSupID { get; set; }
+ public string 渚涘簲鍟嗕唬鐮� { get; set; }
+ public string 渚涘簲鍟嗗悕绉� { get; set; }
+ public int? HprocID { get; set; }
+ public string 宸ュ簭浠ｇ爜 { get; set; }
+ public string 宸ュ簭 { get; set; }
+ public int? HGroupID { get; set; }
+ public string 鐝粍浠ｇ爜 { get; set; }
+ public string 鐝粍鍚嶇О { get; set; }
+ public int? HSourceID { get; set; }
+ public string 璧勬簮浠ｇ爜 { get; set; }
+ public string 鐢熶骇璧勬簮 { get; set; }
+ public int HWorkerID { get; set; }
+
+ public string 鑱屽憳浠ｇ爜 { get; set; }
+ public string 鑱屽憳 { get; set; }
+ public int? hsubid { get; set; }
+ public double 鏁伴噺 { get; set; }
+ public DateTime? 璁″垝寮�宸ユ棩鏈� { get; set; }
+ public DateTime? 璁″垝瀹屽伐鏃ユ湡 { get; set; }
+
+ public double 璁″垝宸ユ椂 { get; set; }
+ public string 琛ㄤ綋澶囨敞 { get; set; }
+ public int? HICMOInterID { get; set; }
+ public string 鐢熶骇浠诲姟鍗曞彿 { get; set; }
+ public int? HSeOrderInterID { get; set; }
+ public string 閿�鍞鍗曞彿 { get; set; }
+ public string 琛ㄥご澶囨敞 { get; set; }
+ public string 鍒跺崟浜� { get; set; }
+ public DateTime? 鍒跺崟鏃ユ湡 { get; set; }
+ public string 瀹℃牳浜� { get; set; }
+ public DateTime? 瀹℃牳鏃ユ湡 { get; set; }
+ public string 淇敼浜� { get; set; }
+ public DateTime? 淇敼鏃ユ湡 { get; set; }
+ public string 鍏抽棴浜� { get; set; }
+ public DateTime? 鍏抽棴鏃ユ湡 { get; set; }
+ public string 浣滃簾浜� { get; set; }
+ public DateTime? 浣滃簾鏃ユ湡 { get; set; }
+ public int? 婧愬崟涓诲唴鐮� { get; set; }
+ public int? 婧愬崟瀛愬唴鐮� { get; set; }
+ public string 婧愬崟鍗曞彿 { get; set; }
+ public string 婧愬崟绫诲瀷 { get; set; }
+
+ public string 琛屽叧闂汉 { get; set; }
+
+ public string HBillType { get; set; }
+
+ public int? HQtyDecimal { get; set; }
+
+ public int? HPriceDecimal { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 86f3ec7..a9faf15 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -7,7 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-05-06T10:11:36.9078607Z;True|2021-05-06T18:08:40.5403791+08:00;True|2021-05-06T18:07:04.1929681+08:00;True|2021-05-06T18:06:54.5987264+08:00;True|2021-05-06T18:05:46.1791578+08:00;True|2021-05-06T17:18:58.8131464+08:00;True|2021-05-06T17:18:37.9969968+08:00;True|2021-05-06T14:47:33.5704679+08:00;True|2021-05-06T10:03:28.7226576+08:00;True|2021-04-28T10:18:54.1336497+08:00;True|2021-04-27T16:34:19.0789205+08:00;True|2021-04-27T14:48:28.8138232+08:00;True|2021-04-27T10:34:03.6370089+08:00;True|2021-04-26T16:18:32.0260755+08:00;True|2021-04-26T15:00:58.6773071+08:00;True|2021-04-26T13:23:50.3968646+08:00;True|2021-04-16T08:50:41.5499248+08:00;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History>
+ <History>True|2021-05-07T12:47:46.1401919Z;True|2021-05-07T20:31:45.7777162+08:00;True|2021-05-07T20:31:35.2882424+08:00;True|2021-05-07T20:31:21.5616729+08:00;False|2021-05-07T20:29:33.8855457+08:00;False|2021-05-07T20:28:43.1845420+08:00;False|2021-05-07T20:28:13.1335411+08:00;True|2021-05-07T20:10:01.7346568+08:00;True|2021-05-07T20:03:17.0005596+08:00;True|2021-05-07T09:05:04.3102029+08:00;True|2021-05-06T18:11:36.9078607+08:00;True|2021-05-06T18:08:40.5403791+08:00;True|2021-05-06T18:07:04.1929681+08:00;True|2021-05-06T18:06:54.5987264+08:00;True|2021-05-06T18:05:46.1791578+08:00;True|2021-05-06T17:18:58.8131464+08:00;True|2021-05-06T17:18:37.9969968+08:00;True|2021-05-06T14:47:33.5704679+08:00;True|2021-05-06T10:03:28.7226576+08:00;True|2021-04-28T10:18:54.1336497+08:00;True|2021-04-27T16:34:19.0789205+08:00;True|2021-04-27T14:48:28.8138232+08:00;True|2021-04-27T10:34:03.6370089+08:00;True|2021-04-26T16:18:32.0260755+08:00;True|2021-04-26T15:00:58.6773071+08:00;True|2021-04-26T13:23:50.3968646+08:00;True|2021-04-16T08:50:41.5499248+08:00;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -19,6 +19,12 @@
</File>
<File Include="bin/Antlr3.Runtime.pdb">
<publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/App_global.asax.compiled">
+ <publishTime>05/07/2021 20:31:20</publishTime>
+ </File>
+ <File Include="bin/App_global.asax.dll">
+ <publishTime>05/07/2021 20:31:20</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>05/06/2021 09:48:41</publishTime>
@@ -165,10 +171,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>05/06/2021 18:11:32</publishTime>
+ <publishTime>05/07/2021 20:47:25</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>05/06/2021 18:11:32</publishTime>
+ <publishTime>05/07/2021 20:47:25</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -244,6 +250,9 @@
</File>
<File Include="packages.config">
<publishTime>05/06/2021 09:48:41</publishTime>
+ </File>
+ <File Include="PrecompiledApp.config">
+ <publishTime>05/07/2021 20:31:19</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>05/06/2021 09:48:41</publishTime>
@@ -342,7 +351,7 @@
<publishTime>05/06/2021 09:48:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>05/06/2021 18:11:36</publishTime>
+ <publishTime>05/07/2021 20:47:45</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4cadc59..9cdd3fb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -360,9 +360,12 @@
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
<Compile Include="DLL\ClsSc_ProcessSendWork.cs" />
+ <Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" />
+ <Compile Include="Models\ClsWW_EntrustProcessReportBillMain.cs" />
+ <Compile Include="Models\ClsWW_EntrustProcessReportBillSub.cs" />
<Compile Include="Models\DocumentsView.cs" />
<Compile Include="Models\Gy_RoutingBillSub.cs" />
<Compile Include="Models\LookingForBill.cs" />
@@ -377,6 +380,7 @@
<Compile Include="Models\Gy_RoutingBill.cs" />
<Compile Include="Models\StationBill.cs" />
<Compile Include="Models\StationOutBillView.cs" />
+ <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
--
Gitblit v1.9.1