|
@ -13,6 +13,7 @@ using System.Web; |
|
|
using CK.SCP.Models.AppBoxEntity; |
|
|
using CK.SCP.Models.AppBoxEntity; |
|
|
using System.Data.SqlClient; |
|
|
using System.Data.SqlClient; |
|
|
using System.Collections; |
|
|
using System.Collections; |
|
|
|
|
|
using ChangKeTec.Wms.Models.Wms; |
|
|
|
|
|
|
|
|
namespace CK.SCP.Controller |
|
|
namespace CK.SCP.Controller |
|
|
{ |
|
|
{ |
|
@ -639,10 +640,12 @@ namespace CK.SCP.Controller |
|
|
if (p_list.Count > 0) |
|
|
if (p_list.Count > 0) |
|
|
{ |
|
|
{ |
|
|
//var _detail = p_list[0];
|
|
|
//var _detail = p_list[0];
|
|
|
|
|
|
var asklist = p_list.Select(q => q.AskBillNum).ToList(); |
|
|
|
|
|
var arvdetail = db.TB_ARRIVE_DETAIL.Where(p => asklist.Contains(p.Remark) && p.IsDeleted == false && p.State == (int)ArriveState.OK && p.BillType == 3).ToList(); |
|
|
foreach (V_TB_INCOMPLETE_ASK _detail in p_list) |
|
|
foreach (V_TB_INCOMPLETE_ASK _detail in p_list) |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|
var reject = db.TB_ARRIVE_DETAIL.Where(p => p.Remark == _detail.AskBillNum && p.IsDeleted == false && p.State == (int)ArriveState.OK && p.BillType == 3).GroupBy(p => new { p.Remark, p.PoLine, p.PartCode }).Select(p => new { RejectSum = p.Sum(itm => itm.Qty), PoLine = p.Key.PoLine, Remark = p.Key.Remark, PartCode = p.Key.PartCode }); |
|
|
var reject = arvdetail.Where(p => p.Remark == _detail.AskBillNum).GroupBy(p => new { p.Remark, p.PoLine, p.PartCode }).Select(p => new { RejectSum = p.Sum(itm => itm.Qty), PoLine = p.Key.PoLine, Remark = p.Key.Remark, PartCode = p.Key.PartCode }); |
|
|
reject.ToList().ForEach(itm => |
|
|
reject.ToList().ForEach(itm => |
|
|
{ |
|
|
{ |
|
|
if (_detail.AskBillNum == itm.Remark && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) |
|
|
if (_detail.AskBillNum == itm.Remark && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) |
|
@ -1371,7 +1374,7 @@ namespace CK.SCP.Controller |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
_lst.Add(new TA_VEND_PART() |
|
|
_lst.Add(new Models.ScpEntity.TA_VEND_PART() |
|
|
{ |
|
|
{ |
|
|
VendPackQty = _itm.PackQty == 0 ? 1 : _itm.PackQty, |
|
|
VendPackQty = _itm.PackQty == 0 ? 1 : _itm.PackQty, |
|
|
PartCode = _itm.PartCode, |
|
|
PartCode = _itm.PartCode, |
|
|