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

yangle

2023-05-06 a7d17c8ecf0076d00e1199cfc5ea8e7d44749ac6

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

@@ -11,7 +11,7 @@
{
    public class Sc_WorkBillSortBillController : ApiController
    {
        private json objJsonResult = new json();
        private json objJsonResult = new json();    
        public DataSet ds = new DataSet();
        public WebServer webserver = new WebServer();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -35,7 +35,7 @@
                    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 where 1=1" + sWhere + " order by å•æ®å· desc ", "h_v_JIT_Sc_WorkBillSortBillList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -91,7 +91,7 @@
            string user = sArray[3].ToString();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
                if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user)) 
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -140,6 +140,18 @@
                }
                else if (OperationType == 3)
                {

                    ds = oCN.RunProcReturn($"select * from  Sc_WorkBillSortBillMain where HMainSourceInterID={omdelMian.HMainSourceInterID}" +
                      $" and HMainSourceEntryID={omdelMian.HMainSourceEntryID} and HICMOBillNo='{omdelMian.HICMOBillNo}' and HICMOEntrySEQ={omdelMian.HICMOEntrySEQ} and HSourceID={omdelMian.HSourceID}", "Sc_WorkBillSortBillMain");
                    if ((ds.Tables[0].Rows.Count == 1 && ds.Tables[0].Rows[0]["HInterID"].ToString() != omdelMian.HInterID.ToString()))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "生产资源有重复,请修改!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    //修改
                    oCN.RunProc($"update Sc_WorkBillSortBillMain set HDate='{omdelMian.HDate}',HUpDater='{omdelMian.HMaker}',HUpDateDate=GETDATE()" +
                                  $", HRemark='{omdelMian.HRemark}', HPrintQty={(omdelMian.HPrintQty == null ? 0 : omdelMian.HPrintQty)}" +
@@ -207,7 +219,7 @@
            //插入子表
            foreach (Models.Sc_WorkBillSortBillSub oSub in omodelsub)
            {
                oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HEntryID,HRemark,HMasterDate,HQty" +
                oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ,HRemark,HMasterDate,HQty" +
                            ", HRptFinishQty, HTimes, HUseTimes, HBTimes, HETimes" +
                            ", HDateSub, HCloseMan, HEntryCloseDate, HCloseTypeSub, HColumn" +
                            ", HLockedSub, HComplete, HStatusTag, HIsHandModify)" +
@@ -230,7 +242,7 @@
        #region æ—¥è®¡åˆ’工单 åˆ é™¤
        [Route("Sc_WorkBillSortBill/DelWorkBillSortBillList")]
        [HttpGet]
        public object DelWorkBillSortBillList(string HInterID, string HEntryID, string User)
        public object DelWorkBillSortBillList(string HInterID,int DataType, string User)
        {
            try
            {
@@ -243,30 +255,72 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList where 1=1 and hmainid=" + HInterID, "h_v_JIT_Sc_WorkBillSortBillList");

                if (ds.Tables[0].Rows.Count > 0)
                //DataType 1=日计划工单 å¤šé€‰åˆ é™¤   2=日计划平台多选删除
                if (DataType == 1)
                {
                    if (ds.Tables[0].Rows[0]["单据状态"].ToString() != "1")
                    var NumData = HInterID.Split(',');

                    for (int i = 0; i < NumData.Length; i++)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "当前单据不能删除！";
                        objJsonResult.data = null;
                        return objJsonResult;
                        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");

                        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();//开启事务

                            if (ds.Tables[0].Rows.Count == 1)
                            {
                                oCN.RunProc($"delete from Sc_WorkBillSortBillMain where HInterID={ NumData_T[0]}");
                            }
                            oCN.RunProc($"delete from Sc_WorkBillSortBillSub where HInterID={ NumData_T[0]} and HEntryID={ NumData_T[1]}");

                            oCN.Commit();//结束事务
                        }
                    }
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除成功！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else if (DataType == 2)
                {
                    var NumData = HInterID.Split(',');

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

                    if (ds.Tables[0].Rows.Count == 1)
                    for (int i = 0; i < NumData.Length; i++)
                    {
                        oCN.RunProc($"delete from Sc_WorkBillSortBillMain where HInterID={HInterID}");
                        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();//结束事务
                        }
                    }
                    oCN.RunProc($"delete from Sc_WorkBillSortBillSub where HInterID={HInterID} and HEntryID={HEntryID}");

                    oCN.Commit();//结束事务

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除成功！";