优化获取金蝶入库数据

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -285,7 +285,7 @@
             总数量
             </summary>
         </member>
-        <member name="F:WMS.Web.Core.Dto.BoxResponse.Details">
+        <member name="P:WMS.Web.Core.Dto.BoxResponse.Details">
             <summary>
             明细信息
             </summary>
@@ -595,6 +595,16 @@
             创建时间
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FCHUCHANGPRICE">
+            <summary>
+            出厂价格
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.StockFNumber">
+            <summary>
+            仓库编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpSave`1">
             <summary>
             Erp同步数据时单据头

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -474,6 +474,11 @@
             收货仓库
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.StockCode">
+            <summary>
+            收货仓库编码（对应金蝶和单点）
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.FactoryPrice">
             <summary>
             出厂价

src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs

@@ -53,6 +53,16 @@ namespace WMS.Web.Core.Dto.Erp.Purchase
         /// </summary>
         public DateTime FCreateDate { get; set; }
 
+        /// <summary>
+        /// 出厂价格
+        /// </summary>
+        public decimal FCHUCHANGPRICE { get; set; }
+
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string StockFNumber { get; set; }
+
         public string FDocumentStatus { get; set; }
         public string FBillTypeID { get; set; }
         public string FMRPCloseStatus { get; set; }

src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs

@@ -38,6 +38,10 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public int StockId { get; set; }
         /// <summary>
+        /// 收货仓库编码（对应金蝶和单点）
+        /// </summary>
+        public string StockCode { get; set; }
+        /// <summary>
         /// 出厂价
         /// </summary>
         public decimal FactoryPrice { get; set; }

src/WMS.Web.Domain/Mappers/InStockMapper.cs

@@ -32,6 +32,7 @@ namespace WMS.Web.Domain.Mappers
             .ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.FMaterialId))
             .ForMember(x => x.StockId, ops => ops.MapFrom(x => x.FSOSTOCKID))
 
+            .ForMember(x => x.FactoryPrice, ops => ops.MapFrom(x => x.FCHUCHANGPRICE))
             .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.FQty))
             .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.FEntryNote))
             .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.FCreateDate))

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

@@ -93,7 +93,7 @@ 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,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName";
+                param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FModel,FMaterialName,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FDocumentStatus,FBillTypeID,FMRPCloseStatus,FBillTypeID.FName";
                 param.Limit = 10;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -124,11 +124,12 @@ namespace WMS.Web.Domain.Services.Public
                     lis.FQty = Convert.ToDecimal(item[7]);
                     lis.FEntryNote = item[8];
                     lis.FCreateDate =Convert.ToDateTime(item[9]);
-                    lis.FDocumentStatus = item[10];
+                    lis.FCHUCHANGPRICE = Convert.ToDecimal(item[10]);
-                    lis.FBillTypeID = item[11];
+                    lis.StockFNumber = item[11];
-                    lis.FMRPCloseStatus = item[12];
+                    lis.FDocumentStatus = item[12];
-                    lis.FBillTypeFName = item[13];
+                    lis.FBillTypeID = item[13];
-                    //list.FCHUCHANGPRICE=FCHUCHANGPRICE[?];//这个是出厂价，但是金蝶测试没有这个字段，正式有的
+                    lis.FMRPCloseStatus = item[14];
+                    lis.FBillTypeFName = item[15];
                     erp_list.Add(lis);
                 }
                 return ResultList<ErpPurchaseInStockResultDto>.ReSuccess(erp_list);