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

zrg

2024-11-14 da2072076040de7598d844cdd3ceaa796b089ca5

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

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -2392,5 +2392,54 @@
        }
        #endregion

        #region å·¥è‰ºè·¯çº¿ æ‰¹é‡é©³å›ž
        [Route("Gy_Routing/RejectAllCheckFlow")]
        [HttpGet]
        public object RejectAllCheckFlow(string HInterIDS,string CurUserID)
        {
            try
            {
                //处理字符串
                if (!string.IsNullOrEmpty(HInterIDS))
                {
                    int[] idArray = Array.ConvertAll(HInterIDS.Split(','), int.Parse);
                    // å¤„理idArray...
                    for (int i = 0; i < idArray.Length; i++)
                    {
                        objJsonResult = (json)RejectCheckFlow(idArray[i].ToString(),CurUserID);//审核执行
                        if (objJsonResult.count == 0)
                        {
                            objJsonResult.Message += "第" + (i + 1) + "行出现问题无法继续完成";
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择正确行";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核工艺路线失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

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

@@ -71,8 +71,16 @@
                    {
                        row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
                    }
                    //如果表格第i行的第一列为空，则判断为这一行的数据为空，跳出循环并且不把数据写入 tb2
                    if (ExcelDs.Tables[0].Rows[i][0].ToString() == "" && ExcelDs.Tables[0].Rows[i][1].ToString() == "")
                    {
                        continue;
                    }
                    else
                    {
                    tb2.Rows.Add(row);
                }
                }

                var error = "";
                var ErrorResult = "";

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -1288,6 +1288,10 @@
                        {
                            HBarCodeType = "唯一条码";
                        }
                        if (CampanyName == "九菱")
                        {
                            HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
                        }
                        //
                        HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
                        HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);

 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user

@@ -294,10 +294,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/07/2024 18:43:55</publishTime>
      <publishTime>11/13/2024 14:11:29</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/07/2024 18:43:55</publishTime>
      <publishTime>11/13/2024 14:11:29</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>