18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tongfei
2023-12-06 14:48:42 +08:00
parent 17cfaf16af 18b6d126fd
commit acb90e8202
5 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -10,6 +10,7 @@ using System.Linq;
using System.ServiceModel; using System.ServiceModel;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core.Dto; using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp.Customer;
using WMS.Web.Core.Internal.Results; using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure; using WMS.Web.Domain.Infrastructure;
@@ -53,28 +54,30 @@ namespace WMS.Web.Api.Controllers
[Route("hj")] [Route("hj")]
public async Task<string> TestHJ() public async Task<string> TestHJ()
{ {
var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 }); List<ErpCustomerDto> list = null;
var r= await _takeStockService.Loss_Profit(entity.First()); var b= list.FirstOrDefault(f => f.Id == 123);
//var list = await GetList(); //var entity=await _takeStockRepositories.GetEntityList(new List<int>() {2 });
//var c = await _erpService.BillQueryForSubStock(null,null); //var r= await _takeStockService.Loss_Profit(entity.First());
//var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10)); //var list = await GetList();
//var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10)); //var c = await _erpService.BillQueryForSubStock(null,null);
//var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1)); //var bc2 = await _erpService.BillQueryForDeliveryNoticeOutStock(new List<string>() { "FHTZD8022232" }, DateTime.Now.AddDays(-10));
// var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10)); //var bc = await _erpService.BillQueryForTransferOutOutStock(null, DateTime.Now.AddDays(-10));
//var b = await _outStockTaskService.Sync(new List<string>() { "FHTZD8022232" }); //var b=await _erpService.BillQueryForAssembledAppOutStock_Assembly(null, DateTime.Now.AddDays(-1));
//var result = await this._outStockTaskService.Sync(null); // var b2 = await _erpService.BillQueryForAssembledAppOutStock_Dassembly(null, DateTime.Now.AddDays(-10));
//var t=await _outStockTaskRepositories.Get(1); //var b = await _outStockTaskService.Sync(new List<string>() { "FHTZD8022232" });
// t.Details[0].Remark = "sdf"; //var result = await this._outStockTaskService.Sync(null);
// t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; //var t=await _outStockTaskRepositories.Get(1);
// var s = await _outStockTaskRepositories.Edit(t); // t.Details[0].Remark = "sdf";
//await _boxService.Sync(list); // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb";
//var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300)); // var s = await _outStockTaskRepositories.Edit(t);
//var result= await this._erpService.BillQueryForPurchaseInStock(); //await _boxService.Sync(list);
//var result = await this._erpService.BillQueryForOrg(); //var res = await this._erpService.BillQueryForAssembledAppOutStock_Dassembly(null,DateTime.Now.AddDays(-300));
//var result = await this._erpService.BillQueryForMaterial(); //var result= await this._erpService.BillQueryForPurchaseInStock();
//if (!result.IsSuccess) //var result = await this._erpService.BillQueryForOrg();
// return ""; //var result = await this._erpService.BillQueryForMaterial();
//return JsonConvert.SerializeObject(result.Data); //if (!result.IsSuccess)
// return "";
//return JsonConvert.SerializeObject(result.Data);
return ""; return "";
} }

4
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1607,11 +1607,11 @@
解绑 解绑
</summary> </summary>
</member> </member>
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.String,WMS.Web.Domain.Values.OutStockType,System.Int32)"> <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.Collections.Generic.List{System.String},WMS.Web.Domain.Values.OutStockType,System.Int32)">
<summary> <summary>
出库 出库
</summary> </summary>
<param name="outStockBillNo">出库单号</param> <param name="salBillNos">出库单号</param>
</member> </member>
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.InStock(System.String,WMS.Web.Domain.Values.InstockType)"> <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.InStock(System.String,WMS.Web.Domain.Values.InstockType)">
<summary> <summary>

9
src/WMS.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -1,4 +1,5 @@
using System; using Newtonsoft.Json;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Text; using System.Text;
@@ -110,13 +111,13 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 出库 /// 出库
/// </summary> /// </summary>
/// <param name="outStockBillNo">出库单号</param> /// <param name="salBillNos">出库单号</param>
public void OutStock(string outStockBillNo, OutStockType type,int customerId) public void OutStock(List<string> salBillNos, OutStockType type,int customerId)
{ {
this.BoxId = 0; this.BoxId = 0;
if (type == OutStockType.Sal) if (type == OutStockType.Sal)
{ {
this.SalBillNo = outStockBillNo; this.SalBillNo = JsonConvert.SerializeObject(salBillNos);
this.CustomerId = customerId; this.CustomerId = customerId;
this.OutStockTime = DateTime.Now; this.OutStockTime = DateTime.Now;
} }

9
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -64,7 +65,7 @@ namespace WMS.Web.Domain.Services
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
entity.Bind(destBox.DestBoxId, box.CompleteCartonTime); entity.Bind(destBox.DestBoxId, box.CompleteCartonTime);
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
@@ -194,7 +195,7 @@ namespace WMS.Web.Domain.Services
var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId);
if (outstockDetail == null) continue; 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() SerialNumberOperate op = new SerialNumberOperate()
@@ -206,7 +207,7 @@ namespace WMS.Web.Domain.Services
OperateTime = DateTime.Now, OperateTime = DateTime.Now,
OperateType = OutStockTypeConvert(outStock.Type), OperateType = OutStockTypeConvert(outStock.Type),
OperateUser = userName, 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) if (outStock.Type == OutStockType.Sal)
{ {
@@ -387,7 +388,7 @@ namespace WMS.Web.Domain.Services
//if (backRecord.Type == BackRecordType.InstockOff) //if (backRecord.Type == BackRecordType.InstockOff)
// entity.UnBind(); // entity.UnBind();
if (backRecord.Type == BackRecordType.OutstockOn) if (backRecord.Type == BackRecordType.OutstockOn)
entity.Bind(detail.BoxId,box.CompleteCartonTime); entity.Bind(detail.BoxId, box.CompleteCartonTime);
//记录序列号操作日志 //记录序列号操作日志

27
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -1,12 +1,15 @@
using AutoMapper; using AutoMapper;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using WMS.Web.Core.Dto; 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.Dto.SerialNumbers;
using WMS.Web.Core.Help; using WMS.Web.Core.Help;
using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Entitys;
@@ -99,15 +102,15 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<SerialNumbersResponse> Get(string serialNumber) public async Task<SerialNumbersResponse> Get(string serialNumber)
{ {
List<ErpMaterialDto> materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial(); var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess) if (materials_result.IsSuccess)
return null; materials = materials_result.Data.ToList();
var materials = materials_result.Data.ToList();
List<ErpCustomerDto> customers = new List<ErpCustomerDto>();
var customer_result = await _erpService.BillQueryForCustomer(); var customer_result = await _erpService.BillQueryForCustomer();
if (!customer_result.IsSuccess) if (customer_result.IsSuccess)
return null; customers = customer_result.Data.ToList();
var customers = customer_result.Data.ToList();
var s = await _context.SerialNumbers var s = await _context.SerialNumbers
.FirstOrDefaultAsync(f => serialNumber.Equals(f.SerialNumber)); .FirstOrDefaultAsync(f => serialNumber.Equals(f.SerialNumber));
@@ -121,10 +124,20 @@ namespace WMS.Web.Repositories
InStockTime = s.InStockTime.DateToStringSeconds(), InStockTime = s.InStockTime.DateToStringSeconds(),
OutStockTime = s.OutStockTime.DateToStringSeconds(), OutStockTime = s.OutStockTime.DateToStringSeconds(),
PurchaseBillNo = s.PurchaseBillNo, PurchaseBillNo = s.PurchaseBillNo,
SalBillNo = s.SalBillNo,
Customer = _erpBasicDataExtendService.GetCustomerName(customers, s.CustomerId), Customer = _erpBasicDataExtendService.GetCustomerName(customers, s.CustomerId),
SerialNumber = s.SerialNumber SerialNumber = s.SerialNumber
}; };
if (!string.IsNullOrEmpty(s.SalBillNo))
{
Random rd = new Random();
var list = JsonConvert.DeserializeObject<List<string>>(s.SalBillNo);
if (list.Count() > 0)
{
int index = rd.Next(0, list.Count);
respone.SalBillNo = list[index];
}
}
return respone; return respone;
} }