From 5d72b382b9251cffaf2c71c2e42d94bf1db41afa Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期三, 14 四月 2021 12:42:53 +0800 Subject: [PATCH] 新增组托单模块及列表 --- WebAPI/Controllers/Sc_GroupOrderBillController.cs | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++ WebAPI/Models/GroupOrderBill.cs | 17 ++++ WebAPI/WebAPI.csproj | 4 3 files changed, 233 insertions(+), 1 deletions(-) diff --git a/WebAPI/Controllers/Sc_GroupOrderBillController.cs b/WebAPI/Controllers/Sc_GroupOrderBillController.cs new file mode 100644 index 0000000..fa93207 --- /dev/null +++ b/WebAPI/Controllers/Sc_GroupOrderBillController.cs @@ -0,0 +1,213 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //缁勬墭鍗旵ontroller + public class Sc_GroupOrderBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + string HBillType = "2601"; + + /// <summary> + /// 鎵绠辩爜鏂规硶 + /// </summary> + /// <param name="HInterID">缁勬墭鍗旾D</param> + /// <param name="HBillNo">缁勬墭鍗昇o</param> + /// <param name="HBillTyp">缁勬墭鍗曠被鍨�</param> + /// <param name="HMaker">缁勬墭鍗曞埗鍗曚汉</param> + /// <param name="HBarCode_Pack">瑁呯鍗曟潯鐮�</param> + /// <returns>object</returns> + [Route("GroupOrderBill/GetPackBarCode")] + [HttpGet] + public object GetPackBarCode(int HInterID,string HBillNo,string HBillTyp,string HMaker, string HBarCode_Pack) + { + try + { + if (HBarCode_Pack == null || HBarCode_Pack.Equals("")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璇疯緭鍏ヨ绠辩爜锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + //鍒ゆ柇鏄惁宸叉壂鐮侊紝骞跺瓨鍏ョ紦瀛樿〃锛堣嫢鏈壂鐮侊級 + ds = oCN.RunProcReturn("exec h_p_PackToTemp " + HInterID + ",'" + HBillNo + "','" + HBillTyp + "','" + HMaker + "','" + HBarCode_Pack + "'", "h_p_PackToTemp"); + if (ClsPub.isInt(ds.Tables[0].Rows[0][0]) == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();//璇ヨ绠卞崟宸叉壂鐮侊紒 + objJsonResult.data = null; + return objJsonResult; + } + //else + //{ + // //杩斿洖瑁呯鍗曟暟鎹�(宸插悎骞跺埌瀛樺偍杩囩▼鈥榟_p_PackToTemp鈥欎腑) + // ds = oCN.RunProcReturn("exec h_p_GroupOrderBill_GetPackBarCode '" + HBarCode_Pack + "'", "h_p_GroupOrderBill_GetPackBarCode"); + //} + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛佹棤鏁版嵁锛岃纭瑁呯鐮佹槸鍚﹀瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + /// </summary> + /// <param name="oMain">缁勬墭鍗曞疄渚嬪璞�</param> + /// <returns>object</returns> + [Route("GroupOrderBill/AddBill")] + [HttpPost] + public object AddBill([FromBody] JObject oMain) + { + var _value = oMain["oMain"].ToString(); + string msg1 = _value.ToString(); + try + { + //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲 + msg1 = "[" + msg1.ToString() + "]"; + List<GroupOrderBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupOrderBill>>(msg1); + //鑾峰彇骞存湀鏃ュ苟鎷兼帴鎴愬瓧绗︿覆 + string year = DateTime.Now.Year.ToString(); + string month = DateTime.Now.Month.ToString(); + string day = DateTime.Now.Day.ToString(); + string nowDate = year + month + day; + string HBillType = this.HBillType;//缁勬墭鍗曠被鍨� + long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹甆o + string HMaker = list[0].HMaker;//鍒跺崟浜� + //鐢熸垚鍞竴鏉$爜 + ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + nowDate + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 + oCN.RunProc("exec h_p_WMS_SetMaxNo '" + nowDate + "'"); + string LSH = ClsPub.isStrNull(ds.Tables[0].Rows[0][0]); + string HBarCode_Pack = nowDate + LSH; + oCN.BeginTran(); + //鎻掑叆涓昏〃 + oCN.RunProc( + "insert into Sc_PackUnionBillMain " + + "(" + + "HYear, HBillType, HInterID, HBillNo, HMaker" + + ", HMakeDate, HPeriod, HDate, HRemark, HICMOInterID" + + ", HICMOBillNo, HBarCode_Pack, HMaterID, HUnitID" + + ")" + + "values" + + "(" + + "'"+ year + "', '" + HBillType + "'," + HInterID + ", '" + HBillNo + "', '" + HMaker + "'" + + ",GETDATE(),0,GETDATE(),' ',0" + + ",' ','"+ HBarCode_Pack + "',0,0" + + ")" + ); + //鎻掑叆瀛愯〃 + oCN.RunProc("exec h_p_SaveGroupOrder " + HInterID + ""); + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 杩斿洖鍒楄〃 + /// </summary> + /// <param name="sWhere">鎷兼帴鐨凷QL</param> + /// <returns>object</returns> + [Route("GroupOrderBill/List")] + [HttpGet] + public object List(string sWhere) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_GroupOrderBillList order by 鍒跺崟鏃堕棿 desc", "h_v_GroupOrderBillList"); + } + else + { + string sql1 = "select * from h_v_GroupOrderBillList where 1 = 1 "; + string sql = sql1 + sWhere; + string sql2 = " order by 鍒跺崟鏃堕棿 desc"; + sql += sql2; + ds = oCN.RunProcReturn(sql, "h_v_GroupOrderBillList"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳暟鎹紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Models/GroupOrderBill.cs b/WebAPI/Models/GroupOrderBill.cs new file mode 100644 index 0000000..504ec9d --- /dev/null +++ b/WebAPI/Models/GroupOrderBill.cs @@ -0,0 +1,17 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class GroupOrderBill + { + public long HInterID { get; set; } + public string HBillNo { get; set; } + public string HMaker { get; set; } + //public int HYear { get; set; } + //public double HPeriod { get; set; } + //public DateTime HStationInTime { get; set; } + } +} \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 311410c..a39599c 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -224,6 +224,7 @@ <Content Include="Scripts\bootstrap.js" /> <Content Include="Scripts\bootstrap.min.js" /> <Fakes Include="Fakes\Newtonsoft.Json.fakes" /> + <None Include="Properties\PublishProfiles\API.pubxml" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> @@ -313,6 +314,7 @@ <Compile Include="Controllers\EntrustOutBackController.cs" /> <Compile Include="Controllers\EntrustOutController.cs" /> <Compile Include="Controllers\Kf_EntrustInBillController.cs" /> + <Compile Include="Controllers\Sc_GroupOrderBillController.cs" /> <Compile Include="Controllers\MateOutController.cs" /> <Compile Include="Controllers\MoveStockBillController.cs" /> <Compile Include="Controllers\OtherOutBillController.cs" /> @@ -328,6 +330,7 @@ <Compile Include="Controllers\SellOutController.cs" /> <Compile Include="ListModels.cs" /> <Compile Include="Models\ClsCg_POInStockBill.cs" /> + <Compile Include="Models\GroupOrderBill.cs" /> <Compile Include="Models\json.cs" /> <Compile Include="Controllers\WebAPIController.cs" /> <Compile Include="Global.asax.cs"> @@ -356,7 +359,6 @@ <Content Include="fonts\glyphicons-halflings-regular.woff" /> <Content Include="fonts\glyphicons-halflings-regular.ttf" /> <Content Include="fonts\glyphicons-halflings-regular.eot" /> - <None Include="Properties\PublishProfiles\PDAWeb.pubxml" /> <None Include="Properties\PublishProfiles\WEBAPI.pubxml" /> <Content Include="Views\Shared\Error.cshtml" /> <Content Include="Views\_ViewStart.cshtml" /> -- Gitblit v1.9.1