不良评审单、工序进站单、工序出站单、委外接收单、委外发出单删除时增加制单人与删除人是否一致系统参数控制；不良明细良率报表修改优化，原报表取值数据代码里...

yxj

2022-05-17 27d7b50f43c85f12507ab1a61290fa9551d4d780

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -38,6 +38,18 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string user = sArray[2].ToString();//用户名

            //判断是否有编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无编辑权限!";
                objJsonResult.data = null;
                return objJsonResult;
            }

            bool bResult;
            try
            {
@@ -57,6 +69,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//组织
                BillNew.omodel.HInterID = mainList[0].HInterID;//递入type得到的单据ID
                BillNew.omodel.HYear = sYear;
                BillNew.omodel.HPeriod = sPeriod;
@@ -190,7 +203,7 @@
                        oSub.HFstProc = "否";
                        oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
                        oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
                        oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].HSupFlag);
                        oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].isEntrust);
                        oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
                        oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
                        if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
@@ -267,7 +280,7 @@
        /// <returns>object</returns>
        [Route("Sc_ProcessExchangeBill/GetICMOBillList")]
        [HttpGet]
        public object GetICMOBillList(int hmainid,int OrganizationID)
        public object GetICMOBillList(int hmainid,int HEntryID, int OrganizationID)
        {
            try
            {
@@ -279,7 +292,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -314,7 +327,7 @@
        /// <returns>object</returns>
        [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
        [HttpGet]
        public object GetICMOBillDetail(int hmainid, int OrganizationID)
        public object GetICMOBillDetail(int hmainid,int HEntryID, int OrganizationID)
        {
            try
            {
@@ -326,7 +339,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
                ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid + " and HEntryID=" + HEntryID, "h_v_S_Sc_ICMOBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";