智云MES后端API代码
parent: 08a9d916 | 补丁 | 提交 | ignore whitespace
yangle
2024-08-05 eb99e1d802f2125785b539b62319135440150018 
单品过站 八位项目号 优化
2个文件已修改
47 ■■■■■ 已修改文件
DAL/车间管理/ClsSc_MaterToSourceBill.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DAL/³µ¼ä¹ÜÀí/ClsSc_MaterToSourceBill.cs


@@ -188,7 +188,6 @@


                {


                    return false;


                }




                oCn.BeginTran();


                //主表


                oCn.RunProc("Insert Into Sc_MaterToSourceBillMain   " +




 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs


@@ -745,11 +745,27 @@




                        if (dataSet.Tables[0].Rows.Count == 0)


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "条码与流转卡不存在对应关系!";


                            objJsonResult.data = null;


                            return objJsonResult;


                            str1 = HBarCode.Substring(23, 3);




                            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;


                            }


                            else


                            {


                                ClsPub.CurUserName = user;


                                //条码生成


                                return get_HBardBillSave(HProcExchBillNo, HBarCode);


                            }


                        }


                        else {


                            ClsPub.CurUserName = user;


@@ -777,11 +793,21 @@




                    if (dataSet.Tables[0].Rows.Count == 0)


                    {


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = "条码与流转卡不存在对应关系!";


                        objJsonResult.data = null;


                        return objJsonResult;


                        str1 = HBarCode.Substring(23, 3);




                        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() != "")