Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/XB_MES_API

zjh

20 分钟以前 a27f32ecbfc7390ceb9e3a8d8651c57ada88bfa0

 StandardPda/MES.Service/service/BasicData/MesRohInManager.cs

@@ -95,17 +95,14 @@
        var mesRohIn = new MesRohIn();

        var single = base.GetSingle(it => it.EbelnK3id == eid);
        if (single != null) { 
            mesRohIn.Id = single.Id; 
        if (single != null)
        {
            mesRohIn.Id = single.Id;

            if(single.CheckDate != null)
            {
            if (single.CheckDate != null)
                mesRohIn.CheckDate = single.CheckDate;
            }
            else
            {
                mesRohIn.CheckDate = DateTime.Now;
            }
        }

        var mesLinkU9 = Db.Queryable<MesLinkU9>()