From cfda752a37242ba2ed68124293498abce7fc974f Mon Sep 17 00:00:00 2001 From: wyb <1qaz@123> Date: 星期四, 06 五月 2021 18:14:37 +0800 Subject: [PATCH] 委外工单下推委外工序派工单完成 --- WebAPI/ListModels.cs | 25 ++ WebAPI/Controllers/Sc_ProcessMangementController.cs | 174 ++++++++++++++ WebAPI/Models/WW_EntrustWorkOrderViewModel.cs | 51 ++++ WebAPI/Properties/PublishProfiles/API.pubxml.user | 132 +++++----- WebAPI/Models/ClsSc_ProcessSendWorkMain.cs | 39 +++ WebAPI/WebAPI.csproj | 3 WebAPI/DLL/ClsSc_ProcessSendWork.cs | 292 ++++++++++++++++++++++++ 7 files changed, 650 insertions(+), 66 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index ccf0739..dc74d15 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -465,6 +465,180 @@ } /// <summary> + /// 淇濆瓨濮斿娲惧伐鍗曚俊鎭� + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("SaveWWProcessSendWork")] + [HttpPost] + public object SaveWWProcessSendWork([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.ClsSc_ProcessSendWork Sendwork = new WebAPI.DLL.ClsSc_ProcessSendWork(); + List<WebAPI.Models.ClsSc_ProcessSendWorkMain> lsmain = new List<WebAPI.Models.ClsSc_ProcessSendWorkMain>(); + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); + lsmain = oListModels.getObjectByJson_WWSendWorkMain(msg2); + foreach (WebAPI.Models.ClsSc_ProcessSendWorkMain 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; + if (DBUtility.ClsPub.isStrNull(oItem.HPlanBeginDate) == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊~鍐欒鍒掑紑宸ユ棩鏈燂紝鏃犳硶淇濆瓨锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + + Sendwork.omodel = oItem; + + + } + + //琛ㄤ綋鏁版嵁 + //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� + msg3 = msg3.Substring(1, msg3.Length - 2); + msg3 = msg3.Replace("\\", ""); + msg3 = msg3.Replace("\n", ""); //\n + List<WebAPI.Models.WW_EntrustWorkOrderViewModel> ls = new List<WebAPI.Models.WW_EntrustWorkOrderViewModel>(); + ls = oListModels.getObjectByJson_WWSendWorkSub(msg3); + int i = 0; + List<Model.ClsSc_ProcessSendWorkSub> lss = new List<Model.ClsSc_ProcessSendWorkSub>(); + foreach (WebAPI.Models.WW_EntrustWorkOrderViewModel oItemSub in ls) + { + + i++; + Model.ClsSc_ProcessSendWorkSub sendworksub = new Model.ClsSc_ProcessSendWorkSub(); + sendworksub.HProcID = 0;//--宸ュ簭ID + sendworksub.HSourceInterID = (long)oItemSub.hmainid;//婧愬崟id + sendworksub.HSourceEntryID = oItemSub.hsubid; //--婧愬崟瀛怚D + sendworksub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿 + sendworksub.HSourceBillType = oItemSub.HBillType; //--婧愬崟绫诲瀷 + sendworksub.HQty = oItemSub.鏁伴噺; //--鏁伴噺 + sendworksub.HICMOBillNo = ""; //--浠诲姟鍗曞彿 + sendworksub.HSeOrderBillNo = ""; //--閿�鍞鍗曞彿 + sendworksub.HSeOrderEntryID = 0; //--閿�鍞瓙ID + sendworksub.HSeOrderInterID = 0; //--閿�鍞鍗曚富ID + sendworksub.HPlanTimes = 0; //--璁″垝宸ユ椂 + sendworksub.HPlanEndDate = DateTime.Now; //--璁″垝瀹屽伐鏃ユ湡 + sendworksub.HPlanBeginDate = DateTime.Now; //--璁″垝寮�宸ユ棩鏈� + sendworksub.HQty = (double)oItemSub.鏁伴噺; //--娲惧伐鏁伴噺 + sendworksub.HWorkerNumber = ""; //--鎿嶄綔宸ヤ唬鐮� + sendworksub.HWorkerID = 0; //--鎿嶄綔宸D + sendworksub.HGroupNumber = ""; //鐝粍浠g爜 + sendworksub.HGroupID =0; //--鐝粍ID + sendworksub.HSourceNumber = ""; //--鐢熶骇璧勬簮浠g爜 + //--鐢熶骇璧勬簮ID + sendworksub.HProcNumber = ""; //--宸ュ簭浠g爜 + + 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; + } + //if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "") + //{ + // 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 (Model.ClsSc_ProcessSendWorkSub 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; + } + } + + /// <summary> /// 杩斿洖濮斿宸ュ崟鍒楄〃 /// </summary> /// <param name="sWhere"></param> diff --git a/WebAPI/DLL/ClsSc_ProcessSendWork.cs b/WebAPI/DLL/ClsSc_ProcessSendWork.cs new file mode 100644 index 0000000..559bc66 --- /dev/null +++ b/WebAPI/DLL/ClsSc_ProcessSendWork.cs @@ -0,0 +1,292 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace WebAPI.DLL +{ + public class ClsSc_ProcessSendWork:DBUtility.ClsXt_BaseBill + { + public WebAPI.Models.ClsSc_ProcessSendWorkMain omodel = new WebAPI.Models.ClsSc_ProcessSendWorkMain(); + public List<Model.ClsSc_ProcessSendWorkSub> DetailColl = new List<Model.ClsSc_ProcessSendWorkSub>(); + + public ClsSc_ProcessSendWork() + { + base.MvarItemKeySub = "Sc_ProcessSendWorkSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey="Sc_ProcessSendWorkMain"; + base.MvarReportTitle="濮斿宸ュ簭娲惧伐鍗�"; + base.BillType="3740"; + } + + #region 鍥哄畾浠g爜 + + ~ClsSc_ProcessSendWork() + { + DetailColl = null; + } + + #endregion 鑷畾涔夋柟娉� + //淇敼鍗曟嵁 + 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); + } + } + //鏂板鍗曟嵁 + 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_ProcessSendWorkMain " + + "(HYear,HPeriod,HBillType,HBillSubType,HInterID" + + ",HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID" + + ",HCheckFlowID,HICMOInterID,HICMOBillNo,HProcPlanBillNo,HPlanBeginDate" + + ",HPlanEndDate,HBatchNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" + + ",HProcID,HProcNumber,HDeptID,HDeptNumber,HGroupID" + + ",HGroupNumber,HMaterID,HMaterNumber,HUnitID,HUnitNumber" + + ",HRoutingInterID,HPlanQty,HExplanation,HInnerBillNo,HRemark" + + ",HMaker,HMakeDate,HSupID" + + ") " + + " values(" + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + this.BillType + "','" + omodel.HBillSubType + "'," + omodel.HInterID.ToString() + + ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() + + "," + omodel.HCheckFlowID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "','" + omodel.HProcPlanBillNo + "','" + omodel.HPlanBeginDate.ToShortDateString() +"'"+ + ",'" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HBatchNo + "'," + omodel.HSeOrderInterID.ToString() + "," + omodel.HSeOrderEntryID.ToString() + ",'" + omodel.HSeOrderBillNo +"'"+ + "," + omodel.HProcID.ToString() + ",'" + omodel.HProcNumber + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'," + omodel.HGroupID.ToString() + + ",'" + omodel.HGroupNumber + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HUnitNumber +"'"+ + "," + omodel.HRoutingInterID.ToString() + "," + omodel.HPlanQty.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRemark + "'" + + ",'" + DBUtility.ClsPub.CurUserName + "',getdate()" + ","+omodel.HSupID.ToString()+ + ") "); + //鎻掑叆瀛愯〃 + 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); + } + } + //鏄剧ず鍗曟嵁 + public override bool ShowBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //鏌ヨ涓昏〃 + DataSet Ds ; + Ds = oCn.RunProcReturn("Select * from Sc_ProcessSendWorkMain Where HInterID=" + lngBillKey.ToString(), "Sc_ProcessSendWorkMain"); + 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.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]); + // + omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]); + omodel.HICMOBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HICMOBillNo"]); + omodel.HProcPlanBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcPlanBillNo"]); + omodel.HPlanBeginDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HPlanBeginDate"]); + omodel.HPlanEndDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HPlanEndDate"]); + omodel.HBatchNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBatchNo"]); + omodel.HSeOrderInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSeOrderInterID"]); + omodel.HSeOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSeOrderEntryID"]); + omodel.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSeOrderBillNo"]); + omodel.HProcID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcID"]); + omodel.HProcNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProcNumber"]); + omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]); + omodel.HDeptNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDeptNumber"]); + omodel.HGroupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HGroupID"]); + omodel.HGroupNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HGroupNumber"]); + omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]); + omodel.HMaterNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber"]); + omodel.HUnitID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HUnitID"]); + omodel.HUnitNumber = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUnitNumber"]); + omodel.HRoutingInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HRoutingInterID"]); + omodel.HPlanQty = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HPlanQty"]); + 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_ProcessSendWorkSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_ProcessSendWorkSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsSc_ProcessSendWorkSub oSub = new Model.ClsSc_ProcessSendWorkSub(); + oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]); + oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]); + // + oSub.HProcID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcID"]); + oSub.HProcNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcNumber"]); + oSub.HGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HGroupID"]); + oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HGroupNumber"]); + oSub.HSourceID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceID"]); + oSub.HSourceNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSourceNumber"]); + oSub.HWorkerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWorkerID"]); + oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWorkerNumber"]); + oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]); + oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HPlanBeginDate"]); + oSub.HPlanEndDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HPlanEndDate"]); + oSub.HPlanTimes = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HPlanTimes"]); + oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]); + oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]); + oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]); + oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HICMOBillNo"]); + oSub.HICMOInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOInterID"]); + oSub.HProcPlanInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanInterID"]); + oSub.HProcPlanEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProcPlanEntryID"]); + oSub.HProcPlanBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcPlanBillNo"]); + // + 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); + } + } + + + } + +} diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 54af3c6..70c4593 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -153,6 +153,31 @@ } /// <summary> + /// 濮斿娲惧伐鍗曚富琛╦son澶勭悊 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<WebAPI.Models.ClsSc_ProcessSendWorkMain> getObjectByJson_WWSendWorkMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<WebAPI.Models.ClsSc_ProcessSendWorkMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.ClsSc_ProcessSendWorkMain>>(jsonString); + return list; + } + + /// <summary> + /// 濮斿宸ュ崟瑙嗗浘妯″瀷json澶勭悊 + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<WebAPI.Models.WW_EntrustWorkOrderViewModel> getObjectByJson_WWSendWorkSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<WebAPI.Models.WW_EntrustWorkOrderViewModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.WW_EntrustWorkOrderViewModel>>(jsonString); + return list; + } + + + /// <summary> /// 璁″垝鍗曡鍥炬ā鍨媕son澶勭悊 /// </summary> /// <param name="jsonString"></param> diff --git a/WebAPI/Models/ClsSc_ProcessSendWorkMain.cs b/WebAPI/Models/ClsSc_ProcessSendWorkMain.cs new file mode 100644 index 0000000..1e89aab --- /dev/null +++ b/WebAPI/Models/ClsSc_ProcessSendWorkMain.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WebAPI.Models +{ + public class ClsSc_ProcessSendWorkMain:DBUtility.ClsXt_BaseBillMain + { + public string HBillSubType;// varchar(50) --子类型 (界面不显示,新增) + public Int64 HCheckItemNowID;// int --当前审核项目(默认值 0) 界面上不需要显示 + public Int64 HCheckItemNextID;// int --待审核项目(默认值 0) 界面上不需要显示 + public Int64 HCheckFlowID;// int --审批流(默认值 0) + public Int64 HICMOInterID;// int --任务单ID + public string HICMOBillNo;// varchar(50) --任务单号 + public string HProcPlanBillNo;// varchar(50) --工序计划单号 + public DateTime HPlanBeginDate;// datetime --工序计划开工日期 + public DateTime HPlanEndDate;// datetime --工序计划完工日期 + public string HBatchNo;// varchar(50) --批号 + public Int64 HSeOrderInterID;// int --销售订单主ID + public Int64 HSeOrderEntryID;// int --销售子ID + public string HSeOrderBillNo;// varchar(50) --销售订单号 + public Int64 HProcID;// int --工序ID + public string HProcNumber;// varchar(50) --工序代码 + public Int64 HDeptID;// int --部门ID + public string HDeptNumber;// varchar(50) --部门代码 + public Int64 HGroupID;// int --班组ID + public string HGroupNumber;// varchar(50) --班组代码 + public Int64 HMaterID;// int --产品ID + public string HMaterNumber;// varchar(100) --产品代码 + public Int64 HUnitID;// int --单位ID + public string HUnitNumber;// varchar(50) --单位代码 + public Int64 HRoutingInterID;// int --工序路线ID + public double HPlanQty;// dec(18,8) --工序计划生产数量 + public string HExplanation;// varchar(100) --摘要 + public string HInnerBillNo;// varchar(100) --内部单据号 + public bool HCloseType;// bit --关闭类型 (默认为0) + public Int64 HSupID;// int --供应商ID + } +} diff --git a/WebAPI/Models/WW_EntrustWorkOrderViewModel.cs b/WebAPI/Models/WW_EntrustWorkOrderViewModel.cs new file mode 100644 index 0000000..0fcd6dc --- /dev/null +++ b/WebAPI/Models/WW_EntrustWorkOrderViewModel.cs @@ -0,0 +1,51 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class WW_EntrustWorkOrderViewModel + { + + public int hmainid { get; set; } + public DateTime? 鏃ユ湡 { get; set; } + public string 鍗曟嵁鍙� { get; set; } + public int HDeptID { get; set; } + public string 閮ㄩ棬 { get; set; } + public int HMaterID { get; set; } + public string 鐗╂枡浠g爜 { get; set; } + public string 鐗╂枡鍚嶇О { get; set; } + + public string 瑙勬牸鍨嬪彿 { get; set; } + public string 琛ㄥご澶囨敞 { get; set; } + public int hsubid { get; set; } + public int HEmpID { get; set; } + public string 鑱屽憳 { get; set; } + public string 宸ュ簭 { get; set; } + public int 鍗曚环 { get; set; } + public int 鏁伴噺 { 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 string HBillSubType { 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 d94aa78..86f3ec7 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -7,12 +7,12 @@ <PropertyGroup> <TimeStampOfAssociatedLegacyPublishXmlFile /> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2021-04-28T02:18:54.1336497Z;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-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> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>04/12/2021 11:33:15</publishTime> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -21,19 +21,19 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>04/26/2020 09:57:16</publishTime> @@ -51,7 +51,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -60,13 +60,13 @@ <publishTime>01/04/2011 13:48:18</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>05/21/2020 10:51:50</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -132,7 +132,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -165,10 +165,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>04/29/2021 17:05:17</publishTime> + <publishTime>05/06/2021 18:11:32</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>04/29/2021 17:05:17</publishTime> + <publishTime>05/06/2021 18:11:32</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -186,163 +186,163 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/21/2020 10:51:50</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Global.asax"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Index.html"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="packages.config"> - <publishTime>01/21/2021 13:19:40</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/web.config"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>05/06/2021 09:48:41</publishTime> </File> <File Include="Web.config"> - <publishTime>04/29/2021 17:05:21</publishTime> + <publishTime>05/06/2021 18:11:36</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 0bc49e6..4cadc59 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -359,8 +359,10 @@ <Compile Include="DbUntil\DataFormatUntil.cs" /> <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" /> <Compile Include="DLL\ClsSc_ProcessReport.cs" /> + <Compile Include="DLL\ClsSc_ProcessSendWork.cs" /> <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> + <Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" /> <Compile Include="Models\DocumentsView.cs" /> <Compile Include="Models\Gy_RoutingBillSub.cs" /> <Compile Include="Models\LookingForBill.cs" /> @@ -375,6 +377,7 @@ <Compile Include="Models\Gy_RoutingBill.cs" /> <Compile Include="Models\StationBill.cs" /> <Compile Include="Models\StationOutBillView.cs" /> + <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" /> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> -- Gitblit v1.9.1