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

chenhaozhe

2026-03-18 5c15b0da16d050bc5df139fa71f73c6d4c77b6f4

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -435,7 +435,7 @@
                }
                else
                {
                    if (HProcID == "90")
                    if (HProcID == "90" || HProcID== "102")
                    {
                        DataSet dataSet = oCN.RunProcReturn(@"exec h_p_Sc_ProcessExchangeBillList2 '" + HBarCode + "'," + HProcID, "h_p_Sc_ProcessExchangeBillList2");
                        if (dataSet.Tables[0].Rows.Count > 0)