1
duhe
1 天以前 56a9ece7e0394587d60f0ea78293c03b63db95d0
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;
                }
@@ -238,6 +238,18 @@
                        {
                            if (oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔")
                            {
                                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                            }
                        }
                        break;
                    case "OP"://流转卡
                        sErr = "";
                        if (oSystemParameter.ShowBill(ref sErr))
                        {
                            if (oSystemParameter.omodel.WMS_CampanyName == "海诚")
                            {
                                //同步工序流转卡
                                oCN.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_ProcExchAndRouting '" + BillNo_PGD + "'");
                                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                            }
                        }
@@ -369,25 +381,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 +407,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 +470,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "空白码,条形码不能为空!";
                    objJsonResult.Message = "[0000-2-019]空白码,条形码不能为空!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -472,7 +484,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到条形码信息!";
                    objJsonResult.Message = "[0000-2-020]未查询到条形码信息!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -480,7 +492,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 +505,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "刷新失败,无数据显示!";
                    objJsonResult.Message = "[0000-1-045]刷新失败,无数据显示!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -501,14 +513,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 +528,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 +1690,7 @@
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "用户编码不能为空!";
                                objJsonResult.Message = "[0000-2-021]用户编码不能为空!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
@@ -1689,13 +1701,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 +1715,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 +1724,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "手动输入模式";
                        objJsonResult.Message = "[0000-2-024]手动输入模式";
                        objJsonResult.data = "";
                        return objJsonResult;
                    }
@@ -1728,7 +1740,7 @@
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "用户编码不能为空!";
                                objJsonResult.Message = "[0000-2-021]用户编码不能为空!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
@@ -1739,7 +1751,7 @@
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "未查询到工序信息!";
                                objJsonResult.Message = "[0000-2-022]未查询到工序信息!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
@@ -1753,7 +1765,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 +1774,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "手动输入模式";
                        objJsonResult.Message = "[0000-2-024]手动输入模式";
                        objJsonResult.data = "";
                        return objJsonResult;
                    }
@@ -1776,7 +1788,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "系统参数异常";
                objJsonResult.Message = "[0000-2-023]系统参数异常";
                objJsonResult.data = "";
                return objJsonResult;
            }