Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2024-04-24 8b83671f3d3369e6313313a1b3fefdf5b6c0252f

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/²Ö¿â¹ÜÀí/ClsKf_MoveStockBill.cs

@@ -87,6 +87,10 @@
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);

                //直接调拨单 ä¿®æ”¹ æ’¤é”€ å›žå¡« è°ƒæ‹¨ç”³è¯·å• å…³è”数量
                oCn.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Del " + omodel.HInterID.ToString());

                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表

 DAL/²Ö¿â¹ÜÀí/ClsKf_SellOutBillForLayUI.cs

@@ -51,6 +51,10 @@
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + lngBillKey.ToString());
                }
                else if (DetailColl[0].HSourceBillType == "1402")                    //发货通知单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
                }
                else
                {

@@ -80,6 +84,10 @@
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Add " + lngBillKey.ToString());
                }
                else if(DetailColl[0].HSourceBillType == "1402")                    //发货通知单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
                }
                else
                {


 DAL/ÏúÊÛ¹ÜÀí/ClsXs_ReceivableBill.cs

@@ -32,6 +32,61 @@
        #endregion
        #endregion


        #region å…³è”数量

        //删除关联
        //public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
        //{
        //    //销售订单 é”€å”®å‡ºåº“单 å…³è”数量
        //    try
        //    {
        //        if (DetailColl[0].HSourceBillType == "1401")                    //销售订单
        //        {
        //            oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + lngBillKey.ToString());
        //        }
        //        else if (DetailColl[0].HSourceBillType == "1205")                    //销售出库单
        //        {
        //            oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del " + lngBillKey.ToString());
        //        }
        //        else
        //        {
        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        throw (e);
        //    }
        //}
        ////新增关联
        //public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
        //{
        //    //销售订单 é”€å”®å‡ºåº“单 å…³è”数量
        //    try
        //    {
        //        if (DetailColl[0].HSourceBillType == "1401")                    //销售订单
        //        {
        //            oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Add " + lngBillKey.ToString());
        //        }
        //        else if (DetailColl[0].HSourceBillType == "1205")                    //销售出库单
        //        {
        //            oCn.RunProc("exec h_p_Xs_UpDateRelation_ICStockToPOStockIn_Add " + lngBillKey.ToString());
        //        }
        //        else
        //        {

        //        }
        //    }
        //    catch (Exception e)
        //    {
        //        throw (e);
        //    }
        //}

        #endregion



        #region ä¿®æ”¹å•æ®
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
@@ -113,6 +168,9 @@
                        ")";
                    oCn.RunProc(subSql);
                }

                ////更新订单关联数量
                //AddNewRelation(ref sReturn, omodel.HInterID);

                sReturn = "修改单据成功！";
                oCn.Commit();
@@ -229,6 +287,10 @@
                        ")";
                    oCn.RunProc(subSql);
                }

                ////更新订单关联数量
                //AddNewRelation(ref sReturn, omodel.HInterID);

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;

 WebAPI/Controllers/PlateBindingController.cs

New file
@@ -0,0 +1,123 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Text;
using System.Web.Http;
using WebAPI.Models;

namespace WebAPI.Controllers
{
    public class PlateBindingController : ApiController
    {
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

        /// <summary>
        /// ä¿å­˜å¹³æ¿ç»‘定
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Save/Xt_PlateBinding")]
        [HttpPost]
        public object Save([FromBody] JObject msg)
        {
            try
            {
                DataSet ds;
                var _value = msg["msg"].ToString();
                string msg3 = _value.ToString();
                string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg1 = sArray[0].ToString();
                string user = sArray[1].ToString();

                string filePath = "Configuration";
                bool isAppend = true;

                filePath = $@"{filePath}\PlateBinding.txt";

                filePath = "D:\\" + filePath;

                if (!System.IO.Directory.Exists(Path.GetDirectoryName(filePath)))
                {
                    System.IO.Directory.CreateDirectory(Path.GetDirectoryName(filePath));
                }
                //判断是否已经存在平板绑定文件，若已存在则删除，重新创建
                bool fileExists = System.IO.File.Exists(filePath);

                //存在 åˆ™åˆ é™¤è¯¥æ–‡ä»¶
                if (fileExists)
                {
                    File.Delete(filePath);                    
                }
                //创建文件

                using (StreamWriter writer = new StreamWriter(filePath, isAppend))
                {
                    //存在的时候才写一行
                    if (fileExists && isAppend)
                    {
                        writer.WriteLine();
                    }

                    var content = msg1 is string ? msg1 : JsonConvert.SerializeObject(msg1);
                    writer.WriteLine($"{DateTime.Now}");
                    writer.WriteLine("");
                    msg1 = msg1.Replace("{","").Replace("}","").Replace("\"","");
                    string[] arr = msg1.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                    for (int i = 0; i < arr.Length; i++)
                    {
                        writer.WriteLine(arr[i]);
                    }
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "平板绑定信息写入成功！";
                objJsonResult.data = "";
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "写入平板绑定信息过程中发生异常！";
                objJsonResult.data = "";
                return objJsonResult;
            }
        }

        #region èŽ·å–平板绑定文件数据

        [Route("Get/Xt_PlateBinding")]
        [HttpGet]
        public object Get(string user)
        {
            try
            {
                //根据指定路径，读取文件内容，返回数据为数组格式
                string[] ConfigFileInfo = File.ReadAllLines(@"D:\Configuration\PlateBinding.txt");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ConfigFileInfo;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -1632,7 +1632,7 @@

                oCN.BeginTran();

                //分布式调入单新增回填分布式调出单关联数量
                //直接调拨单 åˆ é™¤  æ’¤é”€ å›žå¡«  è°ƒæ‹¨ç”³è¯·å•  å…³è”数量
                oCN.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Del " + HInterID);

                oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
@@ -1801,6 +1801,10 @@
                //销售出库删除回填销售订单关联数量
                //oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + HInterID);

                //销售出库删除回填收货通知单关联数量
                //oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Del " + HInterID);


                //oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
                //oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);


 WebAPI/Controllers/WebAPIController.cs

@@ -11636,14 +11636,26 @@
        /// <returns></returns>
        [Route("Web/GetHSourceBillType")]
        [HttpGet]
        public object GetHSourceBillType(string HName)
        public object GetHSourceBillType(string HName,int Num)
        {
            try
            {
                ClsCN oCn = new ClsCN();
                DataSet oDs = new DataSet();
                //==========
                oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='"+HName+"'", "Xt_BillSourceSet");
                //有的单子源单分为红蓝单  0代表蓝单  1代表红单
                if (Num==0)
                {           //源单为蓝单
                    oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='" + HName + "' HRedBlueFlag ='"+ Num+"' ", "Xt_BillSourceSet");
                }
                else if (Num==1)
                {          //源单为红单
                    oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='" + HName + "' HRedBlueFlag ='" + Num + "' ", "Xt_BillSourceSet");
                }
                else if(Num==2)
                {       //不分红蓝单
                    oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='" + HName + "'", "Xt_BillSourceSet");
                }
                
                objjson.code = "1";
                objjson.count = 1;
                objjson.Message = "获取成功！";

 WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs

@@ -1078,6 +1078,43 @@
        }
        #endregion

        #region é”€å”®å‡ºåº“单 æ ¹æ®ä¸»å†…码与子内码获取发货通知单数据
        [Route("Kf_SellOutBill/loadXs_SeOutStockBill_Push")]
        [HttpGet]
        public object loadXs_SeOrderBill_Push(long HInterID, long HSubID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_SeOutStockBillList");
                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;
            }
        }
        #endregion

        #region é”€å”®å‡ºåº“单 æ£€æŸ¥å•æ®æ˜¯å¦å­˜åœ¨
        /// <summary>
        /// </summary>

 WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs

@@ -363,6 +363,24 @@

                oCN.BeginTran();

                //ds = oCN.RunProcReturn("select * from h_v_Xs_ReceivableBillList_Query where hmainid=" + HInterID, "h_v_Xs_ReceivableBillList_Query");
                //foreach (DataRow row in ds.Tables[0].Rows)
                //{
                //    // èŽ·å–当前行的 HSourceBillType å€¼  
                //    string hSourceBillType = row["HSourceBillType"].ToString();

                //    if (hSourceBillType == "1401")
                //    {
                //        //应收单 åˆ é™¤å›žå¡« é”€å”®è®¢å• å…³è”数量
                //        oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + HInterID);
                //    }
                //    else if (hSourceBillType == "1205")
                //    {
                //        //应收单 åˆ é™¤å›žå¡« é”€å”®å‡ºåº“单 å…³è”数量
                //        oCN.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del     " + HInterID);
                //    }
                //}
                  
                oCN.RunProc("delete from Xs_ReceivableBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from Xs_ReceivableBillSub where HInterID= " + HInterID);


 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÑéÊÕÈë¿â/Kf_StepFoldinBillController.cs

@@ -268,6 +268,10 @@
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;

                    oCN.RunProc(sql);

                    //分布式调入单 ç¼–辑 æ’¤é”€ å›žå¡«åˆ†å¸ƒå¼è°ƒå‡ºå•å…³è”数量
                    oCN.RunProc("exec h_p_Kf_UpDateRelation_ICStockToPOStockIn_Del " + HInterID);

                    //删除子表
                    oCN.RunProc("delete from Kf_ICStockBillSub where HInterID='" + HInterID + "'");
                }

 WebAPI/WebAPI.csproj

@@ -417,6 +417,7 @@
    <Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
    <Compile Include="Controllers\MJGL\Sc_MouldUpperBillController.cs" />
    <Compile Include="Controllers\Pay_ReportController.cs" />
    <Compile Include="Controllers\PlateBindingController.cs" />
    <Compile Include="Controllers\SBGL\Gy_FixCardChangeBillController.cs" />
    <Compile Include="Controllers\SBGL\Gy_FixCardBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" />