yxj
2023-03-13 8db6a75937941cf1414115ff23aef3cd23b62011
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -179,15 +179,15 @@
                    case "SBM"://设备码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_EquipMentList  where HItemID = '" + BillNo + "'", "h_v_Gy_EquipMentList");
                        break;
                    case "JYM"://员工码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_StaffList  where HItemID = '" + BillNo + "'", "h_v_Gy_StaffList");
                    case "JYM"://员工码--检验员
                        ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New  where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
                        break;
                    case "GRM"://员工码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_StaffList  where HItemID = '" + BillNo + "'", "h_v_Gy_StaffList");
                    case "GRM"://员工码--操作员,接收人
                        ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New  where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
                        break;
                    case "CGM"://员工码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_StaffList  where HItemID = '" + BillNo + "'", "h_v_Gy_StaffList");
                        break;
                    //case "CGM"://员工码
                    //    ds = oCN.RunProcReturn("select * from h_v_Gy_EmployeeList_New  where HItemID = '" + BillNo + "'", "h_v_Gy_EmployeeList_New");
                    //    break;
                    case "HWH"://仓库码
                        ds = oCN.RunProcReturn("select * from h_v_Gy_WareHouseList  where 条码编号 = '" + HBarCode + "'", "h_v_Gy_WareHouseList");
                        break;
@@ -205,7 +205,7 @@
                        if (oSystemParameter.ShowBill(ref sReturn) == true)
                        {
                            //系统参数是否为只显示当前登录用户关联的工序信息,N为否,Y为是
                            if (oSystemParameter.omodel.MES_StationBill_ProcNoByUser == "Y")
                            if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
                            {
                                ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList_GetProcNoByUser  where HItemID = '" + BillNo + "' and HInterID = '" + HInterID + "' and 用户编码 = '" + UserID + "'", "h_v_Gy_ProcessList_GetProcNoByUser");
                            }
@@ -271,7 +271,7 @@
            if (oSystemParameter.ShowBill(ref sReturn) == true)
            {
                //系统参数是否为自动匹配流水号,N为手动输入,Y为自动匹配
                if (oSystemParameter.omodel.MES_StationBill_ProcNo == "Y")
                if (oSystemParameter.omodel.MES_StationOutBill_ShowUSERProcess == "Y")
                {
                    try
                    {