yangle
2022-06-27 7969646953762d024a956e24a5a0200d3675fa65
隐藏列
工序流转卡维护
4个文件已修改
1个文件已添加
153 ■■■■■ 已修改文件
DAL/车间管理/ClsSc_ProcessExchangeBill.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs
@@ -168,7 +168,7 @@
                      ",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
                      "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
                      "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
                      ",'" + oSub.HMouldNo.ToString() + "','" + oSub.HProcWorkNum.ToString() + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'"+
                      ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'"+
                      ") ");
                    oCn.RunProc(sql1);
                }
@@ -348,7 +348,7 @@
                      ",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
                      "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
                      "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
                      ",'" + oSub.HMouldNo.ToString() + "','" + oSub.HProcWorkNum.ToString() + "','" + DBUtility.ClsPub.isStrNull( omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'" +
                      ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull( omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'" +
                      ") ");
                    sErr = sErr + sql1 + "2;";
                    oCn.RunProc(sql1);
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
New file
@@ -0,0 +1,142 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers.BaseSet
{
    public class Xt_grdAlignment_WMESController : ApiController
    {
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public WebServer webserver = new WebServer();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        grdAlignment omdelMian = new grdAlignment();
        List<grdAlignmentSub> omdelsub = new List<grdAlignmentSub>();
        #region éšè—åˆ—设置 åˆ—表
        [Route("Xt_grdAlignment_WMES/grdAlignmentWMESList")]
        [HttpGet]
        public object grdAlignmentWMESList(string HModName, string user)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from  Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'", "Xt_grdAlignment_WMES");
                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 éšè—åˆ—设置  æ·»åŠ /修改
        public class grdAlignment
        {
            public string HFixCols;
            public string HFontSize;
            public string HHeadTextHeight;
            public string HTextHeight;
            public string HSortFlag;
            public string HSelTotal;
        }
        public class grdAlignmentSub
        {
            public string ColumnName;
            public bool IsHide;
            public string Alignment;
        }
        [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
        [HttpPost]
        public object AddgrdAlignmentWMES([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            oCN.BeginTran();
            //保存主表
            objJsonResult = AddBillMain(msg1);
            if (objJsonResult.code == "0")
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = objJsonResult.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
            oCN.Commit();
            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = "新增单据成功!";
            objJsonResult.data = null;
            return objJsonResult;
        }
        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string HModName = sArray[2].ToString();
            int OperationType = int.Parse(sArray[3].ToString());//数据类型 1添加 3修改
            string user = sArray[4].ToString();
            try
            {
                omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<grdAlignment>(msg2);
                omdelsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<grdAlignmentSub>>(msg3);
                var HGridString = "";
                for (int i = 0; i < omdelsub.Count; i++)
                {
                    HGridString += $"{(i+1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment},";
                }
                HGridString = HGridString.Substring(0, HGridString.Length - 1);
                oCN.RunProc("Delete from Xt_grdAlignment_WMES where HUserName='" + user + "' and HModName='" + HModName + "' ");
                oCN.RunProc("insert into Xt_grdAlignment_WMES (HUserName,HModName,HGridString,HFixCols" +
                    ",HFontSize,HHeadTextHeight,HTextHeight,HSortFlag,HSelTotal" +
                    ")  values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) +
                    "," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + "," + (omdelMian.HHeadTextHeight == "" ? "0" : omdelMian.HHeadTextHeight) +
                    "," + (omdelMian.HTextHeight == "" ? "0" : omdelMian.HTextHeight) + ",'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
                    ")");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = null;
                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/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -529,7 +529,7 @@
        /// <returns></returns>
        [Route("Sc_ProcessExchangeBill/DeltetProcessExchangeBillByID")]
        [HttpGet]
        public object DeltetProcessExchangeBillByID(string HInterID, string user)
        public object DeltetProcessExchangeBillByID(string HInterID,int HPRDORGID, string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Drop", 1, false, user))
@@ -553,6 +553,7 @@
                return objJsonResult;
            }
            DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
            DBUtility.ClsPub.HOrgID = HPRDORGID;
            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
            {
                if (oBill.omodel.HBillStatus > 1)
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -713,7 +713,7 @@
                        HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
                    //获取工作中心
                    ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HNumber='" + list[i]["工作中心代码"].ToString() + "'", "Gy_WorkCenter");
                    ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HName='" + list[i]["工作中心"].ToString() + "'", "Gy_WorkCenter");
                    var HCenterID = "0";
                    if (ds.Tables[0].Rows.Count > 0)
                        HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
WebAPI/WebAPI.csproj
@@ -350,6 +350,7 @@
    <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
    <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
    <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -847,6 +848,7 @@
    <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
    <Folder Include="Views\Sc_WorkBillSortBill\" />
    <Folder Include="Views\Sc_WorkDemandPlanBill\" />
    <Folder Include="Views\Xt_grdAlignment_WMES\" />
  </ItemGroup>
  <ItemGroup>
    <WCFMetadata Include="Service References\" />