chenjingyong
/
DSWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

出库计划车号逻辑修改

Browse Source
temp
dengyu 1 year ago
parent 9bf410ac19
commit 2bf95e77f0
1 changed files with 69 additions and 46 deletions
Show Stats Download Patch File Download Diff File

103
Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_PLANService.cs
Unescape Escape View File

@ -565,12 +565,15 @@ namespace VOL.WMS.Services
{ {
if (!AddDetailList.Exists(x => x.TRUCKNO != null && x.TRUCKNO != "")) if (!AddDetailList.Exists(x => x.TRUCKNO != null && x.TRUCKNO != ""))
{
if (当前车辆信息List.Count == 1)
{ {
foreach (var item in AddDetailList) foreach (var item in AddDetailList)
{ {
item.TRUCKNO = 当前车辆信息List[0].TRUCKNO; item.TRUCKNO = 当前车辆信息List[0].TRUCKNO;
} }
} }
}
} }
else else
@ -599,13 +602,13 @@ namespace VOL.WMS.Services
OP_WMS_TRUCKRepository.Instance.Add(newrec, true); OP_WMS_TRUCKRepository.Instance.Add(newrec, true);
} }
foreach (var item in AddDetailList) //foreach (var item in AddDetailList)
{ //{
if (item.TRUCKNO == null || item.TRUCKNO == "") // if (item.TRUCKNO == null || item.TRUCKNO == "")
{ // {
item.TRUCKNO = trucknoList[0]; // item.TRUCKNO = trucknoList[0];
} // }
} //}
} }
@ -879,7 +882,6 @@ namespace VOL.WMS.Services
if (当前车辆信息List != null && 当前车辆信息List.Count > 0) if (当前车辆信息List != null && 当前车辆信息List.Count > 0)
{ {
var trucknoList = new List<string>(); var trucknoList = new List<string>();
var currtrucknoList = 当前车辆信息List.Select(s => s.TRUCKNO).Distinct().ToList(); var currtrucknoList = 当前车辆信息List.Select(s => s.TRUCKNO).Distinct().ToList();
@ -894,22 +896,24 @@ namespace VOL.WMS.Services
{ {
trucknoList.Add(item.TRUCKNO); trucknoList.Add(item.TRUCKNO);
} }
if (item.TRUCKNO == null || item.TRUCKNO == "") //if (item.TRUCKNO == null || item.TRUCKNO == "")
{ //{
item.TRUCKNO = truck_0; // item.TRUCKNO = truck_0;
} //}
} }
foreach (var item in UpdDetailList) foreach (var item in UpdDetailList)
{ {
if (!trucknoList.Exists(x => x == item.TRUCKNO && item.TRUCKNO != null && item.TRUCKNO != "")) if (!trucknoList.Exists(x => x == item.TRUCKNO && item.TRUCKNO != null && item.TRUCKNO != ""))
{ {
trucknoList.Add(item.TRUCKNO); trucknoList.Add(item.TRUCKNO);
} }
if (item.TRUCKNO == null || item.TRUCKNO == "") //if (item.TRUCKNO == null || item.TRUCKNO == "")
{ //{
item.TRUCKNO = truck_0; // item.TRUCKNO = truck_0;
} //}
} }
if (trucknoList != null && trucknoList.Count > 0) if (trucknoList != null && trucknoList.Count > 0)
@ -925,19 +929,34 @@ namespace VOL.WMS.Services
OP_WMS_TRUCKRepository.Instance.Add(newrec, true); OP_WMS_TRUCKRepository.Instance.Add(newrec, true);
} }
foreach (var item in AddDetailList) //foreach (var item in AddDetailList)
//{
// if (item.TRUCKNO == null || item.TRUCKNO == "")
// {
// item.TRUCKNO = trucknoList[0];
// }
//}
//foreach (var item in UpdDetailList)
//{
// if (item.TRUCKNO == null || item.TRUCKNO == "")
// {
// item.TRUCKNO = trucknoList[0];
// }
//}
}
if (!AddDetailList.Exists(x => x.TRUCKNO != null && x.TRUCKNO != "") && !UpdDetailList.Exists(x => x.TRUCKNO != null && x.TRUCKNO != ""))
{ {
if (item.TRUCKNO == null || item.TRUCKNO == "") if (当前车辆信息List.Count == 1)
{ {
item.TRUCKNO = trucknoList[0]; foreach (var item in AddDetailList)
} {
item.TRUCKNO = 当前车辆信息List[0].TRUCKNO;
} }
foreach (var item in UpdDetailList) foreach (var item in UpdDetailList)
{ {
if (item.TRUCKNO == null || item.TRUCKNO == "") item.TRUCKNO = 当前车辆信息List[0].TRUCKNO;
{
item.TRUCKNO = trucknoList[0];
} }
} }
} }
@ -974,21 +993,21 @@ namespace VOL.WMS.Services
OP_WMS_TRUCKRepository.Instance.Add(newrec,true); OP_WMS_TRUCKRepository.Instance.Add(newrec,true);
} }
foreach (var item in AddDetailList) //foreach (var item in AddDetailList)
{ //{
if (item.TRUCKNO == null || item.TRUCKNO == "") // if (item.TRUCKNO == null || item.TRUCKNO == "")
{ // {
item.TRUCKNO = trucknoList[0]; // item.TRUCKNO = trucknoList[0];
} // }
} //}
foreach (var item in UpdDetailList) //foreach (var item in UpdDetailList)
{ //{
if (item.TRUCKNO == null || item.TRUCKNO == "") // if (item.TRUCKNO == null || item.TRUCKNO == "")
{ // {
item.TRUCKNO = trucknoList[0]; // item.TRUCKNO = trucknoList[0];
} // }
} //}
} }
} }
@ -1669,9 +1688,13 @@ namespace VOL.WMS.Services
private WebResponseContent PushStatus_Single(Guid WMSPLANID, string execution, string reason) private WebResponseContent PushStatus_Single(Guid WMSPLANID, string execution, string reason)
{ {
//出库计划不使用BILLSTATUS管理 if (execution == "1") {
//推进值1 将委托单位的合同信息展示在出库计划的电子文档中
//寻找往来单位的合同
return _webResponse.OK();
}
//而是使用 BSSTATUS = 1提交审核 0未提交
var _r = new WebResponseContent(); var _r = new WebResponseContent();

Write Preview
Loading…
Cancel
Save