合并分支

chenhaozhe

16 小时以前 6d85c65004990ac29f58ad233eba3a795c2f818b

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -315,6 +315,16 @@
                            ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        }
                        break;
                    case "MO"://流转卡
                         sErr = "";
                        if (oSystemParameter.ShowBill(ref sErr))
                        {
                            if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                            {
                                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                            }
                        }
                        break;
                }

                switch (BillNoType2)
@@ -352,6 +362,9 @@
                    case "P204"://流转卡
                    case "P205"://流转卡
                    case "P201"://流转卡
                    case "MO26"://华舟流转卡
                    case "MO27"://华舟流转卡
                    case "MO28"://华舟流转卡
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        break;
                }