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

wtt

2025-04-02 9cfdb479a1083fc9615779edcff50472319dd387

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -200,7 +200,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "空白码,条形码不能为空！";
                    objJsonResult.Message = "[0000-2-019]空白码,条形码不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -369,25 +369,25 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到条码信息！";
                    objJsonResult.Message = "[0000-2-020]未查询到条码信息！";
                    objJsonResult.data = null;
                    if(BillNoType == "PRO")
                    {
                        ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList where HItemID = '" + BillNo + "'", "h_v_Gy_ProcessList");
                        if (ds == null || ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.Message = "未查询到条码信息！";
                            objJsonResult.Message = "[0000-2-020]未查询到条码信息！";
                        }
                        else
                        {
                            objJsonResult.Message = "用户未关联相关工序或流转卡无此工序，如有需要请维护";
                            objJsonResult.Message = "[3790-2-010]用户未关联相关工序或流转卡无此工序，如有需要请维护";
                        }
                    }
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.Message = "[0000-1-037]Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
@@ -395,7 +395,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -458,7 +458,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "空白码,条形码不能为空！";
                    objJsonResult.Message = "[0000-2-019]空白码,条形码不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -472,7 +472,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到条形码信息！";
                    objJsonResult.Message = "[0000-2-020]未查询到条形码信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -480,7 +480,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "错误！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
                    objJsonResult.Message = "[0000-1-038]错误！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -493,7 +493,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "刷新失败,无数据显示！";
                    objJsonResult.Message = "[0000-1-045]刷新失败,无数据显示！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -501,14 +501,14 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无数据!";
                    objJsonResult.Message = "[0000-1-045]查无数据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "绑定成功！";
                objJsonResult.Message = "[0000-1-037]绑定成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -516,7 +516,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -1678,7 +1678,7 @@
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "用户编码不能为空！";
                                objJsonResult.Message = "[0000-2-021]用户编码不能为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
@@ -1689,13 +1689,13 @@
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "未查询到工序信息！";
                                objJsonResult.Message = "[0000-2-022]未查询到工序信息！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            objJsonResult.code = "1";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "Sucess！";
                            objJsonResult.Message = "[0000-1-037]Sucess！";
                            objJsonResult.data = ds.Tables[0];
                            return objJsonResult;
                        }
@@ -1703,7 +1703,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "Exception！" + e.ToString();
                            objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -1712,7 +1712,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "手动输入模式";
                        objJsonResult.Message = "[0000-2-024]手动输入模式";
                        objJsonResult.data = "";
                        return objJsonResult;
                    }
@@ -1728,7 +1728,7 @@
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "用户编码不能为空！";
                                objJsonResult.Message = "[0000-2-021]用户编码不能为空！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
@@ -1739,7 +1739,7 @@
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "未查询到工序信息！";
                                objJsonResult.Message = "[0000-2-022]未查询到工序信息！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
@@ -1753,7 +1753,7 @@
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "Exception！" + e.ToString();
                            objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
@@ -1762,7 +1762,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "手动输入模式";
                        objJsonResult.Message = "[0000-2-024]手动输入模式";
                        objJsonResult.data = "";
                        return objJsonResult;
                    }
@@ -1776,7 +1776,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "系统参数异常";
                objJsonResult.Message = "[0000-2-023]系统参数异常";
                objJsonResult.data = "";
                return objJsonResult;
            }