diff --git a/src/WMS.Web.Core/Dto/BoxDetailResponse.cs b/src/WMS.Web.Core/Dto/BoxDetailResponse.cs
index 91bff1e3..934af08e 100644
--- a/src/WMS.Web.Core/Dto/BoxDetailResponse.cs
+++ b/src/WMS.Web.Core/Dto/BoxDetailResponse.cs
@@ -9,11 +9,6 @@ namespace WMS.Web.Core.Dto
///
public class BoxDetailResponse
{
-
- /////
- ///// 物料ID
- /////
- //public int MaterialId { get; set; }
///
/// 物料名称
///
diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs
index ae638687..ec5c3b45 100644
--- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs
+++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs
@@ -60,11 +60,6 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
this.Qty = qty;
this.SerialNumbers.Add(serialNumber);
}
- /////
- ///// 物料ID
- /////
- //[Required(ErrorMessage = "物料不能为空")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs
index 44a95ce8..e6c0cfe6 100644
--- a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs
@@ -33,10 +33,6 @@ namespace WMS.Web.Core.Dto.Erp.OutStock
/// 对应金蝶单据明细id(销售出库同步金蝶下推使用)
///
public int Erp_DetailId { get; set; } = 0;
- /////
- ///// 物料Id
- /////
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Core/Dto/MaterialResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs
index 8c10e944..cad119d3 100644
--- a/src/WMS.Web.Core/Dto/MaterialResponse.cs
+++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs
@@ -33,10 +33,6 @@ namespace WMS.Web.Core.Dto
/// 序列号
///
public string SerialNumber { get; set; }
- /////
- ///// 物料ID
- /////
- //public int MaterialId { get; set; }
///
/// 物料名称
///
diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs
index d016323a..613ba288 100644
--- a/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs
+++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/SaveMoveBoxRecordRequest.cs
@@ -41,11 +41,6 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
///
public class SaveMoveBoxRecordDetailsRequest
{
- /////
- ///// 物料Id
- /////
- //[Required(ErrorMessage = "物料不能为空")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
index b7e79cab..5ecacc97 100644
--- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
+++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
@@ -76,11 +76,6 @@ namespace WMS.Web.Core.Dto
}
public class OpsBoxDetailsResponse {
- /////
- ///// 物料ID
- /////
- //[JsonProperty("FMaterialId")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
index fc863465..d1b25385 100644
--- a/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs
@@ -25,10 +25,6 @@ namespace WMS.Web.Core.Dto.OutStock
}
public class SaveOutStockDetailsRequest
{
- /////
- ///// 物料Id
- /////
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
index a969598c..2153a8c2 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs
@@ -33,10 +33,6 @@ namespace WMS.Web.Core.Dto.OutStockTask
public class GetOutStockTaskByNoDetailsResponse
{
- /////
- ///// 物料Id
- /////
- //public int MaterialId { get; set; }
///
/// 物料名称
///
diff --git a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
index cf5a1712..7f5d472a 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs
@@ -15,11 +15,6 @@ namespace WMS.Web.Core.Dto.TakeStock
///
[Required(ErrorMessage = "箱不能为空")]
public int BoxId { get; set; }
- /////
- ///// 物料ID
- /////
- //[Required(ErrorMessage = "物料不能为空")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/BoxDetails.cs b/src/WMS.Web.Domain/Entitys/BoxDetails.cs
index 2f3b4c28..88d142a0 100644
--- a/src/WMS.Web.Domain/Entitys/BoxDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/BoxDetails.cs
@@ -23,10 +23,6 @@ namespace WMS.Web.Domain.Entitys
/// 单据头ID
///
public int Fid { get; set; }
- /////
- ///// 物料ID
- /////
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs
index 17873e02..6c59fd4f 100644
--- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs
+++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs
@@ -24,11 +24,6 @@ namespace WMS.Web.Domain.Entitys
///
[Column("BillNo")]
public string BillNo { get; set; }
- /////
- ///// 物料ID
- /////
- //[Column("MaterialId")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecordDetails.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecordDetails.cs
index 0635dd2e..483ce142 100644
--- a/src/WMS.Web.Domain/Entitys/MoveBoxRecordDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecordDetails.cs
@@ -24,11 +24,6 @@ namespace WMS.Web.Domain.Entitys
///
[Column("Fid")]
public int Fid { get; set; }
- /////
- ///// 物料Id
- /////
- //[Column("MaterialId")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
index ced86b52..28f2bb2f 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs
@@ -25,11 +25,6 @@ namespace WMS.Web.Domain.Entitys
///
[Column("Fid")]
public int Fid { get; set; }
- /////
- ///// 物料Id
- /////
- //[Column("MaterialId")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
index bd5752f1..14f2f55f 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
@@ -27,11 +27,6 @@ namespace WMS.Web.Domain.Entitys
///
[Column("Fid")]
public int Fid { get; set; }
- /////
- ///// 物料Id
- /////
- //[Column("MaterialId")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs b/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs
index 25f4e03c..7e8cf0d2 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs
@@ -41,10 +41,6 @@ namespace WMS.Web.Domain.Entitys
/// 序列号操作类型
///
public SerialNumberOperateType OperateType { get; set; } = SerialNumberOperateType.Generate;
- /////
- ///// 物料ID
- /////
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
index 1bfc3985..489880e6 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs
@@ -37,11 +37,6 @@ namespace WMS.Web.Domain.Entitys
///
[Column("SerialNumber")]
public string SerialNumber { get; set; }
- /////
- ///// 物料ID
- /////
- //[Column("MaterialId")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
index 56303753..6bae2481 100644
--- a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
@@ -30,11 +30,6 @@ namespace WMS.Web.Domain.Entitys
///
[Column("BoxId")]
public int BoxId { get; set; }
- /////
- ///// 物料ID
- /////
- //[Column("MaterialId")]
- //public int MaterialId { get; set; }
///
/// 物料编码
///
diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
index 93d836ad..092ba4db 100644
--- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
@@ -319,165 +319,6 @@ namespace WMS.Web.Domain.Services
return Result.ReSuccess();
}
- #region 删除代码
- /////
- ///// 出入库回退改箱
- /////
- /////
- /////
- /////
- /////
- //public async Task ChangeBox_BackRecord(BackRecord backRecord, LoginInDto loginInfo, bool isTransaction = true)
- //{
- // if (backRecord.Method == InventoryInOutMethod.Box) return Result.ReSuccess();
- // List dtoList = new List();
- // var boxIds = backRecord.Details.Select(s => s.BoxId).Distinct().ToList();
- // var boxs = await _boxRepositories.GetEntityList(boxIds);
- // foreach (var d in backRecord.Details)
- // {
- // var box = boxs.FirstOrDefault(f => f.Id == d.BoxId);
- // if (box == null) continue;
- // if (backRecord.Type == BackRecordType.InstockOff)
- // box.BackRecordDown(d.MaterialId, d.Qty);
- // else
- // box.BackRecordUp(d.MaterialId, d.Qty);
- // }
- // IDbContextTransaction _transaction = null;
- // if (isTransaction)
- // _transaction = _basbicsRepositories.GetTransaction();
- // Result res_Rollback = Result.ReSuccess();
- // bool isSuccess = true;
- // if (res_Rollback.IsSuccess)
- // {
- // isSuccess = await _boxRepositories.EditEntityList(boxs, false);
- // if (!isSuccess) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
- // }
- // //提交事务
- // if (isTransaction)
- // {
- // isSuccess = _basbicsRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction);
- // if (!res_Rollback.IsSuccess) return res_Rollback;
- // if (!isSuccess)
- // return Result.ReFailure(ResultCodes.DateWriteError);
- // }
- // return Result.ReSuccess();
- //}
- /////
- ///// 非采购入库
- /////
- /////
- /////
- /////
- /////
- //public async Task ChangeBox_InStock(InStock inStock, LoginInDto loginInfo, bool isTransaction = true)
- //{
- // List dtoList = new List();
- // //目标箱
- // var destIds = inStock.Details.GroupBy(g => g.BoxId);
- // var serialNumbers = inStock.Details.SelectMany(s => s.SerialNumbers).ToList();
- // var serialNumberList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
- // foreach (var detail in inStock.Details)
- // {
- // if (detail.Qty == 0) continue;
- // var detailClone = detail.Clone();
- // //处理序列号
- // var sList = serialNumberList.Where(w => detailClone.SerialNumbers.Contains(w.SerialNumber)).ToList();
- // foreach (var s in sList)
- // {
- // //原箱和目标箱一样不处理
- // if (s.BoxId == detailClone.BoxId)
- // {
- // detailClone.Qty = detailClone.Qty - 1;
- // detailClone.SerialNumbers.Remove(s.SerialNumber);
- // continue;
- // }
-
- // var d = dtoList.FirstOrDefault(f => f.DestBoxId == detailClone.BoxId && f.SrcBoxId == s.BoxId);
- // if (d == null)
- // {
- // d = new SaveChangeBoxRecordRequest(s.BoxId, detailClone.BoxId);
- // d.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, 1, s.SerialNumber));
- // }
- // else
- // {
- // var dtoDetail = d.Details.FirstOrDefault(f => f.MaterialId == detailClone.MaterialId);
- // if (dtoDetail == null)
- // d.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, 1, s.SerialNumber));
- // else
- // {
- // dtoDetail.Qty += 1;
- // dtoDetail.SerialNumbers.Add(s.SerialNumber);
- // }
- // }
- // detailClone.Qty = detailClone.Qty - 1;
- // detailClone.SerialNumbers.Remove(s.SerialNumber);
- // }
-
- // //处理非序列号的数据
- // if (detailClone.Qty <= 0) continue;
- // var dto = dtoList.FirstOrDefault(f => f.DestBoxId == detailClone.BoxId && f.SrcBoxId == 0);
- // if (dto == null)
- // {
- // dto = new SaveChangeBoxRecordRequest(0, detailClone.BoxId);
- // dto.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, detailClone.Qty, detailClone.SerialNumbers));
- // }
- // else
- // {
- // var dtoDetail = dto.Details.FirstOrDefault(f => f.MaterialId == detailClone.MaterialId);
- // if (dtoDetail == null)
- // dto.Details.Add(new SaveChangeBoxRecordDetailsRequest(detailClone.MaterialId, detailClone.Qty, detailClone.SerialNumbers));
- // else
- // {
- // dtoDetail.Qty += detailClone.Qty;
- // dtoDetail.SerialNumbers.AddRange(detailClone.SerialNumbers);
- // }
- // }
- // }
-
- // return await ChangeBoxSave(dtoList, loginInfo, isTransaction, false);
- //}
- /////
- ///// 出库
- /////
- /////
- /////
- /////
- //public async Task ChangeBox_OutStock(OutStock outStock, bool isTransaction = true)
- //{
- // if (outStock.Method == InventoryInOutMethod.Box) return Result.ReSuccess();
- // List dtoList = new List();
- // var boxDetails = outStock.Details.SelectMany(s => s.BoxsDetails);
- // var boxIds = boxDetails.Select(s => s.BoxId).Distinct().ToList();
- // var boxs = await _boxRepositories.GetEntityList(boxIds);
- // foreach (var d in outStock.Details)
- // {
- // foreach (var db in d.BoxsDetails)
- // {
- // var box = boxs.FirstOrDefault(f => f.Id == db.BoxId);
- // if (box == null) continue;
- // box.OutStock(d.MaterialId, db.Qty);
- // }
- // }
- // IDbContextTransaction _transaction = null;
- // if (isTransaction)
- // _transaction = _basbicsRepositories.GetTransaction();
- // Result res_Rollback = Result.ReSuccess();
- // bool isSuccess = true;
- // if (res_Rollback.IsSuccess)
- // {
- // isSuccess = await _boxRepositories.EditEntityList(boxs, false);
- // if (!isSuccess) res_Rollback = Result.ReFailure(ResultCodes.DateWriteError);
- // }
- // //提交事务
- // if (isTransaction)
- // {
- // isSuccess = _basbicsRepositories.CommitTransaction(res_Rollback.IsSuccess ? false : true, _transaction);
- // if (!res_Rollback.IsSuccess) return res_Rollback;
- // if (!isSuccess)
- // return Result.ReFailure(ResultCodes.DateWriteError);
- // }
- // return Result.ReSuccess();
- //}
- #endregion
+
}
}
diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index e4186538..48b9d444 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -192,7 +192,6 @@ namespace WMS.Web.Repositories
var material = m.FirstOrDefault();
if (material != null)
{
- //response.MaterialId = material.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, material.MaterialNumber);
response.MaterialNumber = material.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, material.MaterialNumber);
@@ -209,7 +208,6 @@ namespace WMS.Web.Repositories
response.BoxBillNo = entity?.box?.BoxBillNo ?? "";
response.SubStockCode = entity?.boxInventory?.SubStockCode ?? "";
response.SerialNumber = entity.serial.SerialNumber;
- //response.MaterialId = 0;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);