@ -254,11 +254,11 @@ namespace VOL.WMS.Services
/// <summary>
//车辆信息
/// </summary>
public List < WMS_ TRUCK> Table3List { get ; set ; }
public List < VW_ OP_TRUCK_FILE > Table3List { get ; set ; }
public List < INFO_FILES > Table4List { get ; set ; }
public List < VW_OP_TRUCK_FILE > Table5List { get ; set ;
//public List<VW_OP_TRUCK_FILE> Table5List { get; set;
/// <summary>
/// 出库条件
/// </summary>
@ -381,8 +381,10 @@ namespace VOL.WMS.Services
{
//在此操作tableExtra从表信息
List < OP_WMS_OUT_PLAN_DETAIL > PLANDetailList = tableExtra . Table1List ; //.Select(s).ToList();
List < _WMS _TRUCK> TRUCK List = tableExtra . Table3List ;
List < VW_ OP_TRUCK_FILE > TRUCK Info List = tableExtra . Table3List ;
List < OP_WMS_TRUCK > TRUCKList = new List < OP_WMS_TRUCK > ( ) ;
TRUCKList = AutoMapperHelper . MapToList < VW_OP_TRUCK_FILE , OP_WMS_TRUCK > ( TRUCKInfoList ) ;
if ( ! PLANDetailList . isNullorEmpty ( ) )
@ -445,18 +447,19 @@ namespace VOL.WMS.Services
}
List < INFO_FILES > FileList = tableExtra . Table4List ;
if ( ! FileList . isNullorEmpty ( ) )
{
var vw = VW_OP_WMS_OUT_PLANRepository . Instance . FindFirst ( x = > x . WMSPLANID = = head . WMSPLANID ) ;
INFO_FILESService . DealSaveDetail ( FileList , head . WMSPLANID . ToString ( ) , head . WMSNO , "出库通知" , vw . MBLNO , vw . CNTRNO ) ;
}
if ( ! TRUCKList . isNullorEmpty ( ) )
{
var _r = AddTruckFile ( saveDataModel , [ 0 ] , dealedbodylist2 [ 1 ] , FileList , head ) ;
var _r = AddTruckFile ( saveDataModel , TRUCKInfoList , dealedbodylist2 [ 0 ] , dealedbodylist2 [ 1 ] , ref FileList , head ) ;
if ( ! _r . Status ) return _r ;
}
if ( ! FileList . isNullorEmpty ( ) )
{
var vw = VW_OP_WMS_OUT_PLANRepository . Instance . FindFirst ( x = > x . WMSPLANID = = head . WMSPLANID ) ;
INFO_FILESService . DealSaveDetail ( FileList , head . WMSPLANID . ToString ( ) , head . WMSNO , "出库通知" , vw . MBLNO , vw . CNTRNO ) ;
}
List < Op_Wms_Logic > ConditionList = tableExtra . Table6List ;
if ( ! ConditionList . isNullorEmpty ( ) )
@ -646,7 +649,10 @@ namespace VOL.WMS.Services
{
//在此操作tableExtra从表信息
List < OP_WMS_OUT_PLAN_DETAIL > PLANDetailList = tableExtra = = null ? null : tableExtra . Table1List ; //.Select(s).ToList();
List < OP_WMS_TRUCK > TRUCKList = tableExtra = = null ? null : tableExtra . Table3List ;
List < VW_OP_TRUCK_FILE > TRUCKInfoList = tableExtra . Table3List ;
List < OP_WMS_TRUCK > TRUCKList = new List < OP_WMS_TRUCK > ( ) ;
TRUCKList = AutoMapperHelper . MapToList < VW_OP_TRUCK_FILE , OP_WMS_TRUCK > ( TRUCKInfoList ) ;
if ( ! PLANDetailList . isNullorEmpty ( ) )
{
@ -695,19 +701,23 @@ namespace VOL.WMS.Services
List < INFO_FILES > FileList = tableExtra . Table4List ;
if ( ! TRUCKList . isNullorEmpty ( ) )
{
var _r = AddTruckFile ( saveModel , TRUCKInfoList , dealedbodylist2 [ 0 ] , dealedbodylist2 [ 1 ] , ref FileList , head ) ;
if ( ! _r . Status ) return _r ;
}
if ( ! FileList . isNullorEmpty ( ) )
{
var vw = VW_OP_WMS_OUT_PLANRepository . Instance . FindFirst ( x = > x . WMSPLANID = = head . WMSPLANID ) ;
INFO_FILESService . DealSaveDetail ( FileList , head . WMSPLANID . ToString ( ) , head . WMSNO , "出库通知" , vw . MBLNO ) ;
}
if ( ! TRUCKList . isNullorEmpty ( ) )
else
{
var _r = AddTruckFile ( saveModel , dealedbodylist2 [ 0 ] , dealedbodylist2 [ 1 ] , FileList , head ) ;
if ( ! _r . Status ) return _r ;
}
List < Op_Wms_Logic > ConditionList = tableExtra . Table6List ;
@ -785,42 +795,73 @@ namespace VOL.WMS.Services
/// <param name="FileList"></param>
/// <param name="head"></param>
/// <returns></returns>
public WebResponseContent AddTruckFile ( SaveModel saveModel , List < OP_WMS_TRUCK> addTruck , List < OP_WMS_TRUCK > updTruck , List < INFO_FILES > FileList , OP_WMS_OUT_PLAN head )
public WebResponseContent AddTruckFile ( SaveModel saveModel , List < VW_OP_TRUCK_FILE> TruckList , List < OP_WMS_TRUCK > addtrucklist , List < OP_WMS_TRUCK > updtrucklist , ref List < INFO_FILES > FileList , OP_WMS_OUT_PLAN head )
{
TableExtra2 tableExtra2 = saveModel . Extra . ToString ( ) . DeserializeObject < TableExtra2 > ( ) ;
if ( addTruck. Count > 0 | | updTruck . Count > 0 )
if ( TruckList! = null & & TruckList . Count > 0 )
{
UserInfo userInfo = UserContext . Current . UserInfo ;
var TruckList = new List < OP_WMS_TRUCK > ( ) ;
TruckList . AddRange ( addTruck ) ;
TruckList . AddRange ( updTruck ) ;
var currFileList = INFO_FILESRepository . Instance . FindAsIQueryable ( x = > x . PID = = head . WMSPLANID ) . ToList ( ) ;
var addFilelist = new List < INFO_FILES > ( ) ;
var updFilelist = new List < INFO_FILES > ( ) ;
Guid Getgid ( string truckno ) {
if ( addtrucklist . Exists ( x = > x . TRUCKNO = = truckno ) )
{
return addtrucklist . First ( x = > x . TRUCKNO = = truckno ) . GID ;
}
if ( updtrucklist . Exists ( x = > x . TRUCKNO = = truckno ) )
{
return addtrucklist . First ( x = > x . TRUCKNO = = truckno ) . GID ;
}
return new Guid ( ) ;
}
foreach ( var item in TruckList )
{
{
if ( string . IsNullOrWhiteSpace ( item . IMGPATH ) ) continue ;
if ( currFileList ! = null & & currFileList . Count ( ) > 0 & & currFileList . Exists ( x = > x . GID = = item . GID ) )
{
//更新imgpath
var updrec = currFileList . First ( x = > x . GID = = item . GID ) ;
updrec . IMGPATH = item . IMGPATH ;
updFilelist . Add ( updrec ) ;
if ( FileList . Exists ( x = > x . GID = = item . GID ) ) {
FileList . First ( x = > x . GID = = item . GID ) . IMGPATH = item . IMGPATH ;
FileList . First ( x = > x . GID = = item . GID ) . FILENAME = item . TRUCKNO ;
}
}
else if ( addFilelist . Exists ( x = > x . FILENAME = = item . TRUCKNO ) )
{
//什么也不做
} else
{
var newfile = AutoMapperHelper . MapTo < OP_WMS_TRUCK , INFO_FILES > ( item ) ;
var updrec = currFileList . First ( x = > x . GID = = item . GID ) ;
if ( ! string . IsNullOrWhiteSpace ( updrec . IMGPATH ) ) updrec . IMGPATH + = "," ;
updrec . IMGPATH + = item . IMGPATH ;
updFilelist . Add ( updrec ) ;
if ( FileList . Exists ( x = > x . GID = = item . GID ) )
{
FileList . First ( x = > x . GID = = item . GID ) . IMGPATH = item . IMGPATH ;
}
}
else
{
var newfile = AutoMapperHelper . MapTo < VW_OP_TRUCK_FILE , INFO_FILES > ( item ) ;
newfile . GID = item . GID ;
newfile . GID = Getgid ( item . TRUCKNO ) ;
newfile . PID = head . WMSPLANID ;
newfile . FILETYPE = "出库通知" ;
newfile . UPLOADEMPLY = userInfo . UserTrueName ;
@ -828,17 +869,21 @@ namespace VOL.WMS.Services
newfile . MBLNO = saveModel . getValue ( "MBLNO" ) ;
newfile . CNTRNO = saveModel . getValue ( "CNTRNO" ) ;
newfile . FILENAME = item . TRUCKNO ;
addFilel ist. Add ( newfile ) ;
FileL ist. Add ( newfile ) ;
}
}
if ( addFilelist . Count > 0 )
{
INFO_FILESService . DealSaveDetail ( addFilelist , head . WMSPLANID . ToString ( ) , head . WMSNO , "出库通知" ) ;
INFO_FILESRepository . Instance . AddRange ( addFilelist , true ) ;
}
//if (addFilelist.Count > 0)
//{
// INFO_FILESService.DealSaveDetail(addFilelist, head.WMSPLANID.ToString(), head.WMSNO, "出库通知");
// INFO_FILESRepository.Instance.AddRange(addFilelist, true);
//}
//if (updFilelist.Count > 0)
//{
// INFO_FILESRepository.Instance.UpdateRange(updFilelist, true);
//}
}
return _webResponse . OK ( "保存成功" ) ;
@ -1163,86 +1208,86 @@ namespace VOL.WMS.Services
/// </summary>
/// <param name="workKeysModel"></param>
/// <returns></returns>
public WebResponseContent UndoShenHe ( WorkKeysModel workKeysModel
//public WebResponseContent UndoShenHe(WorkKeysModel workKeysModel
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
public override WebResponseContent PushStatus ( object [ ] keys , int execution , string reason )
{
@ -1378,8 +1423,9 @@ namespace VOL.WMS.Services
else
{
var msg = "" ;
if ( outdo_list ! = null & & outdo_list . > 0 )
if ( outdo_list ! = null & & outdo_list . Where( x = > x . BILLSTATUS ! = "1010" ) . ToList ( ) . Count > 0 )
{
msg = "[" + outdo_list [ 0 ] . WMSNO + "]" ;
}
@ -1391,7 +1437,7 @@ namespace VOL.WMS.Services
return _webResponse . OK ( ) ;
}
private WebResponseContent PushStatus_Single ( Guid WMSPLANID , string execution , string reason )
@ -1438,7 +1484,11 @@ namespace VOL.WMS.Services
出 库 计 划 . BSSTATUS = true ;
_webResponse = MakeFee ( 出 库 计 划 ) ;
if ( AppSetting . CompanySetting . COMPANYNAME = = "FEST" )
var 出 库 计 划 审 核 通 过 后 产 生 出 库 执 行 的 公 司 = new List < string > ( ) {
"FEST" , "JGWL"
} ;
if ( 出 库 计 划 审 核 通 过 后 产 生 出 库 执 行 的 公 司 . Contains ( AppSetting . CompanySetting . COMPANYNAME ) )
{
var _r2 = MakeOutDo ( 出 库 计 划 ) ;
if ( ! _r2 . Status ) return _r2 ;
@ -1494,6 +1544,14 @@ namespace VOL.WMS.Services
//删除入库执行时动作 删除入库执行时后台动作
js = repository . ExecuteSqlCommand ( sql ) ;
var outdolist = OP_WMS_OUT_DORepository . Instance . FindAsIQueryable ( x = > x . WMSPLANID = = head . WMSPLANID & & x . BILLSTATUS = = "1010" ) . ToList ( ) ;
if ( outdolist ! = null & & outdolist . Count > 0 )
{
var outdogidlist = outdolist . Select ( s = > s . WMSDOID . ToString ( ) ) . ToArray ( ) ;
OP_WMS_OUT_DOService . Instance . Del ( outdogidlist ) ;
}
Logger . PushStatus_PUB ( "出库通知" , "取消审核：" + head . WMSPLANID ) ;
return _webResponse . OK ( "取消成功。" ) ;
