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

chenhaozhe

4 天以前 da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -574,7 +574,7 @@
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                    {
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + sBillNo + "'  and 委外标记=0 and 流转标记=1  and 工序号='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + sBillNo + "'  and 委外标记=0   and 工序号='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
                    }
                    else
                    {