|
@@ -746,29 +746,36 @@ namespace wms.service.Service
|
|
|
/// 关闭工单
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public bool CloseWorkOrder(CloseWorkOrderRequest reqDto)
|
|
|
+ public SRes CloseWorkOrder(CloseWorkOrderRequest reqDto)
|
|
|
{
|
|
|
- var boxrule = _boxrulerepository.AsQueryable().Where(x => reqDto.listinfo.Any(l => x.DocsNo.Contains(l)) && x.ZXStateCode == 0).ToList();
|
|
|
+ var res = new SRes();
|
|
|
try
|
|
|
{
|
|
|
- if (boxrule.Any())
|
|
|
+ foreach (var item in reqDto.listinfo)
|
|
|
{
|
|
|
- _db.BeginTran();
|
|
|
- _boxrulerepository.UpdateSetColumnsTrue(p => new BillPboxrule()
|
|
|
+ var boxrule = _boxrulerepository.AsQueryable().Where(x => x.DocsNo.Contains(item) && x.ZXStateCode == 0).ToList();
|
|
|
+ if (boxrule.Any())
|
|
|
{
|
|
|
- ZXStateCode = 2,
|
|
|
- Memo = "工单终止,自动停用"
|
|
|
- }, p => boxrule.Any(x => x.Id == p.Id));
|
|
|
- _db.CommitTran();
|
|
|
+ _db.BeginTran();
|
|
|
+ _boxrulerepository.UpdateSetColumnsTrue(p => new BillPboxrule()
|
|
|
+ {
|
|
|
+ ZXStateCode = 2,
|
|
|
+ Memo = "工单终止,自动停用"
|
|
|
+ }, x => x.DocsNo.Contains(item));
|
|
|
+ _db.CommitTran();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
catch (Exception e)
|
|
|
{
|
|
|
_db.RollbackTran();
|
|
|
- return false;
|
|
|
+ res.ResCode = ResponseStatusCodeEnum.DataSaveErr.GetHashCode();
|
|
|
+ res.ResMsg = e.Message;
|
|
|
+ return res;
|
|
|
}
|
|
|
-
|
|
|
- return true;
|
|
|
+ res.ResCode = ResponseStatusCodeEnum.Sucess.GetHashCode();
|
|
|
+ res.ResMsg = ResponseStatusCodeEnum.Sucess.GetDescription();
|
|
|
+ return res;
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -13380,8 +13387,8 @@ namespace wms.service.Service
|
|
|
|
|
|
var tempcells = new List<Tuple<int, int, double>>() {
|
|
|
new Tuple<int, int,double>(1,cellfloor1count,cellfloor1stockcount / (cellfloor1count * 1.0)),
|
|
|
- new Tuple<int, int,double>(2,cellfloor2count,cellfloor2stockcount/ (cellfloor2count * 1.0)),
|
|
|
- new Tuple<int, int,double>(3,cellfloor3count,cellfloor3stockcount/ (cellfloor3count * 1.0)),
|
|
|
+ new Tuple<int, int,double>(2,cellfloor2count,cellfloor2stockcount / (cellfloor2count * 1.0)),
|
|
|
+ new Tuple<int, int,double>(3,cellfloor3count,cellfloor3stockcount / (cellfloor3count * 1.0)),
|
|
|
};
|
|
|
//tempcells = tempcells.OrderByDescending(p => p.Item2).ToList();
|
|
|
tempcells = tempcells.OrderBy(p => p.Item3).ToList();//按照同规则物料少的排序
|