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

yusijie

2023-12-28 336353d20184dc995d51f14ba020195a1e497d37

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -687,6 +687,23 @@
                    }
                }
                else {
                   
                    string str1 = HBarCode.Substring(23, 3);

                    DataSet dataSet = oCN.RunProcReturn(@"select  m.HNumber 物料代码,o.HNumber 组织代码 from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
left join Gy_Material m WITH(NOLOCK) on a.HMaterID=m.HItemID
left join Xt_ORGANIZATIONS o WITH(NOLOCK) on a.HPRDORGID=o.HItemID 
where HBillNo='" + HProcExchBillNo + "' and HProjectNum like'" + str1 + "%' and HPRDORGID=" + HOrgID, "Sc_ProcessExchangeBillMain");

                    if (dataSet.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "条码与流转卡不存在对应关系!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "")
                    {
                        objJsonResult.code = "0";