智云MES后端API代码
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenhaozhe
3 天以前 25c2291ded30737b07fb7c93e5e231cc64733d2a 
 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs


@@ -30,7 +30,7 @@


                {


                    objJsonResult.code = "1";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "Sucess！";


                    objJsonResult.Message = "[0000-1-038]Sucess！";


                    objJsonResult.data = new DataTable();


                    return objJsonResult;


                }


@@ -39,7 +39,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -47,7 +47,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;


            }


@@ -171,6 +171,7 @@


                long HMainSourceEntryID = mainList[0].HICMOEntryID;


                string HMainSourceBillNo = mainList[0].HICMOBillNo;




                //判断生产质量汇报单是否存在


                ds = oCN.RunProcReturn("select * from Sc_QualityReportBillMain WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Sc_QualityReportBillMain");


                if (ds.Tables[0].Rows.Count != 0) {


                    objJsonResult.code = "0";


@@ -307,6 +308,7 @@


            //修改条码表的状态


            oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'");




            LogService.Write("类型:" + oSub.HBadTypeID + ",制单人:" + oSub.HMaker + ",制单日期:" + oSub.HMakeDate);


            //修改出站单的 不良 报废数量


            if (HResult == "不良")


            {


@@ -350,7 +352,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -369,15 +371,21 @@


                {


                    if (oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔")


                    {


                       


                        //判断当前流转卡是否是开工


                        ds = oCN.RunProcReturn("select  * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + HBarCode + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");


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


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "卡号:" + HBarCode + ",流转卡未开工!";


                            objJsonResult.data = null;


                            return objJsonResult;


                            //判断当前流转卡是否墨西哥的


                            ds = oCN.RunProcReturn("select HPRDORGID from Sc_ProcessExchangeBillMain with(nolock) where HBillNo = '" + HBarCode + "' ", "Sc_ProcessExchangeBillMain");


                            if (ds.Tables[0].Rows[0]["HPRDORGID"].ToString() != "7667152")


                            {


                                objJsonResult.code = "0";


                                objJsonResult.count = 0;


                                objJsonResult.Message = "[3791-2-018]卡号:" + HBarCode + ",流转卡未开工!";


                                objJsonResult.data = null;


                                return objJsonResult;


                            }                                                 


                        }


                    }


                }


@@ -392,7 +400,7 @@


                    {


                        objJsonResult.code = "2";


                        objJsonResult.count = 2;


                        objJsonResult.Message = "";


                        objJsonResult.Message = "[0000-1-037]";


                        objJsonResult.data = dataSet.Tables[0];


                        return objJsonResult;


                    }


@@ -400,7 +408,7 @@


                    {


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = "配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";


                        objJsonResult.Message = "[3791-2-019]配件清单查无数据！,可能是当前用户工序不正确或者流转卡输入错误!";


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


@@ -409,7 +417,7 @@


                {


                    objJsonResult.code = "1";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "";


                    objJsonResult.Message = "[0000-1-037]";


                    objJsonResult.data = ds.Tables[0];


                }




@@ -420,7 +428,7 @@




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -449,7 +457,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无保存权限!";


                    objJsonResult.Message = "[0000-2-038]无保存权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -459,10 +467,11 @@


                List<Model.Sc_AssemblyBill_BindSourceTemp> tempList = new List<Model.Sc_AssemblyBill_BindSourceTemp>();


                tempList = JsonConvert.DeserializeObject<List<Model.Sc_AssemblyBill_BindSourceTemp>>(msg1);




                if (tempList.Count == 0) {


                if (msg1 != "[]" && tempList.Count == 0)


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无配件数据!";


                    objJsonResult.Message = "[3791-2-026]无配件数据!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -493,7 +502,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "保存成功!";


                objJsonResult.Message = "[0000-1-050]保存成功!";


                objJsonResult.data = null;


                return objJsonResult;




@@ -503,7 +512,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-051]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -529,7 +538,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无保存权限!";


                    objJsonResult.Message = "[0000-2-038]无保存权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -543,13 +552,13 @@


                List<Model.ClsSc_AssemblyBillSub> sub = new List<Model.ClsSc_AssemblyBillSub>();


                sub = JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(sSubStr);






                //条码上道工序是否过站


                ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + omodel.HBarCode_P + "'," + omodel.HProcID, "h_v_Gy_QualifiedRecordsList");


                if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "查无数据!";


                    objJsonResult.Message = "[0000-1-045]查无数据!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -557,11 +566,12 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";


                    objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }




                //判断条码是否已经出站


                ds = oCN.RunProcReturn("select  * from h_v_Gy_QualifiedRecordsList WITH(NOLOCK) where 产品条码='" + omodel.HBarCode_P + "' and HProcExchInterID="+ omodel .HProcExchInterID+ " and HProcExchEntryID="+ omodel.HProcExchEntryID + " and HProcID="+ omodel.HProcID, "h_v_Gy_QualifiedRecordsList");




                if (ds.Tables[0].Rows.Count > 0)


@@ -569,7 +579,7 @@


                    oCN.RollBack();


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "条码:" + omodel.HBarCode_P + ",已存在!";


                    objJsonResult.Message = "[0000-2-039]条码:" + omodel.HBarCode_P + ",已存在!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -588,7 +598,7 @@


                            oCN.RollBack();


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "配件代码:" + HMaterNamePJ + ",数量为0!";


                            objJsonResult.Message = "[3791-2-020]配件代码:" + HMaterNamePJ + ",数量为0!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -704,11 +714,13 @@


                int HTemporaryAreaID = 0;//暂放区


                int HShiftsID = 0;




                //获取当前班次


                DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");


                if (set.Tables[0].Rows.Count > 0)


                {


                    HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());


                }


                //判断当天当前的流转卡是否有出站单


                ds = oCN.RunProcReturn("select  * from Sc_StationOutBillMain a WITH(NOLOCK) left join  Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID where a.HInterID=" + HInterID + " and HBillNo='" + HBillNo + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "' ", "Sc_StationOutBillMain");




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


@@ -761,7 +773,7 @@


                    oCN.RollBack();


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "出站数量超过流转卡数量!";


                    objJsonResult.Message = "[3791-2-028]出站数量超过流转卡数量!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -770,7 +782,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "保存成功!";


                objJsonResult.Message = "[0000-1-050]保存成功!";


                objJsonResult.data = null;


                return objJsonResult;




@@ -780,7 +792,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-051]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -837,7 +849,7 @@


                            {


                                objJsonResult.code = "0";


                                objJsonResult.count = 0;


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


                                objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";


                                objJsonResult.data = null;


                                return objJsonResult;


                            }


@@ -869,7 +881,7 @@


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


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


                            objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -884,7 +896,7 @@


                    {


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = "条码格式不正确!";


                        objJsonResult.Message = "[0000-2-036]条码格式不正确!";


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


@@ -913,7 +925,7 @@


                            {


                                objJsonResult.code = "0";


                                objJsonResult.count = 0;


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


                                objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";


                                objJsonResult.data = null;


                                return objJsonResult;


                            }


@@ -933,7 +945,7 @@


                        {


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


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


                            objJsonResult.Message = "[3791-2-016]条码与流转卡不存在对应关系!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -943,7 +955,7 @@


                    {


                        objJsonResult.code = "0";


                        objJsonResult.count = 0;


                        objJsonResult.Message = "当前条码的状态为:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";


                        objJsonResult.Message = "[0000-2-037]当前条码的状态为:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";


                        objJsonResult.data = null;


                        return objJsonResult;


                    }


@@ -951,7 +963,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


                objJsonResult.Message = "[0000-1-037]";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -960,7 +972,7 @@




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -983,7 +995,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "条形码不能为空，不能生成条码！";


                    objJsonResult.Message = "[0000-2-019]条形码不能为空，不能生成条码！";


                    return objJsonResult;


                }




@@ -1054,7 +1066,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


                objJsonResult.Message = "[0000-1-037]";


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1063,7 +1075,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1082,7 +1094,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1092,7 +1104,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "SN码查无数据！";


                    objJsonResult.Message = "[3791-2-023]SN码查无数据！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1101,7 +1113,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "当前条码的状态为:"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";


                    objJsonResult.Message = "[0000-2-037]当前条码的状态为:" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1112,7 +1124,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "配件条码判断失败！";


                    objJsonResult.Message = "[3791-2-024]配件条码判断失败！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1120,14 +1132,14 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);


                    objJsonResult.Message = "[0000-1-010]" + DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);


                    objJsonResult.data = null;


                    return objJsonResult;


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


                objJsonResult.Message = "[0000-1-037]";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -1136,7 +1148,7 @@




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1155,7 +1167,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1163,13 +1175,14 @@


                ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");


                string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();




                //查询流转卡所有工序信息


                ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBillHICOMProcessExchange WITH(NOLOCK) where 条码='" + HBarCode + "' ", "h_v_Gy_BarCodeBillHICOMProcessExchange");




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


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "条码查无数据！";


                    objJsonResult.Message = "[0000-1-045]条码查无数据！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1185,7 +1198,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "当前条码与当前工序不匹配!";


                    objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1193,14 +1206,14 @@


                if (ds.Tables[0].Rows[0]["HStatus"].ToString() != "正常") {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "当前条码状态为"+ ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";


                    objJsonResult.Message = "[0000-2-037]当前条码状态为" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


                objJsonResult.Message = "[0000-1-037]";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -1209,7 +1222,7 @@




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1228,7 +1241,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1237,7 +1250,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


                objJsonResult.Message = "[0000-1-037]";


                objJsonResult.data = ds;


                return objJsonResult;


            }


@@ -1246,7 +1259,7 @@




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1265,7 +1278,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1274,7 +1287,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


                objJsonResult.Message = "[0000-1-037]";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -1283,7 +1296,7 @@




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1302,7 +1315,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无删除权限!";


                    objJsonResult.Message = "[0000-1-058]无删除权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1313,7 +1326,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "查无数据！";


                    objJsonResult.Message = "[0000-1-045]查无数据！";


                    objJsonResult.data = null;


                }


                string HProcExchInterID = ds.Tables[0].Rows[0]["HProcExchInterID"].ToString();


@@ -1346,7 +1359,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1355,7 +1368,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1374,7 +1387,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无删除权限!";


                    objJsonResult.Message = "[0000-1-058]无删除权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1387,7 +1400,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "查无数据！";


                    objJsonResult.Message = "[0000-1-045]查无数据！";


                    objJsonResult.data = null;


                }




@@ -1416,7 +1429,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1425,7 +1438,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1444,7 +1457,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1458,7 +1471,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "条码查无数据！";


                    objJsonResult.Message = "[0000-2-020]条码查无数据！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1475,7 +1488,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "当前条码与当前工序不匹配!";


                    objJsonResult.Message = "[3791-2-017]当前条码与当前工序不匹配!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1484,7 +1497,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "当前条码状态为" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";


                    objJsonResult.Message = "[0000-2-037]当前条码状态为" + ds.Tables[0].Rows[0]["HStatus"].ToString() + "!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1492,7 +1505,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


                objJsonResult.Message = "[0000-1-037]";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -1501,7 +1514,7 @@




                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "没有返回任何记录！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]没有返回任何记录！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1568,7 +1581,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1588,7 +1601,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -1597,7 +1610,7 @@


            {


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1624,7 +1637,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无保存权限!";


                    objJsonResult.Message = "[0000-2-038]无保存权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1637,7 +1650,7 @@




                    Model.Sc_AssemblyBill_BindSourceTemp temp = new Model.Sc_AssemblyBill_BindSourceTemp();


                    temp = JsonConvert.DeserializeObject<Model.Sc_AssemblyBill_BindSourceTemp>(sSubStr);




                    //工序返修记录单 配件表


                    ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillSub_Mater where HInterID=" + model.HInterID+ " order by HEntryID  desc", "Sc_SourceLineRepairBillSub_Mater");




                    oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub_Mater


@@ -1651,7 +1664,7 @@


                    oCN.RunProc("update Sc_AssemblyBillSub set HBarCode='" + temp.HBarCode + "' where HInterID=" + temp.HInterID + " and HEntryID=" + temp.HEntryID);


                    //oCN.RunProc("exec h_p_AssemblyBill_Temp '" + temp.HProcExchBillNo + "'," + model.HProcess + "," + temp.HMaterID + ",'" + temp.HBatchNo + "'");


                }


                else if (HResult == "NG"|| HResult == "OK") {


                else if (HResult == "NG"|| HResult == "OK") { 


                    Model.ClsSc_SourceLineRepairBillMain model = new Model.ClsSc_SourceLineRepairBillMain();


                    model = JsonConvert.DeserializeObject<Model.ClsSc_SourceLineRepairBillMain>(sMainStr);




@@ -1700,7 +1713,7 @@


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


                        {


                            string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString();


                            //斯莫尔的情况 分 工废料废 返工


                            //斯莫尔的情况 分 工废 料废 返工


                            //工废


                            if (subLsit[0].HBadTypeID == 3)


                            {


@@ -1720,7 +1733,7 @@


                            oCN.RollBack();


                            objJsonResult.code = "0";


                            objJsonResult.count = 0;


                            objJsonResult.Message = "保存失败,当前流转卡当前工序的出站单没有不良数量!";


                            objJsonResult.Message = "[3748-2-005]保存失败,当前流转卡当前工序的出站单没有不良数量!";


                            objJsonResult.data = null;


                            return objJsonResult;


                        }


@@ -1730,7 +1743,7 @@


                    oCN.RollBack();


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "保存失败,无结果！";


                    objJsonResult.Message = "[0000-1-051]保存失败,无结果！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1740,7 +1753,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-050]Sucess！";


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1749,7 +1762,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-051]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1768,7 +1781,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无删除权限!";


                    objJsonResult.Message = "[0000-1-058]无删除权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1778,7 +1791,7 @@


                if (ds.Tables[0].Rows.Count == 0) {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "查无数据！";


                    objJsonResult.Message = "[0000-1-045]查无数据！";


                    objJsonResult.data = null;


                }




@@ -1817,7 +1830,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-010]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -1889,7 +1902,7 @@


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "无查询权限!";


                    objJsonResult.Message = "[0000-1-068]无查询权限!";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


@@ -1899,7 +1912,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


            }


@@ -1907,7 +1920,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;


            }


@@ -1977,7 +1990,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -1987,7 +2000,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -2017,7 +2030,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -2027,7 +2040,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -2057,7 +2070,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -2067,7 +2080,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -2097,7 +2110,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -2106,7 +2119,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;


            }


@@ -2136,7 +2149,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -2146,7 +2159,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -2163,6 +2176,7 @@




                List<object> columnNameList = new List<object>();




                //查询配件清单信息


                string sql = @"exec h_p_GZ_BarCodeBillList '" + HMaterNumber + "','" + HBatchNo + "','" + sWhere + "'";


                ds = oCN.RunProcReturn(sql, "h_p_GZ_BarCodeBillList");




@@ -2176,7 +2190,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -2186,7 +2200,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


@@ -2216,7 +2230,7 @@




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.Message = "[0000-1-037]Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


@@ -2226,7 +2240,7 @@


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();


                objJsonResult.Message = "[0000-1-038]Exception！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }