WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -151,7 +151,7 @@ List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1); long HItemID = list[0].HItemID; long HItemID = list[0].HInterID; string HNumber = list[0].HNumber; string HShortNumber = list[0].HShortNumber; string HName = list[0].HName; @@ -253,21 +253,22 @@ var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); string msg4 = sArray[2].ToString(); string msg5 = sArray[3].ToString(); string msg2 = sArray[0].ToString(); //表头数据 string msg3 = sArray[1].ToString(); //列表主ID string msg4 = sArray[2].ToString(); //登录人员 string msg5 = sArray[3].ToString(); //权限模块代码 //反序列化 msg2 = "[" + msg2.ToString() + "]"; List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2); long HItemID = list[0].HItemID; long HItemID = list[0].HInterID; string HNumber = list[0].HNumber; string HShortNumber = list[0].HShortNumber; string HName = list[0].HName; long HParentID = list[0].HParentID; long HLevel = list[0].HLevel; string HEndFlag = list[0].HEnfFlag; bool HStopflag = list[0].HStopflag; string HHelpCode = list[0].HHelpCode; string HShortName = list[0].HShortName; string HAddress = list[0].HAddress; @@ -330,11 +331,35 @@ oCN.BeginTran(); //主表 oCN.RunProc("Update Gy_Supplier set " + " HNumber='" + HNumber + "'" + ",HName='" + HName + "'" + ",HShortNumber='" + HShortNumber + "'" + ",HParentID=" + HParentID + ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); " HNumber='" + HNumber + "'" + ",HName='" + HName + "'" + ",HShortNumber='" + HShortNumber + "'" + ",HParentID=" + HParentID.ToString() + ",HLevel=" + HLevel.ToString() + ",HStopflag=" + HStopflag + ",HRemark= '" + HRemark + "'" + ",HHelpCode='" + HHelpCode + "'" + ",HShortName='" + HShortName + "'" + ",HAddress='" + HAddress + "'" + ",HLinkMan='" + HLinkMan + "'" + ",HLinkPhone='" + HLinkPhone + "'" + ",HMobilePhone='" + HMobilePhone + "'" + ",HFax='" + HFax + "'" + ",HPostalCode='" + HPostalCode + "'" + ",HEmail='" + HEmail + "'" + ",HBank='" + HBank + "'" + ",HBankAccount='" + HBankAccount + "'" + ",HTaxNum='" + HTaxNum + "'" + ",HTaxRate=" + HTaxRate.ToString() + ",HCountry='" + HCountry + "'" + ",HCorMan='" +HCorMan + "'" + ",HEnglishName='" + HEnglishName + "'" + ",HEnglishAddress='" + HEnglishAddress + "'" + ",HCurID=" + HCurID.ToString() + ",HSSID=" + HSSID.ToString() + ",HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); //修改子项目代码 //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); //将上级 为非末级 WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
New file @@ -0,0 +1,224 @@ using 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 { //质量汇报单Controller //数据库主表Sc_QualityReportBillMain //数据库子表Sc_QualityReportBillSub public class Sc_QualityReportBillController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region 返回生产质量汇报单列表 [Route("Sc_QualityReportBill/list")] [HttpGet] public object list(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillListDetail " + sWhere, "h_v_Sc_QualityReportBillListDetail"); } else { string sql1 = "select * from h_v_Sc_QualityReportBillListDetail where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillListDetail"); } 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; } } #endregion #region 质量汇报单根据源单类型获取信息-源单为生产状态临时表(3722) [Route("Sc_QualityReportBill/get_ICMOBillStatus_Tmp")] [HttpGet] public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType) { try { if (HInterID == 0 || HBillType.Equals("")) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "参数不全,获取源单信息失败!HInterID:" + HInterID + ";HEntryID:" + HEntryID + ";HBillType:" + HBillType + ";"; objJsonResult.data = null; return objJsonResult; } else { ds = oCN.RunProcReturn ("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" + ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel " + " from Sc_ICMOBillStatus_Tmp a " + " left join Gy_Material m on a.HMaterID=m.HItemID " + " Where a.HInterID=" + HInterID + " and a.HBillType="+ HBillType, "Sc_ICMOBillStatus_Tmp"); } 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 = "返回记录成功!"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "查询数据异常,请与管理员联系!" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 质量汇报单扫不良条码保存信息 [Route("Sc_QualityReportBill/set_SaveBarCode")] [HttpPost] public object set_SaveBarCode([FromBody] JObject oMain) { var msg1 = oMain["oMain"].ToString(); //保存单据 return objJsonResult = AddBillMain(msg1); } public json AddBillMain(string msg1) { string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg = sArray[0].ToString(); string OperationType = sArray[1].ToString().Trim(); bool bResult; try { msg = "[" + msg.ToString() + "]"; List<Model.ClsSc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg); DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill(); //判断会计期是否合理 string s = ""; int sYear = 0; int sPeriod = 0; DateTime HDate = mainList[0].HMakeDate; if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = s; objJsonResult.data = null; return objJsonResult; } BillNew.omodel.HYear = sYear; BillNew.omodel.HPeriod = sPeriod; //固定赋值================================= BillNew.omodel.HInterID = mainList[0].HInterID;//递入type得到的单据ID //BillNew.omodel.HBillNo = mainList[0].HBillNo;//递入type得到的单据号 //BillNew.omodel.HDate = HDate; //BillNew.omodel.HRemark = mainList[0].HRemark;//备注 //BillNew.omodel.HMaker = mainList[0].HMaker; //BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID); //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID); //BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo); //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID); //BillNew.omodel.HICMOQty = ClsPub.isLong(mainList[0].HICMOQty); //BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID); //BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID); //BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo); //BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty); //BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID); //BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp); //BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult); //BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID); //BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID); //BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo); //BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType); BillNew.omodel.HBillStatus = 1; //保存完毕后处理 if (OperationType.Equals("1") || OperationType.Equals("2")) { bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo); } else if (OperationType.Equals("3")) { bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo); } else { ClsPub.sExeReturnInfo = "无效的操作类型!"; bResult = false; } //提示 if (bResult == true) { objJsonResult.code = "1"; objJsonResult.count = 1; //objJsonResult.Message = "单据存盘完毕!单据号:" + mainList[0].HBillNo.Trim(); objJsonResult.Message = ClsPub.sExeReturnInfo + "单据号:" ; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败!原因:" + ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exception!" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Models/Supplier.cs
@@ -7,7 +7,7 @@ { public class Supplier { public long HItemID { get; set; } public long HInterID { get; set; } public string HNumber { get; set; } public string HShortNumber { get; set; } public string HName { get; set; } @@ -20,7 +20,7 @@ public string HRemark { get; set; } public string HStopflag { get; set; } public bool HStopflag { get; set; } public string HHelpCode { get; set; } WebAPI/WebAPI.csproj
@@ -326,9 +326,7 @@ <Compile Include="Controllers\PublicPageMethodController.cs" /> <Compile Include="Controllers\ReportFromController.cs" /> <Compile Include="Controllers\ReportPlatFormController.cs" /> <Compile Include="Controllers\SCGL\Sc_QualityReportBillListController.cs" /> <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" /> <Compile Include="Controllers\生产管理\Sc_MESProductReportBillController.cs" /> <Compile Include="Controllers\Sc_MouldController.cs" /> <Compile Include="Controllers\Sc_GroupOrderBillController.cs" /> <Compile Include="Controllers\QC_ManagementController.cs" /> @@ -337,27 +335,27 @@ <Compile Include="Controllers\SBGL\Sb_EquipMaintainPlanBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" /> <Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" /> <Compile Include="Controllers\生产管理\Sc_MaterToSourceBillController.cs" /> <Compile Include="Controllers\生产管理\Sc_MESEndWorkBillController.cs" /> <Compile Include="Controllers\生产管理\Sc_MESStopWorkBillController.cs" /> <Compile Include="Controllers\生产管理\Sc_MESBeginWorkBillController.cs" /> <Compile Include="Controllers\生产管理\QC_LastPieceCheckBillController.cs" /> <Compile Include="Controllers\生产管理\QC_OutCompCheckBillController.cs" /> <Compile Include="Controllers\生产管理\Sc_ICMOReportBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_MESEndWorkBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" /> <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" /> <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" /> <Compile Include="Controllers\Sc_MouldOtherInBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" /> <Compile Include="Controllers\LMESController.cs" /> <Compile Include="Controllers\LookingForBillController.cs" /> <Compile Include="Controllers\NewApiController.cs" /> <Compile Include="Controllers\生产管理\Sc_PPBomBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" /> <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" /> <Compile Include="Controllers\品质管理\工序检验单\QC_ProcessCheckBillController.cs" /> <Compile Include="Controllers\品质管理\首件检验单\QC_FirstPieceCheckBillController.cs" /> <Compile Include="Controllers\生产管理\质量汇报单\Sc_QualityReportBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" /> <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> @@ -542,6 +540,7 @@ </ItemGroup> <ItemGroup> <Folder Include="App_Data\" /> <Folder Include="Controllers\生产管理\质量汇报单\" /> <Folder Include="Views\MoveStockBill\" /> <Folder Include="Views\QC_Management\" /> </ItemGroup>