合并冲突

chenhaozhe

7 天以前 47b45a4ac3284936515a2edd3e50265de30993a0

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -583,6 +583,18 @@
                }
                else
                {
                    //已审核不允许修改
                    DataSet dss;
                    dss = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + oBill.oModel.HItemID, "Gy_Material");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据状态已经审核，不允许修改！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
                }
                if (bResult)
@@ -848,6 +860,7 @@
            string msg2 = sArray[1].ToString();
            string msg_HUSEORGID = sArray[2].ToString();
            string msg_itemIdList = sArray[3].ToString();
            string msg_UpdateInfo = sArray[4].ToString();
            bool bResult = false;
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -880,7 +893,7 @@
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
                JObject jobject = JObject.Parse(msg1);
                JObject jobject = JObject.Parse(msg_UpdateInfo);
                var paramStr = "";
                foreach (var property in jobject.Properties())
                {
@@ -889,10 +902,12 @@

                    // 拼接格式: key=value
                    paramStr += string.Format("{0}='{1}',", key, value);
                    // 删除最后一个逗号
                   
                }
                LogService.Write(paramStr);
                paramStr = paramStr.Substring(0, paramStr.Length - 1);

                bResult = oBill.ModifyByIDListDynamic(msg_itemIdList, paramStr);
                bResult = oBill.ModifyByIDListDynamic(msg_itemIdList, paramStr, lsmain);


                if (bResult)
@@ -2949,6 +2964,17 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID = " + hmainid + " and ISNULL(HChecker,'') <> ''", "Gy_MouldFileMain");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！单据已审核！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    oCN.BeginTran();