yusijie
2024-01-10 206e3f37f68a22e523969982c5ec83f7089678db
快速过滤方案
7个文件已修改
4个文件已添加
368 ■■■■■ 已修改文件
DAL/DAL.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/基础资料/公用基础资料/ClsXt_FastICScheme_Ctl.cs 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/质检管理/ClsQC_ProcessCheckBill.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/基础资料/基础资料/ClsXt_FastICSchemeMain_Model.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/基础资料/基础资料/ClsXt_FastICSchemeSub_Model.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_ProcessCheckBillMain.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Xt_FastICSchemeController.cs 157 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/DAL.csproj
@@ -105,6 +105,7 @@
    <Compile Include="基础资料\公用基础资料\ClsGy_SupplierContact_Ctl.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_StockStatus_Ctl.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_Work_Ctl.cs" />
    <Compile Include="基础资料\公用基础资料\ClsXt_FastICScheme_Ctl.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_MateMould_Ctl.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_QCCheckProject_View.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_StdWorkTimes_Ctl.cs" />
DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsXt_FastICScheme_Ctl.cs
New file
@@ -0,0 +1,138 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
namespace DAL
{
    public class ClsXt_FastICScheme_Ctl : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsXt_FastICSchemeMain_Model omodel = new Model.ClsXt_FastICSchemeMain_Model();
        public List<Model.ClsXt_FastICSchemeSub_Model> DetailColl = new List<Model.ClsXt_FastICSchemeSub_Model>();
        public ClsXt_FastICScheme_Ctl()
        {
            base.MvarItemKeySub = "Xt_FastICSchemeSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "Xt_FastICSchemeMain";
            base.MvarReportTitle = "快速过滤方案";
            base.BillType = "3332";
            base.HBillSubType = "3332";
        }
        #region å›ºå®šä»£ç 
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //更新主表
                //oCn.RunProc("UpDate Cg_POOrderBillMain set  " +
                //" HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                //",HDate='" + omodel.HDate + "'" +
                //",HYear='" + omodel.HYear.ToString() + "'" +
                //",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                //",HRemark='" + omodel.HRemark + "'" +
                //",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                //",HUpDateDate=getdate()" +
                ////========================================
                //",HSSDate='" + omodel.HSSDate + "'" +
                //",HAddress='" + omodel.HAddress + "'" +
                //",HSSID=" + omodel.HSSID.ToString() +
                //",HPSStyleID=" + omodel.HPSStyleID.ToString() +
                //",HSupID=" + omodel.HSupID.ToString() +
                //",HCurID=" + omodel.HCurID.ToString() +
                //",HExRate=" + omodel.HExRate.ToString() +
                //",HEmpID=" + omodel.HEmpID.ToString() +
                //",HManagerID=" + omodel.HManagerID.ToString() +
                //",HDeptID=" + omodel.HDeptID.ToString() +
                //",HExplanation='" + omodel.HExplanation + "'" +
                //",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                //" where HInterID=" + lngBillKey.ToString());
                ////删除关联
                //DeleteRelation(ref sReturn, lngBillKey);
                ////删除子表
                //DeleteBillSub(lngBillKey);
                ////插入子表
                //omodel.HInterID = lngBillKey;
                //foreach (Model.ClsCg_POOrderBillSub oSub in DetailColl)
                //{
                //    oCn.RunProc("Insert into Cg_POOrderBillSub " +
                //      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
                //      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                //      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
                //      ",HMaterID,HUnitID,HQty,HPrice,HMoney,HTaxRate,HTaxPrice" +
                //      ",HTaxMoney,HlineTotal,HlineTotalBB,HDate,HSourceQty" +
                //      ",HDiscountRate,HRelTaxPrice,HInStockQty,HInvoiceQty" +
                //      ") values("
                //      + omodel.HInterID.ToString() + "," + 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.HSeOrderInterID.ToString() + "','" + oSub.HSeOrderEntryID.ToString() + "','" + oSub.HSeOrderBillNo + "'" +
                //      "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HTaxRate.ToString() + "," + oSub.HTaxPrice.ToString() +
                //      "," + oSub.HTaxMoney.ToString() + "," + oSub.HlineTotal.ToString() + "," + oSub.HlineTotalBB.ToString() + ",'" + oSub.HDate.ToShortDateString() + "','" + oSub.HSourceQty + "'" +
                //      "," + oSub.HDiscountRate.ToString() + "," + oSub.HRelTaxPrice.ToString() + "," + oSub.HInStockQty.ToString() + "," + oSub.HInvoiceQty.ToString() +
                //      ") ");
                //}
                sReturn = "修改单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public bool AddBill(string HFilterIdLists, string HValue, string HElement_type, ref string sReturn)
        {
            try
            {
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Xt_FastICSchemeMain   " +
                "(HInterID,HName,HUserCode,HBillType,HBillName" +
                ",HStopflag,HCreateDate,HUseingFlag,HRemark" +
                ") " +
                " values('" + omodel.HInterID.ToString() + "','" + omodel.HName + "','" + omodel.HUserCode + "'" +
                "," + 3332 + ",'" + omodel.HBillName + "'," + omodel.HStopflag + "," + "getdate()" + "," + omodel.HUseingFlag + ",'" + omodel.HRemark +
                "') ");
                //获取子表数据
                string[] HFilterIdLists_arr = Regex.Split(HFilterIdLists, ",", RegexOptions.IgnoreCase);
                string[] HValue_arr = Regex.Split(HValue, ",", RegexOptions.IgnoreCase);
                string[] HElement_type_arr = Regex.Split(HElement_type, ",", RegexOptions.IgnoreCase);
                //插入子表
                for (var i = 0; i < HFilterIdLists_arr.Length;i++)
                {
                    oCn.RunProc("Insert Into xt_FastICSchemeSub " +
                   "(HInterID,HKey,HValue,HDataType) " +
                   " values('" + omodel.HInterID.ToString() + "','" + HFilterIdLists_arr[i] + "','" + HValue_arr[i] + "'" +
                   ",'" + HElement_type_arr[i] +
                   "') ");
                }
                //
                sReturn = "新增单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
    }
}
DAL/Öʼì¹ÜÀí/ClsQC_ProcessCheckBill.cs
@@ -156,7 +156,7 @@
                ",HBarCode,HLBatchNo,HCusID,HSortBillNo,HContrctBatchNo" +
                ",HProdAreaID,HProdTypeID,HProdStoveNo,HRecipeID,HDiameter1" +
                ",HDiameter2,HRoutingInterID,HDrawingDireID,HPackTypeID" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HICMOQty,HProcExchQty" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
@@ -166,7 +166,7 @@
                ",'" + omodel.HBarCode + "','" + omodel.HLBatchNo + "'," + omodel.HCusID.ToString() + ",'" + omodel.HSortBillNo + "','" + omodel.HContrctBatchNo + "'" +
                "," + omodel.HProdAreaID.ToString() + "," + omodel.HProdTypeID.ToString() + ",'" + omodel.HProdStoveNo + "'," + omodel.HRecipeID.ToString() + "," + omodel.HDiameter1.ToString() +
                "," + omodel.HDiameter2.ToString() + "," + omodel.HRoutingInterID.ToString() + ",'" + omodel.HDrawingDireID + "'," + omodel.HPackTypeID.ToString() +
                "," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID +
                "," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HICMOQty + "," + omodel.HProcExchQty +
                ") ");
                //插入子表
                foreach (Model.ClsQC_ProcessCheckBillSub oSub in DetailColl)
Model/Model.csproj
@@ -426,6 +426,8 @@
    <Compile Include="基础资料\基础资料\ClsGy_Item30JiTai_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_User_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_Work_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsXt_FastICSchemeMain_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsXt_FastICSchemeSub_Model.cs" />
    <Compile Include="工位看板\ClsGy_SOPBillMain.cs" />
    <Compile Include="工位看板\ClsGy_SOPBillSub.cs" />
    <Compile Include="工资管理\ClsHR_EmpDimissionBillMain.cs" />
Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsXt_FastICSchemeMain_Model.cs
New file
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Model
{
    public class ClsXt_FastICSchemeMain_Model : DBUtility.ClsGy_Base_Model
    {
        public Int64 HInterID; //主内码
        public string HName; //方案名称
        public string HUserCode;   //用户编码
        public string HBillType; //0002
        public string HBillName;  //模块名称
        public Int64 HStopflag;//禁用标记
        public DateTime HCreateDate;//创建时间
        public Int64 HUseingFlag; //默认使用标记
    }
}
Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsXt_FastICSchemeSub_Model.cs
New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Model
{
    public class ClsXt_FastICSchemeSub_Model : DBUtility.ClsGy_Base_Model
    {
        public Int64 HInterID; //主内码
        public Int64 HEntryID; //子内码(自增列)
        public string HKey; //控件NAME
        public string HDataType; //控件类型
        public string HValue; //控件值
    }
}
Model/Öʼì¹ÜÀí/ClsQC_ProcessCheckBillMain.cs
@@ -40,5 +40,8 @@
        public Int64 HICMOEntryID;
        public Int64 HQCSchemeID;
        public bool HLastResult;
        public Int64 HICMOQty;
        public Int64 HProcExchQty;
    }
}
WebAPI/Controllers/Æ·ÖʹÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillController.cs
@@ -621,9 +621,11 @@
                BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
                BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
                BillNew.omodel.HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
                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.HCheckerResult = ClsPub.isStrNull(mainList[0].HCheckerResult);
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Xt_FastICSchemeController.cs
New file
@@ -0,0 +1,157 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    public class Xt_FastICSchemeController : ApiController
    {
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        /// <summary>
        /// è¿”回过滤方案列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Xt_FastICScheme/list")]
        [HttpGet]
        public object list(string user, string HModuleName)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql = string.Format(@"select * from h_v_Xt_FastICSchemeList where ç”¨æˆ·ç¼–码='" + user + "' and æ¨¡å—名称 = '" + HModuleName + "'");
                ds = oCN.RunProcReturn(sql, "h_v_Xt_FastICSchemeList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #region å¿«é€Ÿè¿‡æ»¤æ–¹æ¡ˆ
        /// <summary>
        /// æ–°å¢žä¿®æ”¹å•据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Xt_FastICScheme/Save")]
        [HttpPost]
        public object Save([FromBody] JObject oMain)
        {
            try
            {
                DAL.ClsXt_FastICScheme_Ctl oDept = new DAL.ClsXt_FastICScheme_Ctl();
                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();//过滤条件id
                string msg4 = sArray[2].ToString();//过滤值
                string msg5 = sArray[3].ToString();//标签类型
                string msg6 = sArray[4].ToString();//用户
                DAL.ClsXt_FastICScheme_Ctl oBill = new DAL.ClsXt_FastICScheme_Ctl();
                //反序列化
                ListModels oListModels = new ListModels();
                List<Model.ClsXt_FastICSchemeMain_Model> lsmain = new List<Model.ClsXt_FastICSchemeMain_Model>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Xt_FastICSchemeMain(msg2);
                foreach (Model.ClsXt_FastICSchemeMain_Model oItem in lsmain)
                {
                    oItem.HBillType = "3332";
                    oBill.omodel = oItem;
                }
                ////表体数据
                ////按 },{来拆分数组 //去掉【和】
                //msg3 = msg3.Substring(1, msg3.Length - 2);
                //msg3 = msg3.Replace("\\", "");
                //msg3 = msg3.Replace("\n", "");  //\n
                ////msg2 = msg2.Replace("'", "’");
                //List<Model.ClsXt_FastICSchemeSub_Model> ls = new List<Model.ClsXt_FastICSchemeSub_Model>();
                //ls = oListModels.getObjectByJson_Gy_ICMOReportBillSub(msg3);
                //int i = 0;
                //保存
                //保存完毕后处理
                bool bResult;
                if (1 == 1)
                {
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(msg3, msg4, msg5, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.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)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/ListModels.cs
@@ -3194,5 +3194,30 @@
            return list;
        }
        /// <summary>
        /// å¤„理快速过滤方案主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsXt_FastICSchemeMain_Model> getObjectByJson_Xt_FastICSchemeMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXt_FastICSchemeMain_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_FastICSchemeMain_Model>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增快速过滤方案子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsXt_FastICSchemeSub_Model> getObjectByJson_Xt_FastICSchemeSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXt_FastICSchemeSub_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_FastICSchemeSub_Model>>(jsonString);
            return list;
        }
    }
WebAPI/WebAPI.csproj
@@ -527,6 +527,7 @@
    <Compile Include="Controllers\基础资料\基础资料\Gy_WorkStationBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Xt_CheckFlowBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Xt_CheckItemBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Xt_FastICSchemeController.cs" />
    <Compile Include="Controllers\基础资料\工资基础资料\Gy_ProcCommPriceController.cs" />
    <Compile Include="Controllers\工资管理\Pay_OutApplyBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_OverApplyBillController.cs" />