代码无效引用清理，试压包资料界面看板修改
This commit is contained in:
@@ -4,14 +4,13 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
|
||||
public static class TwInputmasterService
|
||||
{
|
||||
{
|
||||
#region 获取列表
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
@@ -39,8 +38,8 @@ namespace BLL
|
||||
(string.IsNullOrEmpty(table.CusBillCode) || x.CusBillCode.Contains(table.CusBillCode)) &&
|
||||
(string.IsNullOrEmpty(table.WarehouseCode) || x.WarehouseCode.Contains(table.WarehouseCode)) &&
|
||||
(string.IsNullOrEmpty(table.CreateMan) || x.CreateMan.Contains(table.CreateMan)) &&
|
||||
(string.IsNullOrEmpty(table.ReqUnitId) || x.ReqUnitId.Contains(table.ReqUnitId)) &&
|
||||
(table.TypeInt == null || x.TypeInt == table.TypeInt) &&
|
||||
(string.IsNullOrEmpty(table.ReqUnitId) || x.ReqUnitId.Contains(table.ReqUnitId)) &&
|
||||
(table.TypeInt == null || x.TypeInt == table.TypeInt) &&
|
||||
(table.Category == null || x.Category == table.Category) &&
|
||||
(table.State == null || x.State == table.State)
|
||||
select new Model.Tw_InOutMasterOutput
|
||||
@@ -88,36 +87,36 @@ namespace BLL
|
||||
var result = q.Skip(grid1.PageSize * grid1.PageIndex).Take(grid1.PageSize).ToList();
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return from x in result
|
||||
select new Model.Tw_InOutMasterOutput
|
||||
{
|
||||
Id = x.Id,
|
||||
ProjectId = x.ProjectId,
|
||||
CusBillCode = x.CusBillCode,
|
||||
InOutPlanMasterId = x.InOutPlanMasterId,
|
||||
WarehouseCode = x.WarehouseCode,
|
||||
Source = x.Source,
|
||||
TypeInt = x.TypeInt,
|
||||
State = x.State,
|
||||
CreateMan = x.CreateMan,
|
||||
CreateManName = x.CreateManName,
|
||||
CreateDate = x.CreateDate,
|
||||
ReqUnitId = x.ReqUnitId,
|
||||
ReqUnitName = x.ReqUnitName,
|
||||
Category = x.Category,
|
||||
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
|
||||
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
|
||||
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
|
||||
AuditMan = x.AuditMan,
|
||||
AuditManName = x.AuditManName,
|
||||
AuditDate = x.AuditDate,
|
||||
Remark=x.Remark,
|
||||
WarehouseMan = x.WarehouseMan,
|
||||
WarehouseDate = x.WarehouseDate,
|
||||
WarehouseManName= x.WarehouseManName
|
||||
};
|
||||
select new Model.Tw_InOutMasterOutput
|
||||
{
|
||||
Id = x.Id,
|
||||
ProjectId = x.ProjectId,
|
||||
CusBillCode = x.CusBillCode,
|
||||
InOutPlanMasterId = x.InOutPlanMasterId,
|
||||
WarehouseCode = x.WarehouseCode,
|
||||
Source = x.Source,
|
||||
TypeInt = x.TypeInt,
|
||||
State = x.State,
|
||||
CreateMan = x.CreateMan,
|
||||
CreateManName = x.CreateManName,
|
||||
CreateDate = x.CreateDate,
|
||||
ReqUnitId = x.ReqUnitId,
|
||||
ReqUnitName = x.ReqUnitName,
|
||||
Category = x.Category,
|
||||
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
|
||||
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
|
||||
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
|
||||
AuditMan = x.AuditMan,
|
||||
AuditManName = x.AuditManName,
|
||||
AuditDate = x.AuditDate,
|
||||
Remark = x.Remark,
|
||||
WarehouseMan = x.WarehouseMan,
|
||||
WarehouseDate = x.WarehouseDate,
|
||||
WarehouseManName = x.WarehouseManName
|
||||
};
|
||||
}
|
||||
|
||||
public static List<Tw_InOutMasterOutput> GetListData(Model.Tw_InOutMasterOutput table )
|
||||
public static List<Tw_InOutMasterOutput> GetListData(Model.Tw_InOutMasterOutput table)
|
||||
{
|
||||
var q = GetModle(table);
|
||||
Count = q.Count();
|
||||
@@ -128,33 +127,33 @@ namespace BLL
|
||||
var result = q.ToList();
|
||||
// q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
|
||||
return (from x in result
|
||||
select new Model.Tw_InOutMasterOutput
|
||||
{
|
||||
Id = x.Id,
|
||||
ProjectId = x.ProjectId,
|
||||
CusBillCode = x.CusBillCode,
|
||||
InOutPlanMasterId = x.InOutPlanMasterId,
|
||||
WarehouseCode = x.WarehouseCode,
|
||||
Source = x.Source,
|
||||
TypeInt = x.TypeInt,
|
||||
State = x.State,
|
||||
CreateMan = x.CreateMan,
|
||||
CreateManName = x.CreateManName,
|
||||
CreateDate = x.CreateDate,
|
||||
ReqUnitId = x.ReqUnitId,
|
||||
ReqUnitName = x.ReqUnitName,
|
||||
Category = x.Category,
|
||||
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
|
||||
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
|
||||
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
|
||||
AuditMan = x.AuditMan,
|
||||
AuditManName = x.AuditManName,
|
||||
AuditDate = x.AuditDate,
|
||||
Remark = x.Remark,
|
||||
WarehouseMan = x.WarehouseMan,
|
||||
WarehouseDate = x.WarehouseDate,
|
||||
WarehouseManName= x.WarehouseManName
|
||||
}).ToList();
|
||||
select new Model.Tw_InOutMasterOutput
|
||||
{
|
||||
Id = x.Id,
|
||||
ProjectId = x.ProjectId,
|
||||
CusBillCode = x.CusBillCode,
|
||||
InOutPlanMasterId = x.InOutPlanMasterId,
|
||||
WarehouseCode = x.WarehouseCode,
|
||||
Source = x.Source,
|
||||
TypeInt = x.TypeInt,
|
||||
State = x.State,
|
||||
CreateMan = x.CreateMan,
|
||||
CreateManName = x.CreateManName,
|
||||
CreateDate = x.CreateDate,
|
||||
ReqUnitId = x.ReqUnitId,
|
||||
ReqUnitName = x.ReqUnitName,
|
||||
Category = x.Category,
|
||||
CategoryString = TwConst.CategoryMap.FirstOrDefault(y => y.Value == x.Category).Key,
|
||||
TypeString = TwConst.TypeIntMap.FirstOrDefault(y => y.Value == x.TypeInt).Key,
|
||||
StateString = TwConst.StateMap.FirstOrDefault(y => y.Value == x.State).Key,
|
||||
AuditMan = x.AuditMan,
|
||||
AuditManName = x.AuditManName,
|
||||
AuditDate = x.AuditDate,
|
||||
Remark = x.Remark,
|
||||
WarehouseMan = x.WarehouseMan,
|
||||
WarehouseDate = x.WarehouseDate,
|
||||
WarehouseManName = x.WarehouseManName
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -181,16 +180,16 @@ namespace BLL
|
||||
CreateMan = newtable.CreateMan,
|
||||
CreateDate = newtable.CreateDate,
|
||||
ReqUnitId = newtable.ReqUnitId,
|
||||
AuditMan= newtable.AuditMan,
|
||||
AuditMan = newtable.AuditMan,
|
||||
AuditDate = newtable.AuditDate,
|
||||
Remark = newtable.Remark,
|
||||
WarehouseMan= newtable.WarehouseMan,
|
||||
WarehouseMan = newtable.WarehouseMan,
|
||||
WarehouseDate = newtable.WarehouseDate
|
||||
};
|
||||
Funs.DB.Tw_InputMaster.InsertOnSubmit(table);
|
||||
Funs.DB.SubmitChanges();
|
||||
}
|
||||
|
||||
|
||||
public static void Update(Model.Tw_InputMaster newtable)
|
||||
{
|
||||
|
||||
@@ -233,16 +232,16 @@ namespace BLL
|
||||
/// <summary>
|
||||
/// 根据计划单生成入库单
|
||||
/// </summary>
|
||||
public static void GenInMasterByPlanId(string planId, List<Model.Tw_InputDetail> detailLists,string remark)
|
||||
public static void GenInMasterByPlanId(string planId, List<Model.Tw_InputDetail> detailLists, string remark)
|
||||
{
|
||||
//获取计划单
|
||||
var planQueryModel = new Tw_InOutMasterOutput();
|
||||
planQueryModel.Id = planId;
|
||||
var plan = TwInOutplanmasterService.GetListData(planQueryModel).FirstOrDefault();
|
||||
if (plan == null || plan.State!= (int)TwConst.State.已审核)
|
||||
var plan = TwInOutplanmasterService.GetListData(planQueryModel).FirstOrDefault();
|
||||
if (plan == null || plan.State != (int)TwConst.State.已审核)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
//判断是否已经生成过入库单
|
||||
var queryIsExitInMaster = new Tw_InOutMasterOutput();
|
||||
queryIsExitInMaster.InOutPlanMasterId = planId;
|
||||
@@ -269,7 +268,7 @@ namespace BLL
|
||||
ReqUnitId = plan.ReqUnitId,
|
||||
AuditMan = plan.AuditMan,
|
||||
AuditDate = plan.AuditDate,
|
||||
Remark= remark,
|
||||
Remark = remark,
|
||||
WarehouseMan = plan.WarehouseMan,
|
||||
WarehouseDate = plan.WarehouseDate
|
||||
};
|
||||
@@ -292,20 +291,20 @@ namespace BLL
|
||||
TwMaterialstockService.UpdateStockNum(master.ProjectId, detail.MaterialCode, master.WarehouseCode, TwConst.InOutType.入库, detailTable.ActNum);
|
||||
|
||||
}
|
||||
var planTable =TwInOutplanmasterService.GetById(plan.Id);
|
||||
var planTable = TwInOutplanmasterService.GetById(plan.Id);
|
||||
if (planTable != null)
|
||||
{
|
||||
planTable.State = (int)TwConst.State.已完成;
|
||||
TwInOutplanmasterService.Update(planTable);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 根据计划单撤销入库单
|
||||
/// </summary>
|
||||
/// <param name="planId"></param>
|
||||
public static void RevokeGenInMasterByPlanId(string planId)
|
||||
{
|
||||
{
|
||||
//校验计划单状态
|
||||
var plan = TwInOutplanmasterService.GetById(planId);
|
||||
if (plan == null || plan.State != (int)TwConst.State.已完成)
|
||||
@@ -329,7 +328,7 @@ namespace BLL
|
||||
{
|
||||
TwInputdetailService.DeleteById(detail.Id);
|
||||
//撤销入库，即减去库存
|
||||
TwMaterialstockService.UpdateStockNum(master.ProjectId,detail.MaterialCode, master.WarehouseCode,TwConst.InOutType.出库, detail.ActNum);
|
||||
TwMaterialstockService.UpdateStockNum(master.ProjectId, detail.MaterialCode, master.WarehouseCode, TwConst.InOutType.出库, detail.ActNum);
|
||||
}
|
||||
plan.State = (int)TwConst.State.已审核;
|
||||
TwInOutplanmasterService.Update(plan);
|
||||
@@ -347,7 +346,7 @@ namespace BLL
|
||||
{
|
||||
string cusBillCode = "";
|
||||
switch (typeInt)
|
||||
{
|
||||
{
|
||||
case TwConst.TypeInt.退料入库:
|
||||
if (category == TwConst.Category.管段)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user