From dcbf27c519ce640bd1ee59d0130e295a1548414c Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 6 Dec 2023 14:18:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/TestController.cs | 47 ++++++++++--------- .../SerialNumbersRepositories.cs | 14 +++--- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 06d2c958..77378ec9 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -10,6 +10,7 @@ using System.Linq; using System.ServiceModel; using System.Threading.Tasks; using WMS.Web.Core.Dto; +using WMS.Web.Core.Dto.Erp.Customer; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; @@ -53,28 +54,30 @@ namespace WMS.Web.Api.Controllers [Route("hj")] public async Task TestHJ() { - var entity=await _takeStockRepositories.GetEntityList(new List() {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() { "FHTZD8022232" }, DateTime.Now.AddDays(-10)); - //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); - //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); - // var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10)); - //var b = await _outStockTaskService.Sync(new List() { "FHTZD8022232" }); - //var result = await this._outStockTaskService.Sync(null); - //var t=await _outStockTaskRepositories.Get(1); - // t.Details[0].Remark = "sdf"; - // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; - // var s = await _outStockTaskRepositories.Edit(t); - //await _boxService.Sync(list); - //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); - //var result= await this._erpService.BillQueryForPurchaseInStock(); - //var result = await this._erpService.BillQueryForOrg(); - //var result = await this._erpService.BillQueryForMaterial(); - //if (!result.IsSuccess) - // return ""; - //return JsonConvert.SerializeObject(result.Data); + List list = null; + var b= list.FirstOrDefault(f => f.Id == 123); + //var entity=await _takeStockRepositories.GetEntityList(new List() {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() { "FHTZD8022232" }, DateTime.Now.AddDays(-10)); + //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); + //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); + // var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10)); + //var b = await _outStockTaskService.Sync(new List() { "FHTZD8022232" }); + //var result = await this._outStockTaskService.Sync(null); + //var t=await _outStockTaskRepositories.Get(1); + // t.Details[0].Remark = "sdf"; + // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; + // var s = await _outStockTaskRepositories.Edit(t); + //await _boxService.Sync(list); + //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); + //var result= await this._erpService.BillQueryForPurchaseInStock(); + //var result = await this._erpService.BillQueryForOrg(); + //var result = await this._erpService.BillQueryForMaterial(); + //if (!result.IsSuccess) + // return ""; + //return JsonConvert.SerializeObject(result.Data); return ""; } diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index da0a01e4..980d3435 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using WMS.Web.Core.Dto; +using WMS.Web.Core.Dto.Erp; +using WMS.Web.Core.Dto.Erp.Customer; using WMS.Web.Core.Dto.SerialNumbers; using WMS.Web.Core.Help; using WMS.Web.Domain.Entitys; @@ -99,15 +101,15 @@ namespace WMS.Web.Repositories /// public async Task Get(string serialNumber) { + List materials = new List(); var materials_result = await _erpService.BillQueryForMaterial(); - if (!materials_result.IsSuccess) - return null; - var materials = materials_result.Data.ToList(); + if (materials_result.IsSuccess) + materials = materials_result.Data.ToList(); + List customers = new List(); var customer_result = await _erpService.BillQueryForCustomer(); - if (!customer_result.IsSuccess) - return null; - var customers = customer_result.Data.ToList(); + if (customer_result.IsSuccess) + customers = customer_result.Data.ToList(); var s = await _context.SerialNumbers .FirstOrDefaultAsync(f => serialNumber.Equals(f.SerialNumber)); From 18b6d126fd9b47926da5c21608dd9ad21fb3b095 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 6 Dec 2023 14:35:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 4 ++-- src/WMS.Web.Domain/Entitys/SerialNumbers.cs | 9 +++++---- src/WMS.Web.Domain/Services/SerialNumberService.cs | 9 +++++---- .../SerialNumbersRepositories.cs | 13 ++++++++++++- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 4e6e7330..cc5c36ec 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1607,11 +1607,11 @@ 解绑 - + 出库 - 出库单号 + 出库单号 diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs index 60711f1a..072597b6 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Text; @@ -110,13 +111,13 @@ namespace WMS.Web.Domain.Entitys /// /// 出库 /// - /// 出库单号 - public void OutStock(string outStockBillNo, OutStockType type,int customerId) + /// 出库单号 + public void OutStock(List salBillNos, OutStockType type,int customerId) { this.BoxId = 0; if (type == OutStockType.Sal) { - this.SalBillNo = outStockBillNo; + this.SalBillNo = JsonConvert.SerializeObject(salBillNos); this.CustomerId = customerId; this.OutStockTime = DateTime.Now; } diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 59679a91..86ef5f8b 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore.Storage; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -64,7 +65,7 @@ namespace WMS.Web.Domain.Services //修改序列号和箱绑定关系 entity.Bind(destBox.DestBoxId, box.CompleteCartonTime); - + //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { @@ -194,7 +195,7 @@ namespace WMS.Web.Domain.Services var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); if (outstockDetail == null) continue; //修改序列号和箱绑定关系 - entity.OutStock(outStock.BillNo, outStock.Type, outStock.ReceiptCustomerId); + entity.OutStock(outstockDetail.ErpDetails.Select(s => s.SaleBillNo).ToList(), outStock.Type, outStock.ReceiptCustomerId); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() @@ -206,7 +207,7 @@ namespace WMS.Web.Domain.Services OperateTime = DateTime.Now, OperateType = OutStockTypeConvert(outStock.Type), OperateUser = userName, - Remark = "来源单号:" + string.Join(",", outstockDetail.ErpDetails.Select(s=>s.SourceBillNo)) + "\r\n" + "出库单号:" + outStock.BillNo + Remark = "来源单号:" + string.Join(",", outstockDetail.ErpDetails.Select(s => s.SourceBillNo)) + "\r\n" + "出库单号:" + outStock.BillNo }; if (outStock.Type == OutStockType.Sal) { @@ -387,7 +388,7 @@ namespace WMS.Web.Domain.Services //if (backRecord.Type == BackRecordType.InstockOff) // entity.UnBind(); if (backRecord.Type == BackRecordType.OutstockOn) - entity.Bind(detail.BoxId,box.CompleteCartonTime); + entity.Bind(detail.BoxId, box.CompleteCartonTime); //记录序列号操作日志 diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 980d3435..2558570b 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -1,6 +1,7 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -123,10 +124,20 @@ namespace WMS.Web.Repositories InStockTime = s.InStockTime.DateToStringSeconds(), OutStockTime = s.OutStockTime.DateToStringSeconds(), PurchaseBillNo = s.PurchaseBillNo, - SalBillNo = s.SalBillNo, Customer = _erpBasicDataExtendService.GetCustomerName(customers, s.CustomerId), SerialNumber = s.SerialNumber }; + if (!string.IsNullOrEmpty(s.SalBillNo)) + { + Random rd = new Random(); + var list = JsonConvert.DeserializeObject>(s.SalBillNo); + if (list.Count() > 0) + { + int index = rd.Next(0, list.Count); + respone.SalBillNo = list[index]; + } + } + return respone; }