From 55bd8bf046f91378a6eb1da3fa26a3a96e18ccc0 Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期六, 08 五月 2021 19:10:55 +0800
Subject: [PATCH] 1.增加PDA端的，委外工序计划汇报单模块 2.增加PDA端的，委外工序计划转出单模块 3.增加委外工序计划转出单模块
---
WebAPI/ListModels.cs | 36 ++
WebAPI/Models/ClsWW_EntrustProcessSendOutBillSub.cs | 102 ++++++
WebAPI/Models/WWReportViewModel.cs | 66 ++++
WebAPI/DLL/ClsWW_EntrustProcessSendOutBill.cs | 94 ++++++
WebAPI/Controllers/Sc_ProcessMangementController.cs | 428 ++++++++++++++++++++++++++++
WebAPI/Properties/PublishProfiles/API.pubxml.user | 8
WebAPI/Service/LuBaoSevice.cs | 46 ++
WebAPI/WebAPI.csproj | 5
WebAPI/Models/ClsWW_EntrustProcessSendOutBillMain.cs | 46 +++
WebAPI/Models/WWSendOutBillViewModel.cs | 65 ++++
10 files changed, 889 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 03ed5f1..981824b 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1750,5 +1750,433 @@
}
+ /// <summary>
+ /// 濮斿娲惧伐鍗曞彿鑾峰彇淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/WWgetHbarCodeDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> WWGetHbarCodeDetail(string sBillBarCode)
+ {
+ var model = LuBaoSevice.WWGetHbarCodeDetail(sBillBarCode);
+ return model;
+ }
+
+ /// <summary>
+ ///濮斿宸ュ簭鍙疯幏寰椾俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/WWgetProcDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> WWGetProcDetail(string sBillNo, string sProcNo)
+ {
+ var model = LuBaoSevice.WWGetProcDetail(sBillNo, sProcNo);
+ return model;
+ }
+
+ /// <summary>
+ /// PDA濮斿宸ュ簭姹囨姤鍗曚繚瀛�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWWReport")]
+ [HttpPost]
+ public object SaveWWReport([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ WebAPI.DLL.ClsWW_EntrustProcessReportBill ReportModel = new WebAPI.DLL.ClsWW_EntrustProcessReportBill();
+ List<WebAPI.Models.WWReportViewModel> ls = new List<WebAPI.Models.WWReportViewModel>();
+ ls = oListModels.getObjectByJson_WWReport(msg1);
+ int i = 0;
+
+ foreach (Models.WWReportViewModel ItemView in ls)
+ {
+ i++;
+ Models.ClsWW_EntrustProcessReportBillMain ReportMain = new Models.ClsWW_EntrustProcessReportBillMain();
+ Models.ClsWW_EntrustProcessReportBillSub ReportSub = new Models.ClsWW_EntrustProcessReportBillSub();
+ //宸ュ簭姹囨姤鍗曚富琛ㄤ繚瀛�
+ ReportMain.HBillType = "3742";
+ ReportMain.HBillNo = ItemView.HBillNo;
+ ReportMain.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ ReportMain.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ ReportMain.HDate = DateTime.Now;
+ ReportMain.HMaker = "";
+ ReportMain.HCloseType = false;
+ ReportMain.HPrintQty = 0;
+ ReportMain.HMainSourceBillType = "3740";
+ ReportMain.HMainSourceInterID =0;
+ ReportMain.HMainSourceBillNo = ItemView.HWW_BillNo;
+ ReportMain.HInterID = 0;
+ ReportMain.HPeriod = 1;
+ ReportMain.HBillSubType = "3742";
+ ReportMain.HBillStatus = 0;
+ ReportMain.HCheckItemNowID = 0;
+ ReportMain.HCheckItemNextID = 0;
+ ReportMain.HDeptID = Convert.ToInt32(ItemView.HDeptID);
+ ReportMain.HExplanation = "";
+ ReportMain.HInnerBillNo = "";
+ ReportMain.HSupID =Convert.ToInt32( ItemView.HSupID);
+
+
+ //淇濆瓨鍒版眹鎶ュ崟涓昏〃
+ ReportModel.omodel = ReportMain;
+
+
+ ReportSub.HMaterID = Convert.ToInt32(ItemView.HMaterID);
+ ReportSub.HICMOBillNo = "";
+ ReportSub.HICMOInterID = 0;
+ ReportSub.HEntryID = i;
+ ReportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ ReportSub.HRemark = "";
+ ReportSub.HCloseMan = "";
+ ReportSub.HCloseType = false;
+ ReportSub.HSourceBillType = "3740";
+ ReportSub.HQty = Convert.ToDecimal(ItemView.HQty);
+ ReportSub.HProcID =Convert.ToInt32( ItemView.HProcID);
+ ReportSub.HTimes = 0;
+ ReportSub.HSeOrderInterID = 0;
+ ReportSub.HSeOrderEntryID = 0;
+ ReportSub.HSeOrderBillNo = "";
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceInterID = 0;
+ ReportSub.HSourceBillNo = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HCheckQty = 0;
+ ReportSub.HBadCount = 0;
+ ReportSub.HWasterQty = 0;
+ ReportSub.HWasterQty2 = 0;
+ ReportSub.HPrice = 0;
+ ReportSub.HMoney = 0;
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanEntryID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceEntryID = 0;
+ ReportSub.HSourceBillType = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HBadPrirce = 0;
+ ReportSub.HBadMoney = 0;
+ ReportSub.HWasterPrice = 0;
+ ReportSub.HWasterMoney = 0;
+ ReportSub.HQualityRate = 0;
+ ReportSub.HUsingQty = 0;
+ ReportSub.HSelfBadCount = 0;
+ ReportSub.HPreBadCount = 0;
+ ReportSub.HPayMentQty = 0;
+ ReportSub.HPackType = "";
+ ReportSub.HCheckEmpID = 0;
+ ReportSub.HWeight = 0;
+ ReportSub.HBatchNo = "";
+
+ //淇濆瓨鍒板澶栨眹鎶ュ崟瀛愯〃
+ ReportModel.DetailColl.Add(ReportSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ bResult = ReportModel.AddBill(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="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWW_EntrustProcessSendOutBill")]
+ [HttpPost]
+ public object SaveWW_EntrustProcessSendOutBill([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_EntrustProcessSendOutBill Sendwork = new WebAPI.DLL.ClsWW_EntrustProcessSendOutBill();
+ List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain> lsmain = new List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_WW_EntrustProcessSendOutBillMain(msg2);
+ foreach (WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain 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_EntrustProcessSendOutBillSub> lss = new List<Models.ClsWW_EntrustProcessSendOutBillSub>();
+ foreach (WebAPI.Models.WW_EntrustProcSendWorkViewModel oItemSub in ls)
+ {
+
+ i++;
+ Models.ClsWW_EntrustProcessSendOutBillSub sendworksub = new Models.ClsWW_EntrustProcessSendOutBillSub();
+ 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
+ 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_EntrustProcessSendOutBillSub 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>
+ /// PDA濮斿宸ュ簭杞嚭鍗曚繚瀛�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWWSendOutBill")]
+ [HttpPost]
+ public object SaveWWSendOutBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ WebAPI.DLL.ClsWW_EntrustProcessSendOutBill ReportModel = new WebAPI.DLL.ClsWW_EntrustProcessSendOutBill();
+ List<WebAPI.Models.WWSendOutBillViewModel> ls = new List<WebAPI.Models.WWSendOutBillViewModel>();
+ ls = oListModels.getObjectByJson_WWSendOutBill(msg1);
+ int i = 0;
+
+ foreach (Models.WWSendOutBillViewModel ItemView in ls)
+ {
+ i++;
+ Models.ClsWW_EntrustProcessSendOutBillMain ReportMain = new Models.ClsWW_EntrustProcessSendOutBillMain();
+ Models.ClsWW_EntrustProcessSendOutBillSub ReportSub = new Models.ClsWW_EntrustProcessSendOutBillSub();
+ //宸ュ簭杞嚭鍗曚富琛ㄤ繚瀛�
+ ReportMain.HBillType = "3741";
+ ReportMain.HBillNo = ItemView.HBillNo;
+ ReportMain.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ ReportMain.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ ReportMain.HDate = DateTime.Now;
+ ReportMain.HMaker = "";
+ ReportMain.HCloseType = false;
+ ReportMain.HPrintQty = 0;
+ ReportMain.HMainSourceBillType = "3740";
+ ReportMain.HMainSourceInterID = 0;
+ ReportMain.HMainSourceBillNo = ItemView.HWW_BillNo;
+ ReportMain.HInterID = 0;
+ ReportMain.HPeriod = 1;
+ ReportMain.HBillSubType = "3741";
+ ReportMain.HBillStatus = 0;
+ ReportMain.HCheckItemNowID = 0;
+ ReportMain.HCheckItemNextID = 0;
+ ReportMain.HDeptID = Convert.ToInt32(ItemView.HDeptID);
+ ReportMain.HExplanation = "";
+ ReportMain.HInnerBillNo = "";
+ ReportMain.HSupID = Convert.ToInt32(ItemView.HSupID);
+
+
+ //淇濆瓨鍒拌浆鍑哄崟涓昏〃
+ ReportModel.omodel = ReportMain;
+
+
+ ReportSub.HMaterID = Convert.ToInt32(ItemView.HMaterID);
+ ReportSub.HICMOBillNo = "";
+ ReportSub.HICMOInterID = 0;
+ ReportSub.HEntryID = i;
+ ReportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ ReportSub.HRemark = "";
+ ReportSub.HCloseMan = "";
+ ReportSub.HCloseType = false;
+ ReportSub.HSourceBillType = "3740";
+ ReportSub.HQty = Convert.ToDecimal(ItemView.HQty);
+ ReportSub.HProcID = Convert.ToInt32(ItemView.HProcID);
+ ReportSub.HSeOrderInterID = 0;
+ ReportSub.HSeOrderEntryID = 0;
+ ReportSub.HSeOrderBillNo = "";
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceInterID = 0;
+ ReportSub.HSourceBillNo = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HPrice = 0;
+ ReportSub.HMoney = 0;
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanEntryID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceEntryID = 0;
+ ReportSub.HSourceBillType = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HPackType = "";
+ ReportSub.HBatchNo = "";
+
+ //淇濆瓨鍒板澶栬浆鍑哄崟瀛愯〃
+ ReportModel.DetailColl.Add(ReportSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ bResult = ReportModel.AddBill(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_EntrustProcessSendOutBill.cs b/WebAPI/DLL/ClsWW_EntrustProcessSendOutBill.cs
new file mode 100644
index 0000000..0e0555d
--- /dev/null
+++ b/WebAPI/DLL/ClsWW_EntrustProcessSendOutBill.cs
@@ -0,0 +1,94 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsWW_EntrustProcessSendOutBill : DBUtility.ClsXt_BaseBill
+ {
+ public WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain omodel = new WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain();
+ public List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillSub> DetailColl = new List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillSub>();
+
+ public ClsWW_EntrustProcessSendOutBill()
+ {
+
+ base.MvarItemKeySub = "WW_EntrustProcessSendOutBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "WW_EntrustProcessSendOutBillMain";
+ base.MvarReportTitle = "濮斿宸ュ簭璁″垝杞嚭鍗�";
+ base.BillType = "3741";
+ base.HBillSubType = "3741";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsWW_EntrustProcessSendOutBill()
+ {
+ DetailColl = null;
+ }
+
+ #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_EntrustProcessSendOutBillMain " +
+ "(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.ToString() + ",'" + omodel.HDeptID + "'," + omodel.HSupID.ToString() + "," + omodel.HEmpID.ToString() +
+ ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsWW_EntrustProcessSendOutBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into WW_EntrustProcessSendOutBillSub " +
+"([HInterID], [HBillNo_bak], [HEntryID], [HCloseMan], [HEntryCloseDate], [HCloseType], [HRemark], [HSourceInterID]" +
+",[HSourceEntryID], [HSourceBillNo], [HSourceBillType], [HRelationQty], [HRelationMoney], [HProcID]" +
+", [HSupFlag], [HMaterID], [HQty],[HPrice], [HMoney], [HBatchNo], [HPackType], [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.HQty.ToString() +
+ "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + ",'" + oSub.HBatchNo + "','" + oSub.HPackType+"'" +
+ "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo+ "'," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() +
+ ",'" + oSub.HICMOBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo +"'"+
+ ") ");
+
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 91a74a4..c47b8d8 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -285,5 +285,41 @@
return list;
}
+ /// <summary>
+ /// 瑙嗗浘妯″瀷json澶勭悊
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<WebAPI.Models.WWReportViewModel> getObjectByJson_WWReport(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<WebAPI.Models.WWReportViewModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.WWReportViewModel>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 濮斿杞嚭鍗曚富琛╦son澶勭悊
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain> getObjectByJson_WW_EntrustProcessSendOutBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 瑙嗗浘妯″瀷json澶勭悊
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<WebAPI.Models.WWSendOutBillViewModel> getObjectByJson_WWSendOutBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<WebAPI.Models.WWSendOutBillViewModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WebAPI.Models.WWSendOutBillViewModel>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsWW_EntrustProcessSendOutBillMain.cs b/WebAPI/Models/ClsWW_EntrustProcessSendOutBillMain.cs
new file mode 100644
index 0000000..4a110da
--- /dev/null
+++ b/WebAPI/Models/ClsWW_EntrustProcessSendOutBillMain.cs
@@ -0,0 +1,46 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsWW_EntrustProcessSendOutBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ /// <summary>
+ /// HPrintQty int --鎵撳嵃娆℃暟
+ /// </summary>
+ public Int64 HPrintQty { get; set; }
+
+ /// <summary>
+ /// HSupID int --渚涘簲鍟嗭紙Gy_Supplier锛�
+ /// </summary>
+ public Int64 HSupID { get; set; }//
+
+ /// <summary>
+ /// HDeptID int --閮ㄩ棬ID(Gy_Department)
+ /// </summary>
+ public Int64 HDeptID { get; set; }
+
+ /// <summary>
+ /// HSupID int --渚涘簲鍟嗭紙Gy_Supplier锛�
+ /// </summary>
+ public Int64 MyProperty { get; set; }
+
+ /// <summary>
+ /// HEmpID int --鑱屽憳锛圙y_Employee锛�
+ /// </summary>
+ public Int64 HEmpID { get; set; }
+
+ /// <summary>
+ /// HExplanation varchar(500) --鎽樿
+ /// </summary>
+ public string HExplanation { get; set; }
+
+ /// <summary>
+ /// HInnerBillNo varchar(50) --鍐呴儴鍗曟嵁鍙�
+ /// </summary>
+ public string HInnerBillNo { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsWW_EntrustProcessSendOutBillSub.cs b/WebAPI/Models/ClsWW_EntrustProcessSendOutBillSub.cs
new file mode 100644
index 0000000..a395d18
--- /dev/null
+++ b/WebAPI/Models/ClsWW_EntrustProcessSendOutBillSub.cs
@@ -0,0 +1,102 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsWW_EntrustProcessSendOutBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ /// <summary>
+ /// HBillNo_bak varchar(50) --鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ /// </summary>
+ public string HBillNo_bak { get; set; }
+
+ /// <summary>
+ /// HProcID int --宸ュ簭 锛坓y_Process锛�
+ /// </summary>
+ public Int64 HProcID { get; set; }
+
+ /// <summary>
+ /// HSupFlag bit --濮斿鏍囪
+ /// </summary>
+ public bool HSupFlag { get; set; }
+
+ /// <summary>
+ /// HMaterID int --浜у搧ID(Gy_Material)
+ /// </summary>
+ public Int64 HMaterID { get; set; }
+
+ /// <summary>
+ /// HQty dec(18,8) --鍙戝嚭鏁伴噺
+ /// </summary>
+ public decimal HQty { 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>
+ /// HPackType varchar(50) --鍖呰绫诲瀷
+ /// </summary>
+ public string HPackType { get; set; }
+
+ /// <summary>
+ /// HProcPlanInterID int --宸ュ簭璁″垝鍗旾D
+ /// </summary>
+ public Int64 HProcPlanInterID { get; set; }
+
+ /// <summary>
+ /// HProcPlanEntryID int --宸ュ簭璁″垝鍗曞瓙ID
+ /// </summary>
+ public Int64 HProcPlanEntryID { get; set; }
+
+ /// <summary>
+ /// HProcPlanBillNo varchar(50) --宸ュ簭璁″垝鍗曞彿
+ /// </summary>
+ public string HProcPlanBillNo { get; set; }
+
+ /// <summary>
+ /// HICMOInterID int --浠诲姟鍗旾D
+ /// </summary>
+ public Int64 HICMOInterID { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public Int64 HICMOEntryID { get; set; }
+
+ /// <summary>
+ /// HICMOBillNo varchar(50) --浠诲姟鍗曞彿
+ /// </summary>
+ public string HICMOBillNo { get; set; }
+
+ /// <summary>
+ /// HSeOrderInterID int --閿�鍞鍗曚富ID
+ /// </summary>
+ public Int64 HSeOrderInterID { get; set; }
+
+ /// <summary>
+ /// HSeOrderEntryID int --閿�鍞瓙ID
+ /// </summary>
+ public Int64 HSeOrderEntryID { get; set; }
+
+ /// <summary>
+ /// HSeOrderBillNo varchar(50) --閿�鍞鍗曞彿
+ /// </summary>
+ public string HSeOrderBillNo { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/WWReportViewModel.cs b/WebAPI/Models/WWReportViewModel.cs
new file mode 100644
index 0000000..a24b6f5
--- /dev/null
+++ b/WebAPI/Models/WWReportViewModel.cs
@@ -0,0 +1,66 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class WWReportViewModel
+ {
+ /// <summary>
+ /// 鏉″舰鐮佺紪鐮�
+ /// </summary>
+ public string HBarCode;
+
+ /// <summary>
+ /// 濮斿娲惧伐鍗曞彿
+ /// </summary>
+ public string HWW_BillNo;
+
+ /// <summary>
+ /// 濮斿姹囨姤鍗曞彿
+ /// </summary>
+ public string HBillNo;
+
+ /// <summary>
+ /// 宸ュ簭鍙�
+ /// </summary>
+ public string HProcNo;
+
+ /// <summary>
+ /// 宸ュ簭id
+ /// </summary>
+ public string HProcID;
+
+ /// <summary>
+ /// 鍒涘缓浜篿d
+ /// </summary>
+ public string HEmpID;
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string HQty;
+
+ /// <summary>
+ /// 渚涘簲鍟唅d
+ /// </summary>
+ public string HSupID;
+
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public string HReportTime;
+
+ /// <summary>
+ /// 浜у搧id
+ /// </summary>
+ public string HMaterID;
+
+ /// <summary>
+ /// 閮ㄩ棬id
+ /// </summary>
+ public string HDeptID;
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/WWSendOutBillViewModel.cs b/WebAPI/Models/WWSendOutBillViewModel.cs
new file mode 100644
index 0000000..d9c34a5
--- /dev/null
+++ b/WebAPI/Models/WWSendOutBillViewModel.cs
@@ -0,0 +1,65 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class WWSendOutBillViewModel
+ {
+ /// <summary>
+ /// 鏉″舰鐮佺紪鐮�
+ /// </summary>
+ public string HBarCode;
+
+ /// <summary>
+ /// 濮斿娲惧伐鍗曞彿
+ /// </summary>
+ public string HWW_BillNo;
+
+ /// <summary>
+ /// 濮斿杞嚭鍗曞彿
+ /// </summary>
+ public string HBillNo;
+
+ /// <summary>
+ /// 宸ュ簭鍙�
+ /// </summary>
+ public string HProcNo;
+
+ /// <summary>
+ /// 宸ュ簭id
+ /// </summary>
+ public string HProcID;
+
+ /// <summary>
+ /// 鍒涘缓浜篿d
+ /// </summary>
+ public string HEmpID;
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public string HQty;
+
+ /// <summary>
+ /// 渚涘簲鍟唅d
+ /// </summary>
+ public string HSupID;
+
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public string HReportTime;
+
+ /// <summary>
+ /// 浜у搧id
+ /// </summary>
+ public string HMaterID;
+
+ /// <summary>
+ /// 閮ㄩ棬id
+ /// </summary>
+ public string HDeptID;
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index a9faf15..2ea36ea 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-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>
+ <History>True|2021-05-08T11:04:07.1084339Z;True|2021-05-08T18:04:40.2166839+08:00;True|2021-05-08T18:04:32.5635574+08:00;True|2021-05-08T18:01:24.5206432+08:00;True|2021-05-08T17:38:05.5582200+08:00;True|2021-05-08T15:26:55.2861241+08:00;True|2021-05-08T14:52:13.1682476+08:00;True|2021-05-08T14:50:30.5356438+08:00;True|2021-05-08T14:38:40.3445313+08:00;True|2021-05-08T14:38:37.9504757+08:00;True|2021-05-08T14:30:31.9762236+08:00;True|2021-05-08T14:21:37.4496495+08:00;True|2021-05-07T20:47:46.1401919+08:00;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">
@@ -171,10 +171,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>05/07/2021 20:47:25</publishTime>
+ <publishTime>05/08/2021 19:03:59</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>05/07/2021 20:47:25</publishTime>
+ <publishTime>05/08/2021 19:03:59</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -351,7 +351,7 @@
<publishTime>05/06/2021 09:48:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>05/07/2021 20:47:45</publishTime>
+ <publishTime>05/08/2021 19:04:06</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index 98c4fd1..78e912e 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -11,7 +11,7 @@
{
/// <summary>
- /// 鎵爜鏂规硶
+ /// 宸ュ簭姹囨姤鎵爜鏂规硶
/// </summary>
public static ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
{
@@ -27,7 +27,28 @@
public static DataSet GetBarCodeDb(string billBarCode)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_Sc_ProcessSendWorkList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where HBillType='3712' and 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_Sc_ProcessSendWorkList");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 濮斿宸ュ簭姹囨姤鎵爜鏂规硶
+ /// </summary>
+ public static ApiResult<DataSet> WWGetHbarCodeDetail(string sBillBarCode)
+ {
+ if (string.IsNullOrEmpty(sBillBarCode))
+ return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜涓嶈兘涓虹┖" };
+ sBillBarCode = sBillBarCode.CompareTo("#") > 0 ? sBillBarCode.Split(Convert.ToChar("#"))[0] : sBillBarCode;
+ var dataSet = WWGetBarCodeDb(sBillBarCode);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ澶栨淳宸ュ崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+
+ public static DataSet WWGetBarCodeDb(string billBarCode)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_WW_EntrustProcSendWorkBillList where HBillType='3740' and 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_WW_EntrustProcSendWorkBillList");
return dataSet;
}
@@ -47,10 +68,29 @@
public static DataSet GetProcDb(string sBillNo, string sProcNo)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where 鍗曟嵁鍙�= '" + sBillNo + "' and HprocID='" + sProcNo + "'", "h_v_Sc_ProcessSendWorkList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where HBillType='3712' and 鍗曟嵁鍙�= '" + sBillNo + "' and HprocID='" + sProcNo + "'", "h_v_Sc_ProcessSendWorkList");
return dataSet;
}
+ /// <summary>
+ /// PDA濮斿姹囨姤鍗曞洖杞︽柟娉�
+ /// </summary>
+ public static ApiResult<DataSet> WWGetProcDetail(string sBillNo, string sProcNo)
+ {
+ if (string.IsNullOrEmpty(sBillNo) || string.IsNullOrEmpty(sProcNo))
+ return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜鍜屾祦杞崱涓嶈兘涓虹┖" };
+ var dataSet = WWGetProcDb(sBillNo, sProcNo);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+
+ public static DataSet WWGetProcDb(string sBillNo, string sProcNo)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_WW_EntrustProcSendWorkBillList where HBillType='3740' and 鍗曟嵁鍙�= '" + sBillNo + "' and HprocID='" + sProcNo + "'", "h_v_WW_EntrustProcSendWorkBillList");
+ return dataSet;
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 9cdd3fb..94a1179 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -361,11 +361,14 @@
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
<Compile Include="DLL\ClsSc_ProcessSendWork.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
+ <Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.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\ClsWW_EntrustProcessSendOutBillMain.cs" />
+ <Compile Include="Models\ClsWW_EntrustProcessSendOutBillSub.cs" />
<Compile Include="Models\DocumentsView.cs" />
<Compile Include="Models\Gy_RoutingBillSub.cs" />
<Compile Include="Models\LookingForBill.cs" />
@@ -380,6 +383,8 @@
<Compile Include="Models\Gy_RoutingBill.cs" />
<Compile Include="Models\StationBill.cs" />
<Compile Include="Models\StationOutBillView.cs" />
+ <Compile Include="Models\WWReportViewModel.cs" />
+ <Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
<Compile Include="Properties\Resources.Designer.cs">
--
Gitblit v1.9.1