Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -210,7 +210,7 @@ namespace WMS.Web.Api.Controllers
                 return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             List<UcStockResponse> list = new List<UcStockResponse>();
-            if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("JD"))
+            if (!number.Substring(0, 2).Equals("HD") && !number.Substring(0, 2).Equals("GD"))
                 return Result<List<UcStockResponse>>.ReSuccess(list);
 
             var subs = await _erpService.BillQueryForSubStock(number, orgCode);

src/WMS.Web.Api/Controllers/TakeStockController.cs

@@ -102,7 +102,7 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpGet]
+        [HttpPost]
         [Route("Sync")]
         public async Task<Result> Sync(OperateRequest dto)
         {

src/WMS.Web.Api/Controllers/TestController.cs

@@ -30,9 +30,12 @@ namespace WMS.Web.Api.Controllers
         private readonly IOutStockTaskRepositories _outStockTaskRepositories;
         private readonly IOutStockTaskService _outStockTaskService;
         private readonly IBoxInventoryRepositories _boxInventoryRepositories;
+        private readonly ITakeStockService _takeStockService;
+        private readonly ITakeStockRepositories _takeStockRepositories;
         public TestController(IErpService erpService, IInStockTaskService inStockTaskService, IBoxInventoryRepositories boxInventoryRepositories,
             IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService,
-            IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService)
+            IOutStockTaskRepositories outStockTaskRepositories, IOutStockTaskService outStockTaskService,
+            ITakeStockService takeStockService, ITakeStockRepositories takeStockRepositories)
         {
             _boxInventoryRepositories = boxInventoryRepositories;
             this._erpService = erpService;
@@ -42,14 +45,16 @@ namespace WMS.Web.Api.Controllers
             _boxService = boxService;
             _outStockTaskRepositories = outStockTaskRepositories;
             _outStockTaskService = outStockTaskService;
+            _takeStockService = takeStockService;
+            _takeStockRepositories = takeStockRepositories;
         }
 
         [HttpGet]
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-
-
+          var entity=await  _takeStockRepositories.GetEntityList(new List<int>() {2 });
+          var r= await _takeStockService.Loss_Profit(entity.First());
             //var list = await GetList();
             //var c = await _erpService.BillQueryForSubStock(null,null);
             //var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10));

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

@@ -590,6 +590,11 @@
             参数
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpBillQueryDto.FormId">
+            <summary>
+            参数(保存提交审核formId在外层)
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryParamDto">
             <summary>
             ERP：单据查询-参数-dto
@@ -710,6 +715,31 @@
             单据类型
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.ErpNumberDto">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpNumberDto.Number">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.Erp.ErpSubStockDto">
+            <summary>
+            盘点子仓库
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpSubStockDto.GD">
+            <summary>
+            GD仓
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpSubStockDto.HD">
+            <summary>
+            HD仓
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.ErpOperateDto">
             <summary>
             erp 提交和审核
@@ -800,6 +830,11 @@
             基本单位名称
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.BaseUnitNumber">
+            <summary>
+            基本单位编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto">
             <summary>
             金蝶组织-基本信息
@@ -1015,6 +1050,11 @@
             业务组织(使用组织)
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.OrgCode">
+            <summary>
+            业务组织(使用组织)编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Supplier.ErpSupplierDto">
             <summary>
             erp供应商基础数据
@@ -1127,7 +1167,12 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FinalQty">
             <summary>
-            盘点后数量
+            盘盈数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.LossQty">
+            <summary>
+            盘亏数量
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.Fnote">

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

@@ -1660,6 +1660,11 @@
             备注
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.TakeStock.ErpSyncId">
+            <summary>
+            同步到金蝶后金蝶的单据Id
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.TakeStock.SerialNumbers">
             <summary>
             序列号  
@@ -1671,7 +1676,7 @@
             </summary>
             <param name="creatorId"></param>
         </member>
-        <member name="M:WMS.Web.Domain.Entitys.TakeStock.Sync(System.Boolean,System.String,WMS.Web.Domain.Values.SyncStatus)">
+        <member name="M:WMS.Web.Domain.Entitys.TakeStock.Sync(System.Boolean,System.String,WMS.Web.Domain.Values.SyncStatus,System.String)">
             <summary>
             同步金蝶结果
             </summary>
@@ -2631,6 +2636,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetMaterialUnitNumber(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
+            <summary>
+            获取物料基本单位编码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
             <summary>
             获取组织名称
@@ -3958,6 +3971,14 @@
             <param name="materialId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetMaterialUnitNumber(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpMaterialDto},System.Int32)">
+            <summary>
+            获取物料基本单位编码
+            </summary>
+            <param name="erpMaterials"></param>
+            <param name="materialId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetOrgName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Org.ErpOrgDto},System.Int32)">
             <summary>
             获取组织名称
@@ -5644,7 +5665,7 @@
         </member>
         <member name="F:WMS.Web.Domain.Values.SyncStatus.Fail">
             <summary>
-            失败
+            失败(保存失败 未保存)
             </summary>
         </member>
         <member name="F:WMS.Web.Domain.Values.SyncStatus.Success">
@@ -5652,9 +5673,14 @@
             成功
             </summary>
         </member>
-        <member name="F:WMS.Web.Domain.Values.SyncStatus.PortionSuccess">
+        <member name="F:WMS.Web.Domain.Values.SyncStatus.SubmitFail">
             <summary>
-            部分成功(数据保存成功,提交或者审核失败)
+            提交失败
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.SyncStatus.CheckFail">
+            <summary>
+            审核失败
             </summary>
         </member>
         <member name="T:WMS.Web.Domain.Values.TakeStockType">