调整下登录退出接口

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -93,9 +93,15 @@ namespace WMS.Web.Domain.Services.Public
                 //3.获取金蝶采购订单：拼接参数和条件
                 var query = new ErpBillQueryDto(token_result.Data);
                 var param = new ErpBillQueryParamDto(FormIdParam.PUR_PurchaseOrder.ToString());
-                param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate";
+                param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName";
                 param.Limit = 10;
-                param.FilterString = "FCreateDate>='"+beginTime+"' and FCreateDate<='"+endTime+"'";
+                //查询条件：备注其中的条件值以金蝶的值为准！！！
+                //1.创建时间在两天前和当天时间之间
+                //2.审核状态：已审核
+                //3.单据类型：标准采购订单和标准委外订单
+                //4.明细关闭状态：正常
+                //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
+                param.FilterString = "FCreateDate>='"+beginTime+"' and FCreateDate<='"+endTime+ "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
                 query.Data = JsonConvert.SerializeObject(param);
                 var json = JsonConvert.SerializeObject(query);
 
@@ -118,7 +124,11 @@ namespace WMS.Web.Domain.Services.Public
                     lis.FQty = Convert.ToDecimal(item[7]);
                     lis.FEntryNote = item[8];
                     lis.FCreateDate =Convert.ToDateTime(item[9]);
-                    //list.FCHUCHANGPRICE=[10]FCHUCHANGPRICE;//这个是出厂价，但是金蝶测试没有这个字段，正式有的
+                    lis.FDocumentStatus = item[10];
+                    lis.FBillTypeID = item[11];
+                    lis.FMRPCloseStatus = item[12];
+                    lis.FBillTypeFName = item[13];
+                    //list.FCHUCHANGPRICE=FCHUCHANGPRICE[?];//这个是出厂价，但是金蝶测试没有这个字段，正式有的
                     erp_list.Add(lis);
                 }
                 return ResultList<ErpPurchaseInStockResultDto>.ReSuccess(erp_list);

src/WMS.Web.Domain/Services/Public/LoginService.cs

@@ -382,7 +382,7 @@ namespace WMS.Web.Domain.Services.Public
             }
             else
             {
-                return Result.ReFailure(jObject["errmsg"], jObject["errno"]);
+                return Result.ReFailure(BaseResultCodes.UnAuthorized);
             }
         }