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

yusijie

2025-02-12 d19fcd70a3b11339eb0c50b5c734eeca855a9a95

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/Sc_WorkBillSortBillController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -17,6 +18,7 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        Sc_WorkBillSortBillMain omdelMian = new Sc_WorkBillSortBillMain();
        List<Sc_WorkBillSortBillSub> omodelsub = new List<Sc_WorkBillSortBillSub>();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region æ—¥è®¡åˆ’工单 åˆ—表
        [Route("Sc_WorkBillSortBill/Sc_WorkBillSortBillList")]
@@ -25,6 +27,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Query", 1, false, user))
                {
@@ -35,12 +38,21 @@
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from  h_v_JIT_Sc_WorkBillSortBillList where 1=1" + sWhere + " order by å•æ®å· desc ", "h_v_JIT_Sc_WorkBillSortBillList");

                ds = oCN.RunProcReturn("select * from  h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1" + sWhere + " order by å•æ®å· desc ", "h_v_JIT_Sc_WorkBillSortBillList");
          
                    foreach (DataColumn col in ds.Tables[0].Columns)//遍历ds中第一个表（Tables[0]）的所有列（Columns）每次循环中，col变量会持有当前列的引用
                    {
                        Type dataType = col.DataType; //获取当前数据类型传入 è‡ªå®šä¹‰å˜é‡datadataType
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //字符串拼接         // å°†åˆ—名和数据类型信息拼接成一个JSON格式的字符串
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                   
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
            
                objJsonResult.data = ds.Tables[0];//代码将第一个DataTable（索引为0）赋值给objJsonResult的data属性
                objJsonResult.list = columnNameList;//将columnNameList赋值给objJsonResult的list属性
                return objJsonResult;
            }
            catch (Exception e)
@@ -264,7 +276,7 @@
                    {
                        var NumData_T = NumData[i].Split('_');

                        ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1 and hmainid=" + NumData_T[0], "h_v_JIT_Sc_WorkBillSortBillList");
                        ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1 and hmainid=" + NumData_T[0], "h_v_JIT_Sc_WorkBillSortBillList");

                        if (ds.Tables[0].Rows.Count > 0)
                        {
@@ -298,21 +310,14 @@
                {
                    var NumData = HInterID.Split(',');

                    //获取系统参数
                    string sReturn = "";
                    oSystemParameter.ShowBill(ref sReturn);                   

                    for (int i = 0; i < NumData.Length; i++)
                    {
                        ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");

                        if (ds.Tables[0].Rows.Count > 0)
                        if (oSystemParameter.omodel.WMS_CampanyName == "添康科技")
                        {
                            if (ds.Tables[0].Rows[0]["单据状态"].ToString() != "1")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "当前单据不能删除！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }

                            oCN.BeginTran();//开启事务

                            oCN.RunProc($"delete from Sc_WorkBillSortBillSub where HInterID={ NumData[i]}");
@@ -320,6 +325,29 @@

                            oCN.Commit();//结束事务
                        }
                        else
                        {
                            ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");

                            if (ds.Tables[0].Rows.Count > 0)
                            {
                                if (ds.Tables[0].Rows[0]["单据状态"].ToString() != "1")
                                {
                                    objJsonResult.code = "0";
                                    objJsonResult.count = 0;
                                    objJsonResult.Message = "当前单据不能删除！";
                                    objJsonResult.data = null;
                                    return objJsonResult;
                                }

                                oCN.BeginTran();//开启事务

                                oCN.RunProc($"delete from Sc_WorkBillSortBillSub where HInterID={ NumData[i]}");
                                oCN.RunProc($"delete from Sc_WorkBillSortBillMain where HInterID={ NumData[i]}");

                                oCN.Commit();//结束事务
                            }
                        }                        
                    }
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;