Browse Source

保存

master
songnan.zhang 3 years ago
parent
commit
9415b9c033
  1. 26
      APP/QMAPP.Web/App_Data/Menu.xml
  2. 105
      APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs
  3. 11
      APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs
  4. 30
      APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs
  5. 3
      APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs
  6. 2
      APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs
  7. 2
      APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs
  8. 12
      APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs
  9. 2
      APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
  10. 738
      APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs
  11. 6
      APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
  12. 2
      APPQ5/QMAPP.FJC.Web/Views/DoorPlankPlan/DoorPlankPlanList.aspx
  13. 208
      APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/AddWholeDoorEdit.aspx
  14. 130
      APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankEditSeq.aspx
  15. 160
      APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanEdit.aspx
  16. 371
      APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanInsert.aspx
  17. 215
      APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanList.aspx
  18. 10
      APPQ5/QMAPP.WinForm/App.config
  19. 2
      APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx
  20. 35
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
  21. 85
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs
  22. 162
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.cs
  23. 183
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx
  24. BIN
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt
  25. 32
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs
  26. 143
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs
  27. 26
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
  28. 134
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx
  29. 27
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs
  30. 20
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs
  31. 168
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx
  32. 20
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.Designer.cs
  33. 144
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.cs
  34. 4
      APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

26
APP/QMAPP.Web/App_Data/Menu.xml

@ -291,21 +291,23 @@
<Action ContorllerName="OrderPlan" ActionName="TemplateExcel" PowerID="CD02020008">下载模板</Action> <Action ContorllerName="OrderPlan" ActionName="TemplateExcel" PowerID="CD02020008">下载模板</Action>
</Actions> </Actions>
</MenuItem>--> </MenuItem>-->
<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理" Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1"> <!--TJDoorPlankPlanPrint DoorPlankPlan-->
<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理" Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
<Actions> <Actions>
<Action ContorllerName="DoorPlankPlan" ActionName="List" PowerID="CD02030001">查询</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02030001">查询</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="Add" PowerID="CD02030002">添加</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02030002">添加</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="AddWholeDoor" PowerID="CD02030003">整车添加</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="AddWholeDoor" PowerID="CD02030003">整车添加</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="Edit" PowerID="CD02030004">修改</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Edit" PowerID="CD02030004">修改</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="EditDoorPlankPlanSeq" PowerID="CD02030011">修改计划顺序号</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="EditDoorPlankPlanSeq" PowerID="CD02030011">修改计划顺序号</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="Insert" PowerID="CD02030005">插单</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Insert" PowerID="CD02030005">插单</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="Delete" PowerID="CD02030006">删除</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Delete" PowerID="CD02030006">删除</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="PutOut" PowerID="CD02030007">发布</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="PutOut" PowerID="CD02030007">发布</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="ImportExcel" PowerID="CD02030008">导入</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ImportExcel" PowerID="CD02030008">导入</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="ExportExcel" PowerID="CD02030009">导出</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
<Action ContorllerName="DoorPlankPlan" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action> <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
</Actions> </Actions>
</MenuItem> </MenuItem>
<MenuItem MenuID="02040000" SystemID="FJC" MenuDes="仪表板计划管理" Action="/DashBoardPlan/List?ORDER_TYPE=DASHBOARD" Target="url" PowerID="CD02040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1"> <MenuItem MenuID="02040000" SystemID="FJC" MenuDes="仪表板计划管理" Action="/DashBoardPlan/List?ORDER_TYPE=DASHBOARD" Target="url" PowerID="CD02040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
<Actions> <Actions>
<Action ContorllerName="DashBoardPlan" ActionName="List" PowerID="CD02040001">查询</Action> <Action ContorllerName="DashBoardPlan" ActionName="List" PowerID="CD02040001">查询</Action>

105
APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs

@ -17,6 +17,7 @@ using QMAPP.FJC.DAL.ProductionPlan;
using QMAPP.FJC.Entity.ProductionPlan; using QMAPP.FJC.Entity.ProductionPlan;
using QMFrameWork.Common.Util; using QMFrameWork.Common.Util;
using QMAPP.FJC.Entity.FileCopy.FIS; using QMAPP.FJC.Entity.FileCopy.FIS;
using QMAPP.FJC.DAL.TianJin;
namespace QMAPP.FJC.BLL.FIS namespace QMAPP.FJC.BLL.FIS
{ {
@ -171,6 +172,7 @@ namespace QMAPP.FJC.BLL.FIS
model.PLANSOURCE = model.PLANSOURCE; model.PLANSOURCE = model.PLANSOURCE;
//int no = new DoorPlankPlanDAL().GetNum(model); //int no = new DoorPlankPlanDAL().GetNum(model);
//model.PLAN_SEQ = model.PLAN_DATE.ToString("yyyyMMdd") + no; //model.PLAN_SEQ = model.PLAN_DATE.ToString("yyyyMMdd") + no;
Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = model.MATERIAL_CODE }); Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = model.MATERIAL_CODE });
model.PBOM_CODE = pbomcode.PBOM_CODE; model.PBOM_CODE = pbomcode.PBOM_CODE;
string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE); string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE);
@ -223,6 +225,109 @@ namespace QMAPP.FJC.BLL.FIS
} }
#endregion #endregion
#region 插入信息
/// <summary>
/// 插入信息(单表)
/// </summary>
/// <param name="">信息</param>
/// <returns>插入行数</returns>
public DataResult<int> TJInsert(OrderPlan model)
{
DataResult<int> result = new DataResult<int>();
//基本信息
try
{
if (model.MATERIAL_CODE.Length <= 8)
{
var listMatral = new TJDoorPlankPlanDAL();
var ListMachine = listMatral.GetListMachine(model.MATERIAL_CODE);
foreach (var Machint in ListMachine)
{
model.PID = Guid.NewGuid().ToString();
model.PLAN_STATE = "0";
model.PLANSOURCE = model.PLANSOURCE;
model.MATERIAL_CODE = Machint.MATERIALNO;
model.MATERIAL_NAME = Machint.MATERIALNAME;
Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = Machint.MATERIALNO });
model.PBOM_CODE = pbomcode.PBOM_CODE;
string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE);
model.WORKCENTER_CODE = workcentercode;
if (model.WORKCENTER_CODE != "")
{
string factory = new FactoryDAL().GetFactoryWithWorkcenter(model.WORKCENTER_CODE);
model.FACTORY_CODE = factory;
}
QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(Machint.MATERIALNO);
//QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE);
model.ROUTE_CODE = routecode != null ? routecode.ROUTE_CODE : "";
model.CREATEUSER = this.LoginUser.UserID;
model.CREATEDATE = DateTime.Now;
model.UPDATEUSER = model.CREATEUSER;
model.UPDATEDATE = model.CREATEDATE;
DoorPlankPlanDAL cmdDAL = new DoorPlankPlanDAL();
FISPlan condition = new FISPlan();
condition.PREFIX = "DP";
condition.DATASTR = model.PLAN_DATE.ToString("yyyyMMdd");
//获取流水号
FISPlan info = this.GetOrderPlanSeq(condition);
//计划单号
model.PLAN_SEQ = info.SEQSTR;
model.PLAN_NO = condition.PREFIX + condition.DATASTR + info.SEQSTR;
result.Result = new DoorPlankPlanDAL().Insert(model);
}
}
else
{
model.PID = Guid.NewGuid().ToString();
model.PLAN_STATE = "0";
model.PLANSOURCE = model.PLANSOURCE;
Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = model.MATERIAL_CODE });
model.PBOM_CODE = pbomcode.PBOM_CODE;
string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE);
model.WORKCENTER_CODE = workcentercode;
if (model.WORKCENTER_CODE != "")
{
string factory = new FactoryDAL().GetFactoryWithWorkcenter(model.WORKCENTER_CODE);
model.FACTORY_CODE = factory;
}
QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE);
//QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE);
model.ROUTE_CODE = routecode != null ? routecode.ROUTE_CODE : "";
model.CREATEUSER = this.LoginUser.UserID;
model.CREATEDATE = DateTime.Now;
model.UPDATEUSER = model.CREATEUSER;
model.UPDATEDATE = model.CREATEDATE;
DoorPlankPlanDAL cmdDAL = new DoorPlankPlanDAL();
FISPlan condition = new FISPlan();
condition.PREFIX = "DP";
condition.DATASTR = model.PLAN_DATE.ToString("yyyyMMdd");
//获取流水号
FISPlan info = this.GetOrderPlanSeq(condition);
//计划单号
model.PLAN_SEQ = info.SEQSTR;
model.PLAN_NO = condition.PREFIX + condition.DATASTR + info.SEQSTR;
result.Result = new DoorPlankPlanDAL().Insert(model);
}
}
catch (Exception ex)
{
LogManager.LogHelper.Error(new LogInfo()
{
ErrorInfo = ex,
Tag = ex.StackTrace,
Info = "信息逻辑层-插入信息!"
});
result.IsSuccess = false;
result.Msg = Resource.SystemException;
throw ex;
}
result.IsSuccess = true;
return result;
}
#endregion
#region 获取流水号信息 #region 获取流水号信息
/// <summary> /// <summary>
/// 获取流水号信息 /// 获取流水号信息

11
APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs

@ -183,12 +183,15 @@ namespace QMAPP.FJC.BLL.TianJin
{ {
Storage info = new StorageDAL().Get(model.ProductCode); Storage info = new StorageDAL().Get(model.ProductCode);
if (info.State == "2")
{
result.IsSuccess = false;
result.Msg = $"条码{model.ProductCode}在{info.UPDATEDATE}已进行过出库操作!";
return result;
}
//基本信息 //基本信息
info.State = "2"; info.State = "2";
info.MATERIALNAME = model.MATERIALNAME;
info.MATERIALCODE = model.MATERIALCODE;
info.CREATEUSER = model.CREATEUSER;
info.CREATEDATE = model.CREATEDATE;
info.UPDATEDATE = DateTime.Now.ToString(); info.UPDATEDATE = DateTime.Now.ToString();
info.UPDATEUSER = this.LoginUser.UserName; info.UPDATEUSER = this.LoginUser.UserName;
int temp = new StorageDAL().Update(info); int temp = new StorageDAL().Update(info);

30
APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs

@ -325,22 +325,30 @@ namespace QMAPP.FJC.BLL.TianJin
//可以删除的订单 //可以删除的订单
List<TJOrderPlan> deleteOrderList = new List<TJOrderPlan>(); List<TJOrderPlan> deleteOrderList = new List<TJOrderPlan>();
if (!string.IsNullOrEmpty(strs))
TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan() { PID = strs }); {
int Num = TJworkOrderDal.GetAllWorkOrder(strs); foreach (var str in strs.Split(':'))
{
TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan() { PID = str });
int Num = TJworkOrderDal.GetAllWorkOrder(str);
if (op.PLAN_STATE == EnumGeter.PLANSTATE.INIT.GetHashCode().ToString() if (op.PLAN_STATE == EnumGeter.PLANSTATE.INIT.GetHashCode().ToString()
|| (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString() && Num == 0)) || (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString() && Num == 0))
{ {
//删除订单 //删除订单
TJOrderPlanDAL.DeleteOrderPlan(op); TJOrderPlanDAL.DeleteOrderPlan(op);
TJworkOrderDal.BatchDeleteByOrderPlan(new TJWorkOrder() { ORDERPLANID = op.PID }); TJworkOrderDal.BatchDeleteByOrderPlan(new TJWorkOrder() { ORDERPLANID = op.PID });
count++;
} }
else else
{ {
result.IsSuccess = false; result.IsSuccess = false;
result.Msg = "只有初始化或是确认生产并且生产数量为0订单可以删除!"; result.Msg = $"只有初始化或是确认生产并且生产数量为0订单可以删除!成功删除{count}条计划!";
return result; return result;
} }
}
}
result.Result = count; result.Result = count;
result.Msg = "订单删除成功!"; result.Msg = "订单删除成功!";
@ -476,9 +484,21 @@ namespace QMAPP.FJC.BLL.TianJin
} }
else else
{ {
var list = "LF,LR,RF,RR".Split(','); var list = "".Split(',');
var dal = new TJDoorPlankPlanDAL(); var dal = new TJDoorPlankPlanDAL();
var MachineList = dal.GetListMachine(info.MATERIAL_CODE); var MachineList = dal.GetListMachine(info.MATERIAL_CODE);
if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "L")
{
list = "LF,LR".Split(',');
}
else if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "R")
{
list = "RF,RR".Split(',');
}
else if (info.MATERIAL_CODE.Length == 6)
{
list = "LF,LR,RF,RR".Split(',');
}
//注入派工单信息 //注入派工单信息
for (int i = 0; i < info.QTY; i++) for (int i = 0; i < info.QTY; i++)
{ {

3
APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs

@ -385,11 +385,10 @@ namespace QMAPP.FJC.DAL.FIS
PID = model.PID; PID = model.PID;
} }
sqlBuilder.AppendLine("SELECT COUNT(*) FROM T_PP_ORDERPLAN "); sqlBuilder.AppendLine("SELECT COUNT(*) FROM T_PP_ORDERPLAN ");
sqlBuilder.AppendLine(" WHERE PID <> @PID AND PLAN_NO=@PLAN_NO"); sqlBuilder.AppendLine($" WHERE PID <> '{model.PID}' AND PLAN_NO=@PLAN_NO");
using (IDataSession session = AppDataFactory.CreateMainSession()) using (IDataSession session = AppDataFactory.CreateMainSession())
{ {
count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(),
new DataParameter("PID", PID),
new DataParameter { ParameterName = "PLAN_NO", Value = model.PLAN_NO })); new DataParameter { ParameterName = "PLAN_NO", Value = model.PLAN_NO }));
} }
return count; return count;

2
APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs

@ -185,7 +185,7 @@ namespace QMAPP.FJC.DAL.ProductionPlan
public List<WorkOrder> GetList(WorkOrder condition) public List<WorkOrder> GetList(WorkOrder condition)
{ {
List<WorkOrder> workOrderList = new List<WorkOrder>(); List<WorkOrder> workOrderList = new List<WorkOrder>();
string sql = "select * from T_PP_WORKORDER WITH(NOLOCK) t where 1=1 "; string sql = "select * from T_PP_WORKORDER WITH(NOLOCK) where 1=1 ";
if (string.IsNullOrEmpty(condition.ORDERPLANID) == false) if (string.IsNullOrEmpty(condition.ORDERPLANID) == false)
{ {
sql += string.Format(" and ORDERPLANID='{0}'",condition.ORDERPLANID); sql += string.Format(" and ORDERPLANID='{0}'",condition.ORDERPLANID);

2
APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs

@ -49,7 +49,7 @@ namespace QMAPP.FJC.DAL.TianJin
{ {
try try
{ {
string sql = "SELECT top1 * FROM [T_AW_Storage] WHERE [ProductCode]=@ProductCode"; string sql = $"SELECT top 1 * FROM [T_AW_Storage] WHERE [ProductCode]= '{materialcode}' ORDER BY CREATEDATE DESC";
List<DataParameter> parameters = new List<DataParameter>(); List<DataParameter> parameters = new List<DataParameter>();
parameters.Add(new DataParameter("ProductCode", materialcode)); parameters.Add(new DataParameter("ProductCode", materialcode));
using (IDataSession session = AppDataFactory.CreateMainSession()) using (IDataSession session = AppDataFactory.CreateMainSession())

12
APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs

@ -1021,6 +1021,18 @@ namespace QMAPP.FJC.DAL.TianJin
string sql = null; string sql = null;
List<DataParameter> parameters = new List<DataParameter>(); List<DataParameter> parameters = new List<DataParameter>();
sql = $"SELECT MATERIAL_NAME as 'MATERIALNAME',MATERIAL_CODE as 'MATERIALNO' FROM [dbo].[T_MD_MATERIAL] where MATERIAL_CODE != '{MaterielCode}' and MATERIAL_TYPE_CODE = (select MATERIAL_TYPE_CODE from [dbo].[T_MD_MATERIAL] where MATERIAL_CODE = '{MaterielCode}') "; sql = $"SELECT MATERIAL_NAME as 'MATERIALNAME',MATERIAL_CODE as 'MATERIALNO' FROM [dbo].[T_MD_MATERIAL] where MATERIAL_CODE != '{MaterielCode}' and MATERIAL_TYPE_CODE = (select MATERIAL_TYPE_CODE from [dbo].[T_MD_MATERIAL] where MATERIAL_CODE = '{MaterielCode}') ";
if (MaterielCode.Substring(MaterielCode.Length - 1, 1) == "L")
{
sql += " AND MATERIAL_NAME LIKE '%左%'";
}
else if (MaterielCode.Substring(MaterielCode.Length - 1, 1) == "R")
{
sql += " AND MATERIAL_NAME LIKE '%右%'";
}
else if (MaterielCode.Length == 6)
{
sql += $" AND MATERIAL_CODE not in ('{MaterielCode}L','{MaterielCode}R')";
}
using (IDataSession session = AppDataFactory.CreateMainSession()) using (IDataSession session = AppDataFactory.CreateMainSession())
{ {
var datatable = session.GetList<Materiel>(sql, parameters.ToArray()).ToList(); var datatable = session.GetList<Materiel>(sql, parameters.ToArray()).ToList();

2
APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs

@ -223,7 +223,7 @@ namespace QMAPP.FJC.DAL.TianJin
} }
if (!string.IsNullOrEmpty(PlantCode)) if (!string.IsNullOrEmpty(PlantCode))
{ {
strSql.Append(string.Format(" AND PLANTNAME='{0}' ", PlantCode)); strSql.Append(string.Format(" AND PLANTNAME like '%{0}%' ", PlantCode));
} }
if (!string.IsNullOrEmpty(Operator)) if (!string.IsNullOrEmpty(Operator))
{ {

738
APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs

@ -0,0 +1,738 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Mvc;
using QMAPP.Common.Web.Controllers;
using QMFrameWork.WebUI.Attribute;
using QMAPP.FJC.Web.Models.FIS;
using QMFrameWork.Data;
using QMAPP.ServicesAgent;
using QMAPP.FJC.Entity.FIS;
using QMAPP.Entity;
using QMFrameWork.WebUI.DataSource;
using QMFrameWork.Common.Serialization;
using System.Data;
using QMAPP.Common.Web.Models;
using QMAPP.FJC.Entity.Basic;
using QMAPP.MD.Entity;
using QMAPP.FJC.BLL.FIS;
namespace QMAPP.FJC.Web.Controllers
{
/// <summary>
/// 门板计划查询
/// 作 者:郭兆福
/// 时 间:2017年09月15日
/// </summary>
public class TJDoorPlankPlanPrintController : QController
{
#region 获取信息
/// <summary>
/// 加载列表
/// </summary>
/// <returns>结果</returns>
[HandleException]
public ActionResult List(bool? callback)
{
string order_type = Request["ORDER_TYPE"];
DoorPlankPlanModel seachModel = new DoorPlankPlanModel();
seachModel.ORDER_TYPE = order_type;
seachModel.PLANTIMESTART = DateTime.Now.Date.AddDays(-10).ToString("yyyy-MM-dd HH:mm:ss");
seachModel.PLANTIMEEND = DateTime.Now.Date.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss");
seachModel.ImmediateSearch = false;
if (callback == true)
TryGetSelectBuffer<DoorPlankPlanModel>(out seachModel);
seachModel.rownumbers = false;
seachModel.url = "/DoorPlankPlan/GetList";
return View("DoorPlankPlanList", seachModel);
}
#endregion
#region 获取列表
/// <summary>
/// 获取列表
/// </summary>
/// <param name="callBack">是否回调</param>
/// <returns>列表</returns>
[HandleException]
public ActionResult GetList(bool? callBack)
{
DoorPlankPlanModel seachModel = null;
DataPage page = null;
ServiceAgent wcfAgent = this.GetServiceAgent();
OrderPlan condition = null;
DataResult<DataPage> pageResult = new DataResult<DataPage>();
try
{
//获取查询对象
seachModel = GetModel<DoorPlankPlanModel>();
#region 获取缓存值
if (callBack != null)
{
TryGetSelectBuffer<DoorPlankPlanModel>(out seachModel);
}
else
{
//保存搜索条件
SetSelectBuffer<DoorPlankPlanModel>(seachModel);
}
#endregion
//获取前台分页设置信息
page = this.GetDataPage(seachModel);
condition = CopyToModel<OrderPlan, DoorPlankPlanModel>(seachModel);
//
//condition.WWWWWW = ((int)QMAPP.FJC.Entity.EnumGeter.ProductType.biaopi).ToString();//默认查询XXXX
#region wcf服务统一接口
pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("DoorPlankPlanBLL_GetList", condition, page);
if (pageResult.IsSuccess == false)
{
SetMessage(pageResult.Msg);
return List(true);
}
DateGridResult<OrderPlan> result = new DateGridResult<OrderPlan>();
result.Total = pageResult.Result.RecordCount;
result.Rows = JsonConvertHelper.GetDeserialize<List<OrderPlan>>(pageResult.Result.Result.ToString());
#endregion
return Content(result.GetJsonSource());
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 编辑
/// <summary>
/// 编辑载入
/// </summary>
/// <returns>处理结果</returns>
[HandleException]
public ActionResult Edit()
{
DoorPlankPlanModel model = new DoorPlankPlanModel();
string ID = Request.Params["PID"];
string TYPE = Request.Params["ORDER_TYPE"];
OrderPlan Entity = new OrderPlan();
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<OrderPlan> result = new DataResult<OrderPlan>();
try
{
if (string.IsNullOrEmpty(ID) == false)
{
//修改获取原数据
Entity.PID = ID;
result = wcfAgent.InvokeServiceFunction<DataResult<OrderPlan>>("DoorPlankPlanBLL_Get", Entity);
if (result.IsSuccess == false)
{
SetMessage(result.Msg);
return View("DoorPlankPlanEdit", model);
}
model = CopyToModel<DoorPlankPlanModel, OrderPlan>(result.Result);
if (model.PLANSOURCE == FJC.Entity.EnumGeter.WORKORDERTYPE.FIS.GetHashCode().ToString())
{
//SetMessage("!");
return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", "无法对FIS计划进行修改编辑!"));
}
}
model.ORDER_TYPE = TYPE;
return View("DoorPlankPlanEdit", model);
}
catch (Exception ex)
{
throw ex;
}
}
/// <summary>
/// 保存
/// </summary>
/// <param name="model"></param>
/// <returns>处理结果</returns>
[HttpPost]
[HandleException]
[ValidateInput(false)]
public ActionResult Save(DoorPlankPlanModel saveModel)
{
OrderPlan Entity = null;
string TYPE = Request.Form["ORDER_TYPE"];
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<int> result = new DataResult<int>();
try
{
Entity = CopyToModel<OrderPlan, DoorPlankPlanModel>(saveModel);
if (string.IsNullOrEmpty(Entity.PID) == true)
{
//新增
Entity.ORDER_TYPE = TYPE;
result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_TJInsert", Entity);
if (result.IsSuccess == false)
{
SetMessage("计划单号已存在!");
return View("DoorPlankPlanEdit", saveModel);
}
}
else
{
//修改
result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_Update", Entity);
if (result.IsSuccess == false)
{
SetMessage(result.Msg);
return View("DoorPlankPlanEdit", saveModel);
}
}
return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
}
catch (Exception ex)
{
throw ex;
}
}
/// <summary>
/// 插单
/// </summary>
/// <returns>处理结果</returns>
[HandleException]
public ActionResult Insert()
{
DoorPlankPlanModel model = new DoorPlankPlanModel();
string ID = Request.Params["PID"];
string TYPE = Request.Params["ORDER_TYPE"];
OrderPlan Entity = new OrderPlan();
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<OrderPlan> result = new DataResult<OrderPlan>();
try
{
if (string.IsNullOrEmpty(ID) == false)
{
//修改获取原数据
Entity.PID = ID;
result = wcfAgent.InvokeServiceFunction<DataResult<OrderPlan>>("DoorPlankPlanBLL_GetFISInsertPos", Entity);
if (result.IsSuccess == false)
{
return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", result.Msg));
}
model = CopyToModel<DoorPlankPlanModel, OrderPlan>(result.Result);
}
model.PID = "";
model.MATERIAL_CODE = "";
model.MATERIAL_NAME = "";
model.ORDER_TYPE = TYPE;
return View("DoorPlankPlanInsert", model);
}
catch (Exception ex)
{
throw ex;
}
}
/// <summary>
/// 保存插单
/// </summary>
/// <param name="model"></param>
/// <returns>处理结果</returns>
[HttpPost]
[HandleException]
[ValidateInput(false)]
public ActionResult SaveInsert(DoorPlankPlanModel saveModel)
{
Material condition = new Material();
OrderPlan Entity = new OrderPlan();
string TYPE = Request.Form["ORDER_TYPE"];
string source = Request.Form["PLANSOURCE"];
DataResult<int> result = new DataResult<int>();
ServiceAgent wcfAgent = this.GetServiceAgent();
string materialcode = "('" + saveModel.MaterialCodes.Replace(";", "','") + "')";
condition.MaterialCodes = materialcode;
List<Material> materiallist = wcfAgent.InvokeServiceFunction<List<Material>>("MaterialBLL_GetMaterialInfoList", condition);
Entity.ORDER_TYPE = TYPE;
Entity.QTY = Convert.ToInt32(saveModel.QTY);
Entity.SHIFT_CODE = saveModel.SHIFT_CODE;
Entity.PLAN_DATE = saveModel.PLAN_DATE;
Entity.PLAN_SEQ = saveModel.PLAN_SEQ;
Entity.PLANSOURCE = source;
var publishrightnow = string.Equals(saveModel.PLAN_STATE, "on");
result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_SaveFISInsert", Entity, materiallist,publishrightnow);
return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
}
#endregion
#region 删除
/// <summary>
/// 删除
/// </summary>
/// <returns>结果</returns>
[HttpPost]
[HandleException]
public ActionResult Delete(OrderPlan model)
{
string selectKey = Request.Form["selectKey"];
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<int> result = new DataResult<int>();
try
{
result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_Delete", selectKey);
if (result.IsSuccess == false)
{
SetMessage(result.Msg);
return List(true);
}
SetMessage(AppResource.DeleteMessage);
return List(true);
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 发布
/// <summary>
/// 发布
/// </summary>
/// <returns></returns>
[HttpPost]
[HandleException]
public ActionResult PutOut(OrderPlan model)
{
string selectKey = Request.Form["selectKey"];
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<int> result = new DataResult<int>();
result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_PutOut", selectKey);
if (result.IsSuccess == false)
{
SetMessage(result.Msg);
return List(true);
}
SetMessage(AppResource.PutOutMessage);
return List(true);
}
#endregion
#region 导出excel
/// <summary>
/// 导出excel
/// </summary>
/// <returns>结果</returns>
[HttpPost]
public ActionResult ExportExcel()
{
DoorPlankPlanModel seachModel = null;
OrderPlan condition = null;
DataTable exportDt = new DataTable();
ServiceAgent wcfAgent = this.GetServiceAgent();
try
{
//获取查询对象
seachModel = GetModel<DoorPlankPlanModel>();
condition = CopyToModel<OrderPlan, DoorPlankPlanModel>(seachModel);
condition.PIDList = Request.Form["selectKey"];
//获取数据
DoorPlankPlanBLL dp = new DoorPlankPlanBLL();
exportDt = dp.GetExportData(condition);
//exportDt = wcfAgent.InvokeServiceFunction<DataTable>("DoorPlankPlanBLL_GetExportData", condition);
//导出
QMFrameWork.WebUI.Util.IEFileTool efTool = new QMFrameWork.WebUI.Util.IEFileTool();
return efTool.GetExcelFileResult("DoorPlankPlanExp", "门板计划信息.xlsx", exportDt);
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 导入excel
/// <summary>
/// 导入excel
/// </summary>
/// <returns>结果</returns>
[HttpPost]
public ActionResult ImportExcel()
{
DataTable dt = null;
List<OrderPlan> list = new List<OrderPlan>();
DataResult<ImportMessage> serviceResult = null;
string fileName = Request.Form["fileName"];
string orderby = Request.Form["ORDER_TYPE"];
ServiceAgent wcfAgent = this.GetServiceAgent();
Materiel materialmodel = new Materiel();
ProduceShift produceshiftmodel = new ProduceShift();
MachineInfo machine = new MachineInfo();
//初始工作中心编号条件
QMAPP.MD.Entity.WorkCell workcell = new QMAPP.MD.Entity.WorkCell();
workcell.WORKCELL_CODE = orderby;
try
{
dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt);
//格式转换
list = QMFrameWork.Common.Util.BindHelper.ConvertToList<OrderPlan>(dt).ToList();
serviceResult = wcfAgent.InvokeServiceFunction<DataResult<ImportMessage>>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell);
if (serviceResult.Ex != null)
{
throw serviceResult.Ex;
}
if (serviceResult.Result.failureNum != 0)
{
foreach (RowError error in serviceResult.Result.Errors)
{
dt.Rows[error.Key - 1]["InfoError"] = error.Value;
}
ImportMessageModel model = new ImportMessageModel();
model.InfoName = "DoorPlankPlanImp";
model.ReturnUrl = "/DoorPlankPlan/List?callBack=true";
model.Message = serviceResult.Result;
model.ErrorDt = dt;
return new MessageOutputController().OutputImportMessage(model);
}
else
{
SetMessage(serviceResult.Msg + ",如下:<br/>"
+ "插入" + serviceResult.Result.insertNum + "条,"
+ "更新" + serviceResult.Result.updateNum + "条"
);
return List(true);
}
}
catch (Exception ex)
{
throw ex;
}
finally
{
System.IO.File.Delete(MvcApplication.TempPath + fileName);
}
}
#endregion
#region 下载模板
/// <summary>
/// 下载导入模板
/// </summary>
/// <returns>结果</returns>
[HttpPost]
public ActionResult GetTemplate()
{
try
{
string path = AppDomain.CurrentDomain.BaseDirectory + "App_Data/Excel/";
string fileName = "DoorPlankPlanImp.xlsx";
return File(path + fileName, "application/vnd.ms-excel", Url.Encode("门板信息导入模板.xlsx"));
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 整车添加
/// <summary>
/// 编辑载入
/// </summary>
/// <returns>处理结果</returns>
[HandleException]
public ActionResult AddWholeDoor()
{
DoorPlankPlanModel model = new DoorPlankPlanModel();
string ID = Request.Params["PID"];
string TYPE = Request.Params["ORDER_TYPE"];
OrderPlan Entity = new OrderPlan();
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<OrderPlan> result = new DataResult<OrderPlan>();
try
{
if (string.IsNullOrEmpty(ID) == false)
{
//修改获取原数据
Entity.PID = ID;
result = wcfAgent.InvokeServiceFunction<DataResult<OrderPlan>>("DoorPlankPlanBLL_Get", Entity);
if (result.IsSuccess == false)
{
SetMessage(result.Msg);
return View("DoorPlankPlanEdit", model);
}
model = CopyToModel<DoorPlankPlanModel, OrderPlan>(result.Result);
}
model.ORDER_TYPE = TYPE;
return View("AddWholeDoorEdit", model);
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 保存整车添加
/// <summary>
/// 保存
/// </summary>
/// <param name="model"></param>
/// <returns>处理结果</returns>
[HttpPost]
[HandleException]
[ValidateInput(false)]
public ActionResult DoorPlanSave(DoorPlankPlanModel saveModel)
{
Material condition = new Material();
OrderPlan Entity = new OrderPlan();
string TYPE = Request.Form["ORDER_TYPE"];
string SetCode = Request.Form["AsmSetCode"];
string source = Request.Form["PLANSOURCE"];
DataResult<int> result = new DataResult<int>();
ServiceAgent wcfAgent = this.GetServiceAgent();
string materialcode = "('" + saveModel.MaterialCodes.Replace(";", "','") + "')";
condition.MaterialCodes = materialcode;
List<Material> materiallist = wcfAgent.InvokeServiceFunction<List<Material>>("MaterialBLL_GetMaterialInfoList", condition);
Entity.ORDER_TYPE = TYPE;
Entity.QTY = Convert.ToInt32(saveModel.QTY);
Entity.SHIFT_CODE = saveModel.SHIFT_CODE;
Entity.PLAN_DATE = saveModel.PLAN_DATE;
Entity.PLANSOURCE = source;
Entity.AsmSetCode = SetCode;
result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_InsertWholeDoor", Entity, materiallist);
return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
}
#endregion
//#region 整车添加物料信息
///// <summary>
///// 编辑载入
///// </summary>
///// <returns>处理结果</returns>
//[HandleException]
//public ActionResult AddMaterial()
//{
// DoorPlankPlanModel model = new DoorPlankPlanModel();
// string ID = Request.Params["PID"];
// string TYPE = Request.Params["ORDER_TYPE"];
// OrderPlan Entity = new OrderPlan();
// ServiceAgent wcfAgent = this.GetServiceAgent();
// DataResult<OrderPlan> result = new DataResult<OrderPlan>();
// try
// {
// model.ORDER_TYPE = TYPE;
// return View("AddMaterialEdit", model);
// }
// catch (Exception ex)
// {
// throw ex;
// }
//}
///// <summary>
///// 保存
///// </summary>
///// <param name="model"></param>
///// <returns>处理结果</returns>
//[HttpPost]
//[HandleException]
//[ValidateInput(false)]
//public ActionResult SaveMaterial(DoorPlankPlanModel saveModel)
//{
// Material condition = new Material();
// ServiceAgent wcfAgent = this.GetServiceAgent();
// condition.MATERIAL_CODE = saveModel.MATERIAL_CODE;
// Material material = wcfAgent.InvokeServiceFunction<Material>("MaterialBLL_GetMaterialInfo", condition);
// if (!string.IsNullOrEmpty(material.PID))
// {
// saveModel.MATERIAL_NAME = material.MATERIAL_NAME;
// saveModel.COLOR = material.COLOR;
// saveModel.HBTYPE = material.HBTYPE;
// return View("AddWholeDoorEdit", saveModel);
// }
// return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
//}
//#endregion
#region 整车添加物料信息
[HandleException]
public ActionResult AddSendDetail(bool? callBack)
{
//实例化服务
ServiceAgent wcfAgent = this.GetServiceAgent();
QMAPP.MD.Web.Models.MaterialModel seachModel = null;
DataResult<DataPage> pageResult = new DataResult<DataPage>();
DataPage page = new DataPage();
string Fisid = Request["MATERIAL_CODE"].ToString();
FISAssembly MaterialAssInfo = wcfAgent.InvokeServiceFunction<FISAssembly>("DoorPlankPlanBLL_GetFISMaterialInfoCD", Fisid);
string materials = "('" + MaterialAssInfo.MESModulFL + "','" + MaterialAssInfo.MESModulFR + "','" + MaterialAssInfo.MESModulRL + "','" + MaterialAssInfo.MESModulRR + "')";
//物料发货明细实体
Material detail = new Material()
{
MaterialCodes = materials,
};
try
{
//获取查询对象
seachModel = GetModel<QMAPP.MD.Web.Models.MaterialModel>();
#region 获取缓存值
if (callBack != null)
{
TryGetSelectBuffer<QMAPP.MD.Web.Models.MaterialModel>(out seachModel);
}
else
{
//保存搜索条件
SetSelectBuffer<QMAPP.MD.Web.Models.MaterialModel>(seachModel);
}
#endregion
//获取前台分页设置信息
page = this.GetDataPage(seachModel);
pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("MaterialBLL_GetList", detail, page);
if (pageResult.IsSuccess == false)
{
SetMessage(pageResult.Msg);
return List(true);
}
DateGridResult<Material> result = new DateGridResult<Material>();
result.Total = pageResult.Result.RecordCount;
result.Rows = JsonConvertHelper.GetDeserialize<List<Material>>(pageResult.Result.Result.ToString());
for (var i = 0; i < result.Total; i++)
{
result.Rows[i].AsmSetCode = MaterialAssInfo.AsmSetCode;
}
return Content(result.GetJsonSource());
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 门板顺序号编辑
/// <summary>
/// 门板顺序号编辑
/// </summary>
/// <returns></returns>
public ActionResult DoorPlankEditSeq()
{
DoorPlankPlanModel model = new DoorPlankPlanModel();
OrderPlan Entity = new OrderPlan();
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<OrderPlan> result = new DataResult<OrderPlan>();
try
{
model = GetModel<DoorPlankPlanModel>();
return View("DoorPlankEditSeq", model);
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 获取编辑系列号列表
/// <summary>
/// 获取编辑系列号列表
/// </summary>
/// <param name="callBack"></param>
/// <returns></returns>
[HandleException]
public ActionResult GetDoorPlankPlanList(bool? callBack)
{
DoorPlankPlanModel seachModel = null;
DataResult<DataPage> pageResult = new DataResult<DataPage>();
DataPage page = new DataPage();
ServiceAgent wcfAgent = this.GetServiceAgent();
OrderPlan condition = new OrderPlan();
try
{
//获取查询对象
seachModel = GetModel<DoorPlankPlanModel>();
condition.PIDList =seachModel.PIDList;
condition.ORDER_TYPE = seachModel.ORDER_TYPE;
#region 获取缓存值
if (callBack != null)
{
TryGetSelectBuffer<DoorPlankPlanModel>(out seachModel);
}
else
{
//保存搜索条件
SetSelectBuffer<DoorPlankPlanModel>(seachModel);
}
#endregion
//获取前台分页设置信息
page = this.GetDataPage(seachModel);
condition = CopyToModel<OrderPlan, DoorPlankPlanModel>(seachModel);
#region wcf服务统一接口
pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("DoorPlankPlanBLL_GetDoorPlankPlanList", condition, page);
if (pageResult.IsSuccess == false)
{
SetMessage(pageResult.Msg);
return List(true);
}
DateGridResult<OrderPlan> result = new DateGridResult<OrderPlan>();
result.Total = pageResult.Result.RecordCount;
result.Rows = JsonConvertHelper.GetDeserialize<List<OrderPlan>>(pageResult.Result.Result.ToString());
#endregion
return Content(result.GetJsonSource());
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
#region 保存顺序号修改
/// <summary>
///
/// </summary>
/// <param name="model"></param>
/// <returns>处理结果</returns>
[HttpPost]
[HandleException]
[ValidateInput(false)]
public ActionResult DoorPlankPlanSeqSave(DoorPlankPlanModel saveModel)
{
OrderPlan entity = new OrderPlan();
ServiceAgent wcfAgent = this.GetServiceAgent();
DataResult<int> result = new DataResult<int>();
entity.PLAN_SEQ = saveModel.PLAN_SEQ;
entity.PIDList = saveModel.PIDList;
entity = CopyToModel<OrderPlan, DoorPlankPlanModel>(saveModel);
//修改
result = wcfAgent.InvokeServiceFunction<DataResult<int>>("DoorPlankPlanBLL_UpdateDoorPlankPlanSeq", entity);
return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge));
}
#endregion
}
}

6
APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj

@ -163,6 +163,7 @@
<Compile Include="Controllers\BomHdrController.cs" /> <Compile Include="Controllers\BomHdrController.cs" />
<Compile Include="Controllers\BarCodeReplacementController.cs" /> <Compile Include="Controllers\BarCodeReplacementController.cs" />
<Compile Include="Controllers\APPConfigController.cs" /> <Compile Include="Controllers\APPConfigController.cs" />
<Compile Include="Controllers\TJDoorPlankPlanPrintController.cs" />
<Compile Include="Controllers\StorageLogController.cs" /> <Compile Include="Controllers\StorageLogController.cs" />
<Compile Include="Controllers\StorageController.cs" /> <Compile Include="Controllers\StorageController.cs" />
<Compile Include="Controllers\BucketMaterialClassController.cs" /> <Compile Include="Controllers\BucketMaterialClassController.cs" />
@ -915,6 +916,11 @@
<Content Include="Views\AppConfig\AppConfigList.aspx" /> <Content Include="Views\AppConfig\AppConfigList.aspx" />
<Content Include="Views\BucketMaterialClass\BucketMaterialClassEdit.aspx" /> <Content Include="Views\BucketMaterialClass\BucketMaterialClassEdit.aspx" />
<Content Include="Views\BucketMaterialClass\BucketMaterialClassList.aspx" /> <Content Include="Views\BucketMaterialClass\BucketMaterialClassList.aspx" />
<Content Include="Views\TJDoorPlankPlanPrint\AddWholeDoorEdit.aspx" />
<Content Include="Views\TJDoorPlankPlanPrint\DoorPlankEditSeq.aspx" />
<Content Include="Views\TJDoorPlankPlanPrint\DoorPlankPlanEdit.aspx" />
<Content Include="Views\TJDoorPlankPlanPrint\DoorPlankPlanInsert.aspx" />
<Content Include="Views\TJDoorPlankPlanPrint\DoorPlankPlanList.aspx" />
<Content Include="Views\StorageLog\StorageLogList.aspx" /> <Content Include="Views\StorageLog\StorageLogList.aspx" />
<Content Include="Views\Storage\StorageList.aspx" /> <Content Include="Views\Storage\StorageList.aspx" />
<Content Include="Views\TJDoorPlankPlan\DoorPlankPlanEdit.aspx" /> <Content Include="Views\TJDoorPlankPlan\DoorPlankPlanEdit.aspx" />

2
APPQ5/QMAPP.FJC.Web/Views/DoorPlankPlan/DoorPlankPlanList.aspx

@ -198,7 +198,7 @@
<tr> <tr>
<td align="center"> <td align="center">
<%=Html.QTButtonSearch("DoorPlankPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButtonSearch("DoorPlankPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%--<%=Html.QTButtonAdd("DoorPlankPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> <%=Html.QTButtonAdd("DoorPlankPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButtonUpdate("DoorPlankPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButtonUpdate("DoorPlankPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%>

208
APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/AddWholeDoorEdit.aspx

@ -0,0 +1,208 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master"
Inherits="System.Web.Mvc.ViewPage<QMAPP.FJC.Web.Models.FIS.DoorPlankPlanModel>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
整车添加门板编辑
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%>
<table id="editTable" cellpadding="0" cellspacing="0">
<tr>
<td>
<table>
<tr>
<th align="right">
<%=Html.QV(p => p.PLAN_DATE)%>
</th>
<td>
<%=Html.QC(p => p.PLAN_DATE)%>
</td>
<th align="right">
<%=Html.QV(p => p.QTY)%>
</th>
<td>
<%=Html.QC(p => p.QTY)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.SHIFT_CODE)%>
</th>
<td>
<%=Html.QC(p => p.SHIFT_CODE)%>
</td>
<th align="right">
<%=Html.QV(p => p.MATERIAL_CODE)%>
</th>
<td>
<%=Html.QC(p => p.MATERIAL_CODE)%>
</td>
</tr>
</table>
</td>
</tr>
</table>
<table id="QDateGrid">
</table>
<%=Html.HiddenFor(p => p.ORDER_TYPE)%>
<%=Html.HiddenFor(p => p.MaterialCodes)%>
<%=Html.HiddenFor(p => p.AsmSetCode)%>
<%=Html.Hidden("PLANSOURCE",1)%>
<%=Html.QPEnd() %>
<script language="javascript" type="text/javascript">
$(function () {
$('#QDateGrid').datagrid({
width: 500,
height: 400,
fit: true,
nowrap: false,
striped: true,
collapsible: false,
pagination: true,
rownumbers: false,
remoteSort: false,
idField: 'MATERIAL_CODE',
columns: [[
{ field: 'MATERIAL_CODE', title: '物料号', align: 'center', width: 190 },
{ field: 'MATERIAL_NAME', title: '物料名称', align: 'center', width: 280 },
{ field: 'HBTYPE', title: '高低配', align: 'center', width: 80 },
{ field: 'COLOR', title: '颜色', align: 'center', width: 80 },
{ field: 'AsmSetCode', title: '前缀', align: 'center', width: 80, hidden:true}
]],
//*************按钮****************************
toolbar: [
//************删除*****************************
{
text: '删除',
iconCls: 'icon-remove',
handler: function ()
{
var selectedRowIds = $('#QDateGrid').datagrid('getSelections');
var len = selectedRowIds.length;
if (len == 0)
{
MSI("提示", "请选择要删除的门板计划信息!");
return false;
} else
{
MSQ("提示", "确定要删除选中的记录吗?", function ()
{
for (var i = 0; i < len; i++)
{
var rowIndex = $('#QDateGrid').datagrid('getRowIndex', selectedRowIds[0]);
$("#QDateGrid").datagrid("deleteRow", rowIndex);
}
})
}
//********************************************
}
}
]
//**********************************************
});
});
//*********************grid画完*************
//*********************物料信息*************
$('#MATERIAL_CODE').combobox({
url: "/Dict/GetFisDoorPlanForCD",
panelHeight: '150',
panelWidth: '370',
editable: 'false',
valueField: 'Id',
textField: 'Name',
onSelect: function () {
var materialcode = $('#MATERIAL_CODE').combobox('getValue');
if (materialcode != "") {
//获取四扇车门信息
$('#QDateGrid').datagrid("loadData", new Array());
var dataInfo = $('#QDateGrid').datagrid('getData');
$.ajax({
url: "/DoorPlankPlan/AddSendDetail",
data: {
'MATERIAL_CODE': $('#MATERIAL_CODE').combobox('getValue')
},
type: "POST",
cache: false,
dataType: "json",
async: false,
success: function (data) {
if (data == null || data == '') {
//alert("!");
MSI("提示", "未查到数据!")
}
else {
for (var i = 0; i < data.total; i++) {
var insertInfo =
{
MATERIAL_CODE: data.rows[i].MATERIAL_CODE,
MATERIAL_NAME: data.rows[i].MATERIAL_NAME,
HBTYPE: data.rows[i].HBTYPE,
COLOR: data.rows[i].COLOR,
AsmSetCode: data.rows[i].AsmSetCode
};
dataInfo.rows.push(insertInfo);
}
$('#QDateGrid').datagrid('loadData', dataInfo);
$('#addMatNoWindow').window('close');
}
}
});
}
else {
// alert("****");
}
}
});
//*********************物料信息结束*************
//********************整车添加保存******************************************
function SaveDoorPlan() {
var plandate = $('#PLAN_DATE').val();
if (plandate == "") {
MSI("提示", "计划日期不能为空!");
return;
}
var reg = /^[0-9]+$/;
var qty = $('#QTY').val();
if (!reg.test(qty)) {
MSI("提示", "计划数量只能输入数字!");
return;
}
var shiftcode = $('#SHIFT_CODE').combobox('getValue');
if (shiftcode == "") {
MSI("提示", "班次信息不能为空!");
return;
}
//Grid表信息
var matData = $('#QDateGrid').datagrid('getData');
//当Grid表存在信息时
if (matData.rows.length > 0) {
var materialCode = "";
for (var i = 0; i < matData.rows.length; i++) {
var materialDetail = matData.rows[i];
materialCode = materialCode + ";" + materialDetail.MATERIAL_CODE;
}
var setcode=matData.rows[0].AsmSetCode;
$('#MaterialCodes').val(materialCode.substring(1));
$('#AsmSetCode').val(setcode);
submitByButton("DoorPlanSave");
}
else {
MSI("提示", "整车添加需要四条物料信息!");
return false;
}
}
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ToolContent" runat="server">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td>
<%=Html.QTButtonSave("DoorPlankPlan", "Save", "return SaveDoorPlan();")%>
<%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%>
</td>
</tr>
</table>
</asp:Content>

130
APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankEditSeq.aspx

@ -0,0 +1,130 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master"
Inherits="System.Web.Mvc.ViewPage<QMAPP.FJC.Web.Models.FIS.DoorPlankPlanModel>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
更新门板计划顺序号
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<%
var editable = true;
%>
<table id="editTable" cellpadding="0" cellspacing="0">
<tr>
<td>
<table>
<tr>
<th align="right">
<span style="color: #FF0000">*</span>顺序号
</th>
<td>
<input class="easyui-validatebox" type="text" id="PLAN_SEQ" name="PLAN_SEQ" value="<%=Model.PLAN_SEQ %>"
<%=editable?"data-options=\"required:true,validType:['number','length[3,3]']\"":"readonly =\"readonly\""%> />
</td>
</tr>
</table>
</td>
</tr>
</table>
<table id="QDateGrid"></table>
<%=Html.QPEnd() %>
<%=Html.Hidden("PIDList")%>
<%=Html.Hidden("ORDER_TYPE")%>
<script language="javascript" type="text/javascript">
$(function () {
$('#QDateGrid').datagrid({
// width: 350,
// height: 300,
fit: true,
nowrap: false,
striped: true,
collapsible: false,
pagination: true,
rownumbers: false,
remoteSort: false,
idField: 'PLAN_NO',
columns: [[
{ field: 'PLAN_NO', title: '计划单号', align: 'center', width: 150 },
{ field: 'PLAN_SEQ', title: '计划顺序号', align: 'center', width: 180 },
{ field: 'MATERIAL_CODE', title: '物料号', align: 'center', width: 150 },
{ field: 'MATERIAL_NAME', title: '物料名称', align: 'center', width: 180 }
]]
});
//******************datagrid画完****************************
$('#QDateGrid').datagrid("loadData", new Array());
var dataInfo = $('#QDateGrid').datagrid('getData');
var type = document.getElementById("ORDER_TYPE").value;
var pids = document.getElementById("PIDList").value;
$.ajax({
url: "/DoorPlankPlan/GetDoorPlankPlanList?PIDList=" + pids + "&ORDER_TYPE=" + type,
type: "POST",
cache: false,
dataType: "json",
async: false,
success: function (data) {
if (data == null || data == '') {
//alert("!");
MSI("提示", "未查到数据!")
}
else {
for (var i = 0; i < data.total; i++) {
var insertInfo = {
PLAN_NO: data.rows[i].PLAN_NO,
PLAN_SEQ: data.rows[i].PLAN_SEQ,
MATERIAL_CODE: data.rows[i].MATERIAL_CODE,
MATERIAL_NAME: data.rows[i].MATERIAL_NAME
};
dataInfo.rows.push(insertInfo);
}
$('#QDateGrid').datagrid('loadData', dataInfo);
}
}
});
//******************填充grid结束**************************
});
//****************function ()结束****************************
//******************保存更新****************************
function SaveDoorPlankPlanSeq() {
if (isValidate() == false) {
return false;
}
//当前页面中,有无条码
var seq = document.getElementById("PLAN_SEQ").value;
if (seq == "") {
MSI("提示", "请填写新的计划顺序号!");
return false;
};
var reg = /^[0-9]+$/;
var netId = $("#PLAN_SEQ").val();
if (!reg.test(netId)) {
MSI("提示", "计划顺序号只能输入数字!");
return;
}
var pids = document.getElementById("PIDList").value;
submitByButton("DoorPlankPlanSeqSave");
}
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ToolContent" runat="server">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td>
<%=Html.QTButtonSave("User", "Save", "return SaveDoorPlankPlanSeq();")%>
<%=Html.QTButtonBack("close", "List", "parent.List(1);parent.closeAppWindow1();return false;")%>
</td>
</tr>
</table>
</asp:Content>

160
APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanEdit.aspx

@ -0,0 +1,160 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master"
Inherits="System.Web.Mvc.ViewPage<QMAPP.FJC.Web.Models.FIS.DoorPlankPlanModel>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
门板订单计划信息编辑
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%>
<%
var editable = false;
if (string.IsNullOrEmpty(Model.PLAN_STATE) || string.Equals(Model.PLAN_STATE, "0"))
{
editable = true;
}
%>
<table id="editTable" cellpadding="0" cellspacing="0">
<tr>
<td>
<table>
<tr>
<th align="right">
<%=Html.QV(p => p.PLAN_DATE)%>
</th>
<td>
<input id="PLAN_DATE" name="PLAN_DATE" value="<%=string.IsNullOrEmpty(Model.PID)?DateTime.Now.ToString("yyyy-MM-dd"):Model.PLAN_DATE.ToString("yyyy-MM-dd HH:mm:ss") %>"
style=" width:200px" type="text" class="easyui-datebox" required="required" <%=editable?"":"readonly =\"readonly\"" %> />
</td>
</tr>
<tr>
<th align="right">
<span style="color: #FF0000">*</span>顺序号
</th>
<td>
<input class="easyui-validatebox" style=" width:196px" type="text" id="PLAN_SEQ" name="PLAN_SEQ" value="<%=Model.PLAN_SEQ %>"
<%=editable?"data-options=\"required:true,validType:['number','length[3,3]']\"":"readonly =\"readonly\""%> />
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.MATERIAL_CODE)%>
</th>
<td>
<%=Html.QC(p => p.MATERIAL_CODE, editable ? null : new { Readonly = "readonly" })%>
<script type="text/javascript" language="javascript">
</script>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.QTY)%>
</th>
<td>
<%=Html.QC(p => p.QTY)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.SHIFT_CODE)%>
</th>
<td>
<%=Html.QC(p => p.SHIFT_CODE)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.PRODUCEREQUIRE)%>
</th>
<td>
<%=Html.QC(p => p.PRODUCEREQUIRE)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.STARTTIME)%>
</th>
<td>
<%=Html.QC(p => p.STARTTIME)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.ENDTIME)%>
</th>
<td>
<%=Html.QC(p => p.ENDTIME)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.REMARK)%>
</th>
<td>
<%=Html.QC(p => p.REMARK)%>
</td>
</tr>
</table>
</td>
</tr>
</table>
<%=Html.HiddenFor(p=>p.PID) %>
<%=Html.HiddenFor(p=>p.WORKCENTER_CODE) %>
<%=Html.HiddenFor(p=>p.CREATEDATE) %>
<%=Html.HiddenFor(p=>p.CREATEUSER) %>
<%=Html.HiddenFor(p=>p.UPDATEDATE)%>
<%=Html.HiddenFor(p=>p.UPDATEUSER) %>
<%=Html.HiddenFor(p=>p.COMPLETE_QTY) %>
<%=Html.HiddenFor(p => p.PLAN_STATE)%>
<%=Html.HiddenFor(p => p.FACTORY_CODE)%>
<%=Html.HiddenFor(p => p.ORDER_TYPE)%>
<%=Html.HiddenFor(p => p.ROUTE_CODE)%>
<%=Html.HiddenFor(p => p.PBOM_CODE)%>
<%=Html.HiddenFor(p => p.PLAN_NO)%>
<%=Html.HiddenFor(p => p.FACTORY_CODE)%>
<%=Html.Hidden("PLANSOURCE",1)%>
<%=Html.QPEnd() %>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ToolContent" runat="server">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td>
<%=Html.QTButtonSave("User", "Save", "return Save();")%>
<%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%>
</td>
</tr>
</table>
<script type="text/javascript">
$(function () {
var type = document.getElementById("ORDER_TYPE").value;
//获取物料下拉数据源
$('#MATERIAL_CODE').combotree({
url: "/Dict/GetFisMaterialTree?ordertype=" + type,
panelHeight: '230',
panelWidth: '470',
});
});
function Save() {
var reg = /^[0-9]+$/;
var netId = $("#QTY").val();
if (!reg.test(netId)) {
MSI("提示", "计划数量只能输入数字。");
return;
}
var starttime = document.getElementById("STARTTIME").value;
var endtime = document.getElementById("ENDTIME").value;
if (starttime == "" || endtime == "") {
alert("请输入以时间为准的时间段!");
return;
}
if (parseDate($("#STARTTIME").val()) > parseDate($("#ENDTIME").val())) {
alert("开始日期不能大于截止时间!");
return;
}
if (isValidate() == false) {
return false;
}
submitByButton("Save");
}
</script>
</asp:Content>

371
APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanInsert.aspx

@ -0,0 +1,371 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master"
Inherits="System.Web.Mvc.ViewPage<QMAPP.FJC.Web.Models.FIS.DoorPlankPlanModel>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
门板插单计划编辑
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%>
<table id="editTable" cellpadding="0" cellspacing="0">
<tr>
<td>
<table>
<tr>
<th align="right">
插单时间
</th>
<td>
<input id="PLAN_DATE" name="PLAN_DATE" value="<%=Model.PLAN_DATE.ToString("yyyy-MM-dd HH:mm:ss") %>"
type="text" class="easyui-datetimebox" required="required" readonly ="readonly" %/>
</td>
</tr>
<tr>
<th align="right">
插单位置
</th>
<td>
<%=Html.QC(p => p.PLAN_SEQ, new { Readonly = "readonly" })%>
</td>
</tr>
<tr>
<th align="right">
插单数量
</th>
<td>
<%=Html.QC(p => p.QTY)%>
</td>
</tr>
<%--<tr>
<th align="right">
即时发布
</th>
<td>
<input name="PLAN_STATE" id="PLAN_STATE" checked="checked" type="checkbox" />
</td>
</tr>--%>
</table>
</td>
</tr>
</table>
<table id="QDateGrid">
</table>
<%=Html.HiddenFor(p => p.ORDER_TYPE)%>
<%=Html.HiddenFor(p => p.MaterialCodes)%>
<%=Html.Hidden("PLANSOURCE",2)%>
<%=Html.QPEnd() %>
<div id="addMatNoWindow" class="easyui-window" title="新增物料信息" iconcls="icon-save"
closed="true" style="width: 400px; height: 300px; padding: 5px;">
<div class="easyui-layout" fit="true">
<div region="center" border="false" style="padding: 10px; background: #fff; border: 1px solid #ccc;">
<table id="Table3">
<tr>
<th align="right">
<%=Html.QV(p => p.MATERIAL_CODE)%>
</th>
<td>
<%=Html.QC(p => p.MATERIAL_CODE)%>
</td>
</tr>
</table>
</div>
<div region="north" border="false" style="text-align: left;">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td>
<%=Html.QTButtonSave("DoorPlankPlan", "TransitSave", "AddMatInfoSave()")%>
<%=Html.QTButtonBack("Home", "Index", "AddMatInfoCancel()")%>
</td>
</tr>
</table>
</div>
</div>
</div>
<script language="javascript" type="text/javascript">
$(function () {
$('#QDateGrid').datagrid({
width: 500,
height: 400,
fit: true,
nowrap: false,
striped: true,
collapsible: false,
pagination: true,
rownumbers: false,
remoteSort: false,
idField: 'MATERIAL_CODE',
columns: [[
{ field: 'MATERIAL_CODE', title: '物料号', align: 'center' },
{ field: 'MATERIAL_NAME', title: '物料名称', align: 'center' },
{ field: 'HBTYPE', title: '高低配', align: 'center' },
{ field: 'COLOR', title: '颜色', align: 'center' },
{ field: 'MATERIAL_TYPE_CODE', title: '物料类型', align: 'center', width: 150, hidden: true }
]],
//*************增加****************************
toolbar: [{
text: '添加',
iconCls: 'icon-add',
handler: function () {
OpenAddMatNo();
}
},
//************删除*****************************
{
text: '删除',
iconCls: 'icon-remove',
handler: function () {
//*******************************************************************
// var selectRow = $('#QDateGrid').datagrid('getSelected');
// //获取选中行的序列
// var rowIndex = $('#QDateGrid').datagrid('getRowIndex', selectRow);
// if (rowIndex == -1) {
// MSI("提示", "请选择要删除的物料信息!");
// return false;
// }
// var dataResultSubmit;
// //删除物料信息
// $('#QDateGrid').datagrid('deleteRow', rowIndex);
//****************************************
var selectedRowIds = $('#QDateGrid').datagrid('getSelections');
var len = selectedRowIds.length;
if (len == 0) {
MSI("提示", "请选择要删除的物料信息!");
return false;
}
for (var i = 0; i < len; i++) {
var rowIndex = $('#QDateGrid').datagrid('getRowIndex', selectedRowIds[0]);
$("#QDateGrid").datagrid("deleteRow", rowIndex);
}
//********************************************
}
}
]
//**********************************************
});
});
//*********************打开新增物料信息界面*************
function OpenAddMatNo() {
$('#addMatNoWindow').window({
title: '新增物料信息',
modal: true,
shadow: false,
closed: true,
left: 250,
top: 30,
width: 280,
closable: true,
minimizable: false,
maximizable: false,
height: 300,
collapsible: false
});
$('#addMatNoWindow').window('open');
//初始化物料信息下拉
//前台Grid表;
var matData = $('#QDateGrid').datagrid('getData');
mattypes = "";
if (matData.rows.length > 0) {
//当Grid表存在信息时,获取第一行物料号(此物料号是为了过滤掉信息),颜色,高低配
//默认选取第一行
var sendplanDetail = matData.rows[0];
var hbtype = sendplanDetail.HBTYPE;
var color = sendplanDetail.COLOR;
if (matData.rows.length > 0) {
var materials = "";
for (var i = 0; i < matData.rows.length; i++) {
var sendplanDetail = matData.rows[i];
materials = materials + ";" + sendplanDetail.MATERIAL_CODE;
mattypes = mattypes + ";" + sendplanDetail.MATERIAL_TYPE_CODE;
}
var materialcode = materials.substring(1)
mattypes = mattypes.substring(1);
};
};
if (matData.rows.length == 4) {
MSI('提示', '最多添加四条物料信息!');
$('#addMatNoWindow').window('close');
};
var type = document.getElementById("ORDER_TYPE").value;
var data1;
$.ajax({
url: "/Dict/GetMaterialDoorPlan?ordertype=" + type + "&color=" + color + "&hbtype=" + hbtype + "&mattypes=" + mattypes,
data: {
'MATERIAL_CODE': $('#MATERIAL_CODE').combobox('getValue')
},
type: "post",
datatype: "json",
success: function (resultdata) {
;
data1 = eval(resultdata);
if (data1.length == 1) {
//$("#PRODUCTLINEID").val(data1[0].ID);
$("#pl").hide();
}
else {
$('#MATERIAL_CODE').combobox({
data: data1,
editable: 'false',
valueField: 'MATERIAL_CODE',
textField: 'MATERIAL_NAME'
});
$("#pl").show();
}
}
});
}
//*********************物料新增界面点击保存事件************************
function AddMatInfoSave() {
//获取物料号
var materialcode = $('#MATERIAL_CODE').combobox('getValue');
if (materialcode == "") {
MSI("提示", "请选择物料信息!");
return false;
};
//前台Grid表信息
var matData = $('#QDateGrid').datagrid('getData');
//当Grid表存在信息时
if (matData.rows.length > 0) {
for (var i = 0; i < matData.rows.length; i++) {
var sendplanDetail = matData.rows[i];
if (sendplanDetail.MATERIAL_CODE == $('#MATERIAL_CODE').combobox('getValue')) {
MSI('提示', '已经添加了物料号为' + $('#MATERIAL_CODE').combobox('getValue') + '的物料信息!');
return false;
}
}
};
var sendDetailID = "";
//编辑界面,异步添加
// if ($('#SENDID').val() != "")
// {
//---------------------------改点CR13------------------------------
//获取是否优先
// var isPriorSendPlanMark = $("#ISPRIORSENDPLANDETAILbool:checked").val();
// if (isPriorSendPlanMark == "true")
// {
// isPriorSendPlanMark = "1";
// } else
// {
// isPriorSendPlanMark = "0";
// }
//------------------------------------------------------------------
//*******************************提交************************************
var dataResultSubmit;
$.ajax({
url: "/DoorPlankPlan/AddSendDetail",
data: {
'MATERIAL_CODE': $('#MATERIAL_CODE').combobox('getValue')
},
type: "GET",
cache: false,
dataType: "json",
async: false,
success: function (data) {
//将后台传递过来的Json串转成对象
dataResultSubmit = eval(data);
}
});
//新增失败时
if (dataResultSubmit.IsSuccess == false) {
MSI("提示", dataResultSubmit.Msg);
return false;
}
//将发货计划ID
//sendDetailID = dataResultSubmit.Result;
materialname = dataResultSubmit.MATERIAL_NAME;
hbtype = dataResultSubmit.HBTYPE;
color = dataResultSubmit.COLOR;
// }
//---------------------------改点CR13------------------------------
//获取是否优先
// var isPriorSendPlanTemp = $("#ISPRIORSENDPLANDETAILbool:checked").val();
// if (isPriorSendPlanTemp == "true") {
// isPriorSendPlanTemp = "是";
// } else {
// isPriorSendPlanTemp = "否";
// }
//------------------------------------------------------------------
//********************************填充数据****************************
matData.rows.push({
MATERIAL_CODE: $('#MATERIAL_CODE').combobox('getValue'),
MATERIAL_NAME: materialname,
HBTYPE: hbtype,
COLOR: color,
MATERIAL_TYPE_CODE: dataResultSubmit.MATERIAL_TYPE_CODE
});
$('#QDateGrid').datagrid('loadData', matData);
//************************保存成功后
// $('#PALLETTYPE').combobox('setValue', '');
// $('#MATID').combobox('setValue', '');
// $('#PLANQUAN').val('0');
// $("#ISPRIORSENDPLANDETAILbool").attr("checked", false);
$('#addMatNoWindow').window('close');
}
//**********************************************************************************
//关闭新增物料号信息
function AddMatInfoCancel() {
$('#addMatNoWindow').window('close');
}
//********************整车添加保存******************************************
function SaveDoorPlan() {
var plandate = $('#PLAN_DATE').val();
var qty = $('#QTY').val();
//var shiftcode = $('#SHIFT_CODE').combobox('getValue');
//Grid表信息
var matData = $('#QDateGrid').datagrid('getData');
//当Grid表存在信息时
if (matData.rows.length >= 1) {
var materialCode = "";
for (var i = 0; i < matData.rows.length; i++) {
var materialDetail = matData.rows[i];
materialCode = materialCode + ";" + materialDetail.MATERIAL_CODE;
}
$('#MaterialCodes').val(materialCode.substring(1));
submitByButton("SaveInsert");
}
else {
MSI("提示", "请至少添加一种生产物料!");
return false;
}
}
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ToolContent" runat="server">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td>
<%=Html.QTButtonSave("DoorPlankPlan", "SaveInsert", "return SaveDoorPlan();")%>
<%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%>
</td>
</tr>
</table>
</asp:Content>

215
APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanList.aspx

@ -0,0 +1,215 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master"
Inherits="System.Web.Mvc.ViewPage<QMAPP.FJC.Web.Models.FIS.DoorPlankPlanModel>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
订单生产计划列表
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<%=Html.QPSeach(110, true)%>
<table id="condiTable">
<tr>
<th align="right">
<%=Html.QV(p => p.PLAN_NO)%>
</th>
<td>
<%=Html.QC(p => p.PLAN_NO)%>
</td>
<th align="right">
<%=Html.QV(p => p.SHIFT_CODE)%>
</th>
<td>
<%=Html.QC(p => p.SHIFT_CODE)%>
</td>
<th align="right">
<%=Html.QV(p => p.MATERIAL_CODE)%>
</th>
<td>
<%=Html.QC(p => p.MATERIAL_CODE)%>
</td>
<th align="right">
<%=Html.QV(p => p.FACTORY_CODE)%>
</th>
<td>
<%=Html.QC(p => p.FACTORY_CODE)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.PLANSOURCE)%>
</th>
<td>
<%=Html.QC(p => p.PLANSOURCE)%>
</td>
<th align="right">
<%=Html.QV(p => p.PLANTIMESTART)%>
</th>
<td>
<%=Html.QC(p => p.PLANTIMESTART)%>
</td>
<th align="right">
<%=Html.QV(p => p.PLANTIMEEND)%>
</th>
<td>
<%=Html.QC(p => p.PLANTIMEEND)%>
</td>
</tr>
</table>
<%=Html.QPEnd()%>
<%=Html.QPList() %>
<%=Html.QDateGrid<QMAPP.FJC.Web.Models.FIS.DoorPlankPlanModel>(Model)%>
<%=Html.QPEnd() %>
<%=Html.Hidden("selectKey")%>
<%=Html.Hidden("fileName")%>
<%=Html.Hidden("ORDER_TYPE")%>
<script language="javascript" type="text/javascript">
$(function () {
var type = document.getElementById("ORDER_TYPE").value;
//获取物料下拉数据源
$('#MATERIAL_CODE').combotree({
url: "/Dict/GetFisMaterialTree?ordertype=" + type,
panelHeight: '250',
panelWidth: '500',
});
List(1);
});
//添加
function Add() {
var type = document.getElementById("ORDER_TYPE").value;
openAppWindow1('信息添加', 'Edit?ORDER_TYPE=' + type, '500', '400');
}
//整车添加
function AddWholeDoor() {
var type = document.getElementById("ORDER_TYPE").value;
openAppWindow1('整车添加门板', 'AddWholeDoor?ORDER_TYPE=' + type, '650', '380');
}
//修改
function Update() {
var ids = getSelectKey();
if (ids == "") {
MSI("提示", "请选择修改记录。");
return;
}
if (ids.indexOf(":") > 0) {
MSI("提示", "每次只能修改一条记录。");
return;
}
document.getElementById("selectKey").value = ids;
var type = document.getElementById("ORDER_TYPE").value;
openAppWindow1('修改', 'Edit?PID=' + ids + "&ORDER_TYPE=" + type, '500', '400');
}
//插单
function Insert() {
var ids = getSelectKey();
if (ids == "") {
MSI("提示", "请选择一条FIS计划作为插单位置。");
return;
}
if (ids.indexOf(":") > 0) {
MSI("提示", "只能选择一条FIS计划作为插单位置。");
return;
}
document.getElementById("selectKey").value = ids;
var type = document.getElementById("ORDER_TYPE").value;
openAppWindow1('插单', 'Insert?PID=' + ids + "&ORDER_TYPE=" + type, '650', '380');
}
//删除
function Delete() {
var ids = getSelectKey();
if (ids == "") {
MSI("错误", "至少选择一条记录");
}
else {
document.getElementById("selectKey").value = ids;
MSQ("提示", "确定要删除选中的记录吗?", function () {
submitByButton("Delete");
})
}
}
//导入
function Import() {
var fileName = window.showModalDialog("/File/UploadFile", "", "dialogHeight: 200px; dialogWidth: 300px; center: Yes; help: Yes;status: Yes;");
if (fileName == null)
return;
document.getElementById("fileName").value = fileName;
//处理等待
submitByButton("ImportExcel");
}
//导出
function Export() {
document.getElementById("selectKey").value = getSelectKey();
submitByButton("ExportExcel");
}
//下载模板
function getTemplate() {
submitByButton("GetTemplate");
}
//查询
function Search() {
var endtime = document.getElementById("PLANTIMEEND").value;
if (parseDate($("#PLANTIMESTART").val()) > parseDate($("#PLANTIMEEND").val()) && endtime != "") {
alert("开始时间不能大于结束时间!");
return;
}
List(1)
}
//发布
function Publish() {
var ids = getSelectKey();
if (ids == "") {
MSI("错误", "至少选择一条记录");
}
else {
document.getElementById("selectKey").value = ids;
MSQ("提示", "确定要发布选中的记录吗?", function () {
submitByButton("PutOut");
})
}
}
//修改计划顺序
function EditDoorPlankPlanSeq() {
var ids = getSelectKey();
if (ids == "") {
MSI("错误", "至少选择一条记录");
return;
}
document.getElementById("selectKey").value = ids;
var type = document.getElementById("ORDER_TYPE").value;
openAppWindow1('修改门板计划顺序号', 'DoorPlankEditSeq?PIDList=' + ids+ "&ORDER_TYPE=" + type, '690', '400');
}
$(function () {
$('#FACTORY_CODE').combobox({
panelWidth: '350'
});
});
</script>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ToolContent" runat="server">
<table cellpadding="0" cellspacing="0">
<tr>
<td align="center">
<%=Html.QTButtonSearch("DoorPlankPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButtonAdd("DoorPlankPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButtonUpdate("DoorPlankPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("insertorder","Insert",QMFrameWork.WebUI.IconCls.add,"Insert()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButtonDelete("DoorPlankPlan", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("publish", "PutOut", "detail", "Publish()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("import", "ImportExcel", QMFrameWork.WebUI.IconCls.undo, "Import()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButton("template", "TemplateExcel", QMFrameWork.WebUI.IconCls.template, "getTemplate()", QMAPP.Common.Web.SystemLimit.isLimt)%>
</td>
</tr>
</table>
</asp:Content>

10
APPQ5/QMAPP.WinForm/App.config

@ -8,7 +8,7 @@
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>--> <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/> <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>--> <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" /> <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
@ -184,13 +184,13 @@
</bindings> </bindings>
<client> <client>
<!--<endpoint address="http://123.56.115.74:8989/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" /> <endpoint address="http://123.56.115.74:8989/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://123.56.115.74:8989/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" /> <endpoint address="http://123.56.115.74:8989/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
<endpoint address="net.tcp://10.111.144.99:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />--> <endpoint address="net.tcp://10.111.144.99:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
<endpoint address="net.tcp://localhost:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" /> <!--<endpoint address="net.tcp://localhost:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
<endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" /> <endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://localhost:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" /> <endpoint address="http://localhost:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />-->
</client> </client>
</system.serviceModel> </system.serviceModel>

2
APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx

@ -5,6 +5,8 @@ VWSEQ String 100
VIN String 100 VIN String 100
PRODNO String 100 PRODNO String 100
CARSETDESCCN String 100 CARSETDESCCN String 100
CP5A String 100
PASTECARDNO String 100 PASTECARDNO String 100
SCANDATE String 100 SCANDATE String 100
PRODUCTCODE String 100 PRODUCTCODE String 100
LINENO String 100

35
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs

@ -16,6 +16,7 @@ using QMAPP.Entity;
using QMAPP.MD.Entity; using QMAPP.MD.Entity;
using QMAPP.FJC.Entity.Basic; using QMAPP.FJC.Entity.Basic;
using QMAPP.FJC.Entity.TianJin; using QMAPP.FJC.Entity.TianJin;
using QMAPP.ServicesAgent;
namespace QMAPP.WinForm.Forms.TianJin namespace QMAPP.WinForm.Forms.TianJin
{ {
@ -48,6 +49,8 @@ namespace QMAPP.WinForm.Forms.TianJin
private string PlaceFirstPositionType = string.Empty; private string PlaceFirstPositionType = string.Empty;
private string _TJFYPrintName = string.Empty; //打印机名称
#endregion #endregion
#region 变量 #region 变量
@ -74,6 +77,8 @@ namespace QMAPP.WinForm.Forms.TianJin
PlaceFirstPositionType = System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionType"].ToString(); PlaceFirstPositionType = System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionType"].ToString();
_barcodeRules = _agent.InvokeServiceFunction<List<BarcodeRules>>("BarcodeRulesBLL_GetListForSend"); _barcodeRules = _agent.InvokeServiceFunction<List<BarcodeRules>>("BarcodeRulesBLL_GetListForSend");
_TJFYPrintName = GetAppConfigValue("FYPrintName"); //查找所有 需要自动填充的工位
} }
#endregion #endregion
@ -1237,7 +1242,7 @@ namespace QMAPP.WinForm.Forms.TianJin
{ {
if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == inputstring) if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == inputstring)
{ {
SetContainerItem(nfindex, false); SetContainerItem(nfindex+1, false);
Alert("该条码已扫描!"); Alert("该条码已扫描!");
txtCode.Text = ""; txtCode.Text = "";
txtCode.Focus(); txtCode.Focus();
@ -1317,7 +1322,7 @@ namespace QMAPP.WinForm.Forms.TianJin
{ {
if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == Code) if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == Code)
{ {
SetContainerItem(nfindex, false); SetContainerItem(nfindex + 1, false);
Alert("该条码已扫描!"); Alert("该条码已扫描!");
txtCode.Text = ""; txtCode.Text = "";
txtCode.Focus(); txtCode.Focus();
@ -1393,7 +1398,7 @@ namespace QMAPP.WinForm.Forms.TianJin
{ {
if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString() == Code) if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString() == Code)
{ {
SetContainerItem(nfindex, false); SetContainerItem(nfindex + 1, false);
Alert("该条码已扫描!"); Alert("该条码已扫描!");
txtCode.Text = ""; txtCode.Text = "";
txtCode.Focus(); txtCode.Focus();
@ -2017,9 +2022,19 @@ namespace QMAPP.WinForm.Forms.TianJin
dt.Rows.Add(ncsdr); dt.Rows.Add(ncsdr);
index++; index++;
} }
if (!string.IsNullOrEmpty(_TJFYPrintName))
{
System.Drawing.Printing.PrintDocument doc = new System.Drawing.Printing.PrintDocument();
doc.PrinterSettings.PrinterName = _TJFYPrintName;
prin.Print(dt, _TJFYPrintName);
lberror.Text = "贴车单已打印";
}
else
{
prin.Print(dt); prin.Print(dt);
//MessageBox.Show("打印成功!");
lberror.Text = "贴车单已打印"; lberror.Text = "贴车单已打印";
}
} }
#endregion #endregion
@ -2320,6 +2335,18 @@ namespace QMAPP.WinForm.Forms.TianJin
return ""; return "";
} }
/// <summary>
/// 查找配置表
/// </summary>
/// <returns></returns>
public string GetAppConfigValue(string pConfigCode)
{
var AppConfig = _agent.InvokeServiceFunction<AppConfig>(B9IPCService.AppConfigBLL_Get.ToString(), pConfigCode);
if (AppConfig != null)
return AppConfig.Value;
else
return null;
}
} }
} }

85
APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs

@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJOutWarehouseForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJOutWarehouseForm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
@ -45,14 +46,16 @@
this.panelSearchTitle = new System.Windows.Forms.Panel(); this.panelSearchTitle = new System.Windows.Forms.Panel();
this.lblSearchTitle = new System.Windows.Forms.Label(); this.lblSearchTitle = new System.Windows.Forms.Label();
this.panelSearch = new System.Windows.Forms.Panel(); this.panelSearch = new System.Windows.Forms.Panel();
this.txtPRODUCTCODE = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.dtpCREATEDATEEND = new DateTimePickerA(); this.dtpCREATEDATEEND = new DateTimePickerA();
this.dtpCREATEDATESTART = new DateTimePickerA(); this.dtpCREATEDATESTART = new DateTimePickerA();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.comINTTYPE = new System.Windows.Forms.ComboBox(); this.comINTTYPE = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.txtPRODUCTCODE = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.pager1 = new QMAPP.WinForm.Controls.Pager();
this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components);
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -65,6 +68,7 @@
this.panelSearchTitle.SuspendLayout(); this.panelSearchTitle.SuspendLayout();
this.panelSearch.SuspendLayout(); this.panelSearch.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
@ -195,23 +199,6 @@
this.panelSearch.Size = new System.Drawing.Size(984, 60); this.panelSearch.Size = new System.Drawing.Size(984, 60);
this.panelSearch.TabIndex = 9; this.panelSearch.TabIndex = 9;
// //
// txtPRODUCTCODE
//
this.txtPRODUCTCODE.Font = new System.Drawing.Font("宋体", 11F);
this.txtPRODUCTCODE.Location = new System.Drawing.Point(78, 18);
this.txtPRODUCTCODE.Name = "txtPRODUCTCODE";
this.txtPRODUCTCODE.Size = new System.Drawing.Size(170, 24);
this.txtPRODUCTCODE.TabIndex = 10;
//
// panel1
//
this.panel1.Controls.Add(this.DGMendRecorder);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 165);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(984, 477);
this.panel1.TabIndex = 10;
//
// dtpCREATEDATEEND // dtpCREATEDATEEND
// //
this.dtpCREATEDATEEND.CustomFormat = " "; this.dtpCREATEDATEEND.CustomFormat = " ";
@ -281,6 +268,59 @@
this.label5.TabIndex = 18; this.label5.TabIndex = 18;
this.label5.Text = "至"; this.label5.Text = "至";
// //
// txtPRODUCTCODE
//
this.txtPRODUCTCODE.Font = new System.Drawing.Font("宋体", 11F);
this.txtPRODUCTCODE.Location = new System.Drawing.Point(78, 18);
this.txtPRODUCTCODE.Name = "txtPRODUCTCODE";
this.txtPRODUCTCODE.Size = new System.Drawing.Size(170, 24);
this.txtPRODUCTCODE.TabIndex = 10;
//
// panel1
//
this.panel1.Controls.Add(this.pager1);
this.panel1.Controls.Add(this.DGMendRecorder);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 165);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(984, 477);
this.panel1.TabIndex = 10;
//
// pager1
//
this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage")));
this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pager1.Location = new System.Drawing.Point(0, 442);
this.pager1.Name = "pager1";
this.pager1.OSearch = null;
this.pager1.Size = new System.Drawing.Size(984, 35);
this.pager1.TabIndex = 7;
this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging);
//
// bindingNavigator1
//
this.bindingNavigator1.AddNewItem = null;
this.bindingNavigator1.AutoSize = false;
this.bindingNavigator1.CanOverflow = false;
this.bindingNavigator1.CountItem = null;
this.bindingNavigator1.CountItemFormat = "";
this.bindingNavigator1.DeleteItem = null;
this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bindingNavigator1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
this.bindingNavigator1.Location = new System.Drawing.Point(0, 0);
this.bindingNavigator1.Margin = new System.Windows.Forms.Padding(0, 0, 33, 0);
this.bindingNavigator1.MoveFirstItem = null;
this.bindingNavigator1.MoveLastItem = null;
this.bindingNavigator1.MoveNextItem = null;
this.bindingNavigator1.MovePreviousItem = null;
this.bindingNavigator1.Name = "bindingNavigator1";
this.bindingNavigator1.PositionItem = null;
this.bindingNavigator1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
this.bindingNavigator1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.bindingNavigator1.Size = new System.Drawing.Size(984, 35);
this.bindingNavigator1.TabIndex = 3;
this.bindingNavigator1.Text = "bindingNavigator1";
//
// 零件号 // 零件号
// //
this..AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this..AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@ -335,7 +375,7 @@
// CreateUser // CreateUser
// //
this.CreateUser.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.CreateUser.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.CreateUser.DataPropertyName = "CREATEUSERNAME"; this.CreateUser.DataPropertyName = "UPDATEUSER";
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F); dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F);
this.CreateUser.DefaultCellStyle = dataGridViewCellStyle6; this.CreateUser.DefaultCellStyle = dataGridViewCellStyle6;
@ -347,7 +387,7 @@
// CREATEDATE // CREATEDATE
// //
this.CREATEDATE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.CREATEDATE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.CREATEDATE.DataPropertyName = "CREATEDATE"; this.CREATEDATE.DataPropertyName = "UPDATEDATE";
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F);
this.CREATEDATE.DefaultCellStyle = dataGridViewCellStyle7; this.CREATEDATE.DefaultCellStyle = dataGridViewCellStyle7;
@ -387,6 +427,7 @@
this.panelSearch.ResumeLayout(false); this.panelSearch.ResumeLayout(false);
this.panelSearch.PerformLayout(); this.panelSearch.PerformLayout();
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@ -409,6 +450,8 @@
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.ComboBox comINTTYPE; private System.Windows.Forms.ComboBox comINTTYPE;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private Controls.Pager pager1;
private System.Windows.Forms.BindingNavigator bindingNavigator1;
private System.Windows.Forms.DataGridViewTextBoxColumn ; private System.Windows.Forms.DataGridViewTextBoxColumn ;
private System.Windows.Forms.DataGridViewTextBoxColumn ; private System.Windows.Forms.DataGridViewTextBoxColumn ;
private System.Windows.Forms.DataGridViewTextBoxColumn ; private System.Windows.Forms.DataGridViewTextBoxColumn ;

162
APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.cs

@ -27,7 +27,7 @@ namespace QMAPP.WinForm.Forms.TianJin
Storage searchModel = new Storage();//查询条件 Storage searchModel = new Storage();//查询条件
Storage product = new Storage(); Storage product = new Storage();
Main main = new Main(); Main main = new Main();
int isValidate = 0;//0:未校验 1:已校验 //int isValidate = 0;//0:未校验 1:已校验
public TJOutWarehouseForm() public TJOutWarehouseForm()
{ {
@ -41,10 +41,18 @@ namespace QMAPP.WinForm.Forms.TianJin
//初始化控件属性 //初始化控件属性
this.DGMendRecorder.AutoGenerateColumns = false; this.DGMendRecorder.AutoGenerateColumns = false;
//出库原因下拉
BasicData basicData = new BasicData();
//comINTTYPE
this.comINTTYPE.DataSource = basicData.GetOutReasonList(true);
this.comINTTYPE.DisplayMember = "OUTREASON_NAME";
this.comINTTYPE.ValueMember = "OUTREASON_CODE";
//初始化分页 //初始化分页
//this.pager1.Init(); this.pager1.Init();
//加载默认查询条件 //加载默认查询条件
SetSearchModel(); SetSearchModel();
BindGirdData();
} }
#endregion #endregion
@ -63,37 +71,14 @@ namespace QMAPP.WinForm.Forms.TianJin
List<Main> listMain = new List<Main>(); List<Main> listMain = new List<Main>();
DataPage dataPage = new DataPage(); DataPage dataPage = new DataPage();
//获取前台分页设置信息 //获取前台分页设置信息
//dataPage = pager1.DataPage; dataPage = pager1.DataPage;
try try
{ {
searchModel.State = "2";
//获取零件信息 //获取零件信息
var result = agent.InvokeServiceFunction<DataResult<DataPage>>("StorageBLL_GetList", searchModel, dataPage); var result = agent.InvokeServiceFunction<DataResult<DataPage>>("StorageBLL_GetList", searchModel, dataPage);
this.DGMendRecorder.DataSource = JsonConvertHelper.GetDeserialize<List<Storage>>(result.Result.Result.ToString());
//本体 this.pager1.DataPage = dataPage;
//if (resultProduct.Result.PRODUCTTYPE == EnumGeter.ProductType.biaopi.GetHashCode().ToString() && resultProduct.Result.USINGSTATE == EnumGeter.USINGSTATE.USING.GetHashCode().ToString())
//{
// Main mainModel = new Main();
// mainModel.EPIDERMISCODE = resultProduct.Result.PRODUCTCODE;
// //获取本体信息
// resultMain = agent.InvokeServiceFunction<DataResult<Main>>(B9IPCService.OutWarehouseBLL_GetMainInfo.ToString(), mainModel);
// if (!resultMain.IsSuccess)
// {
// MessageBox.Show(resultMain.Msg, resultMain.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning);
// }
// else
// {
// mainModel = resultMain.Result;
// //绑定本体信息到列表中
// listMain.Add(resultMain.Result);
// this.DGMendRecorder.DataSource = listMain;
// }
//}
//else
//{
// //绑定零件信息到列表中
// listProduct.Add(resultProduct.Result);
// this.DGMendRecorder.DataSource = listProduct;
//}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -124,61 +109,7 @@ namespace QMAPP.WinForm.Forms.TianJin
/// <param name="e"></param> /// <param name="e"></param>
private void tsbSearch_Click(object sender, EventArgs e) private void tsbSearch_Click(object sender, EventArgs e)
{ {
isValidate = 0; BindGirdData();
//设置查询条件
SetSearchModel();
//查询条件校验
bool issuccess = ExistSearchModel();
DataResult<Product> resultProduct = new DataResult<Product>();
DataResult<Main> resultMain = new DataResult<Main>();
//获取前台分页设置信息
//DataPage dataPage = pager1.DataPage;
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
List<Product> listProduct = new List<Product>();
List<Main> listMain = new List<Main>();
if (issuccess)
{
//this.pager1.Init();
//获取零件信息
resultProduct = agent.InvokeServiceFunction<DataResult<Product>>(B9IPCService.OutWarehouseBLL_GetProductInfo.ToString(), searchModel);
if (!resultProduct.IsSuccess)
{
MessageBox.Show(resultProduct.Msg, resultProduct.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning);
isValidate = 0;
}
else
{
//product = resultProduct.Result;
////本体
//if (product.PRODUCTTYPE == EnumGeter.ProductType.biaopi.GetHashCode().ToString() && product.USINGSTATE == EnumGeter.USINGSTATE.USING.GetHashCode().ToString())
//{
// main.EPIDERMISCODE = product.PRODUCTCODE;
// //获取本体信息
// resultMain = agent.InvokeServiceFunction<DataResult<Main>>(B9IPCService.OutWarehouseBLL_GetMainInfo.ToString(), main);
// if (!resultMain.IsSuccess)
// {
// MessageBox.Show(resultMain.Msg, resultMain.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning);
// isValidate = 0;
// }
// else
// {
// main = resultMain.Result;
// //绑定本体信息到列表中
// listMain.Add(resultMain.Result);
// this.DGMendRecorder.DataSource = listMain;
// isValidate = 1;
// }
//}
//else
//{
// //绑定零件信息到列表中
// listProduct.Add(resultProduct.Result);
// this.DGMendRecorder.DataSource = listProduct;
// isValidate = 1;
//}
}
}
} }
/// <summary> /// <summary>
@ -188,28 +119,12 @@ namespace QMAPP.WinForm.Forms.TianJin
/// <param name="e"></param> /// <param name="e"></param>
private void tsbOutWarehouse_Click(object sender, EventArgs e) private void tsbOutWarehouse_Click(object sender, EventArgs e)
{ {
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); var form = new TJSendCodeForm();
//出库校验 //form.StartPosition = FormStartPosition.CenterScreen;
bool issuccess = ExistOutWarehouse(); form.ShowDialog();
DataResult result = new DataResult(); this.pager1.Init();
if (issuccess)
{
//if (product.PRODUCTTYPE == EnumGeter.ProductType.biaopi.GetHashCode().ToString() && product.USINGSTATE == EnumGeter.USINGSTATE.USING.GetHashCode().ToString())
//{
// //本体
// result = agent.InvokeServiceFunction<DataResult>(B9IPCService.OutWarehouseBLL_MainOutWarehouse.ToString(), main);
//}
//else
//{
// //零件
// result = agent.InvokeServiceFunction<DataResult>(B9IPCService.OutWarehouseBLL_ProductOutWarehouse.ToString(), product);
//}
MessageBox.Show(result.Msg, result.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning);
BindGirdData(); BindGirdData();
isValidate = 0;
this.txtPRODUCTCODE.Text = "";
}
} }
#endregion #endregion
@ -257,42 +172,5 @@ namespace QMAPP.WinForm.Forms.TianJin
TextRenderer.DrawText(e.Graphics, (e.RowIndex + 1).ToString(), new Font("宋体", 12, FontStyle.Bold), rectangle, this.DGMendRecorder.RowHeadersDefaultCellStyle.ForeColor, TextFormatFlags.VerticalCenter | TextFormatFlags.Right); TextRenderer.DrawText(e.Graphics, (e.RowIndex + 1).ToString(), new Font("宋体", 12, FontStyle.Bold), rectangle, this.DGMendRecorder.RowHeadersDefaultCellStyle.ForeColor, TextFormatFlags.VerticalCenter | TextFormatFlags.Right);
} }
#region 查询条件校验
/// <summary>
/// 查询条件校验
/// </summary>
private bool ExistSearchModel()
{
//条码
if (string.IsNullOrEmpty(this.txtPRODUCTCODE.Text.Trim()))
{
MessageBox.Show(Resource1.ProductCodeNullValidate, Resource1.ProductCodeNullValidate, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return false;
}
return true;
}
#endregion
#region 出库校验
/// <summary>
/// 出库校验
/// </summary>
private bool ExistOutWarehouse()
{
//条码
if (string.IsNullOrEmpty(this.txtPRODUCTCODE.Text.Trim()))
{
MessageBox.Show(Resource1.ProductCodeNullValidate, Resource1.ProductCodeNullValidate, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return false;
}
//条码是否已验证
if (isValidate==0)
{
MessageBox.Show(Resource1.ProductCodeValidate, Resource1.ProductCodeValidate, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return false;
}
return true;
}
#endregion
} }
} }

183
APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx

@ -124,90 +124,90 @@
<data name="tsbSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
rkJggg== RK5CYII=
</value> </value>
</data> </data>
<data name="tsbOutWarehouse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbOutWarehouse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -301,6 +301,21 @@
<metadata name="Pid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Pid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="pager1.DataPage" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFJRTUZyYW1lV29yay5EYXRhLkF0dHJpYnV0ZXMsIFZlcnNpb249
MS4zLjMuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBQEAAAAZUU1GcmFtZVdv
cmsuRGF0YS5EYXRhUGFnZQoAAAAaPFBhZ2VJbmRleD5rX19CYWNraW5nRmllbGQZPFBhZ2VTaXplPmtf
X0JhY2tpbmdGaWVsZBo8UGFnZUNvdW50PmtfX0JhY2tpbmdGaWVsZBw8UmVjb3JkQ291bnQ+a19fQmFj
a2luZ0ZpZWxkGDxLZXlOYW1lPmtfX0JhY2tpbmdGaWVsZB88U29ydEV4cHJlc3Npb24+a19fQmFja2lu
Z0ZpZWxkFzxSZXN1bHQ+a19fQmFja2luZ0ZpZWxkGTxDb3VudFNxbD5rX19CYWNraW5nRmllbGQbPElz
UGFyYWxsZWw+a19fQmFja2luZ0ZpZWxkIjxBY2N1cmF0ZVBhcnRpdGlvbj5rX19CYWNraW5nRmllbGQA
AAAAAQECAQAACAgICAEBAgAAAAEAAAAyAAAAAAAAAAAAAAAKCgoKAAAL
</value>
</data>
<metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>127, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value> <value>25</value>
</metadata> </metadata>

BIN
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt

Binary file not shown.

32
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs

@ -100,6 +100,38 @@ namespace DCS.Place
cr = new TJPastCard(); cr = new TJPastCard();
// printdt.TableName = "text"; // printdt.TableName = "text";
cr.PrintOptions.PrinterName = "";
cr.SetDataSource(printdt); //为报表的数据表填充记录
cr.PrintToPrinter(1, false, 0, 1);
}
catch (Exception ex)
{
QMAPP.WinForm.WriteLog.WriteError(ex.Message);
}
finally
{
if (cr != null)
{
cr.Close();
cr.Dispose();
}
}
}
/// <summary>
/// 本地打印--通过名称-选择打印机
/// </summary>
/// <param name="printdt"></param>
/// <param name="PrinterName"></param>
public void Print(DataTable printdt,string PrinterName)
{
TJPastCard cr = null;
try
{
cr = new TJPastCard();
// printdt.TableName = "text";
cr.PrintOptions.PrinterName = PrinterName;
cr.SetDataSource(printdt); //为报表的数据表填充记录 cr.SetDataSource(printdt); //为报表的数据表填充记录
cr.PrintToPrinter(1, false, 0, 1); cr.PrintToPrinter(1, false, 0, 1);
} }

143
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs

@ -29,16 +29,16 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJPrintPlanLabel)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJPrintPlanLabel));
this.dgvPlan = new System.Windows.Forms.DataGridView(); this.dgvPlan = new System.Windows.Forms.DataGridView();
this.dgcOrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dgcOrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -70,6 +70,8 @@
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit();
this.tpContent.SuspendLayout(); this.tpContent.SuspendLayout();
this.tpPlanList.SuspendLayout(); this.tpPlanList.SuspendLayout();
@ -85,14 +87,14 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace; this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dgcOrderNo, this.dgcOrderNo,
@ -109,19 +111,19 @@
this.dgvPlan.Location = new System.Drawing.Point(6, 6); this.dgvPlan.Location = new System.Drawing.Point(6, 6);
this.dgvPlan.Name = "dgvPlan"; this.dgvPlan.Name = "dgvPlan";
this.dgvPlan.ReadOnly = true; this.dgvPlan.ReadOnly = true;
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle19;
dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);
this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle20;
this.dgvPlan.RowTemplate.Height = 23; this.dgvPlan.RowTemplate.Height = 23;
this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvPlan.Size = new System.Drawing.Size(852, 183); this.dgvPlan.Size = new System.Drawing.Size(1350, 183);
this.dgvPlan.TabIndex = 7; this.dgvPlan.TabIndex = 7;
this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint); this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint);
this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged); this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged);
@ -129,8 +131,8 @@
// dgcOrderNo // dgcOrderNo
// //
this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO"; this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO";
dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle2; this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle12;
this.dgcOrderNo.HeaderText = "订单号"; this.dgcOrderNo.HeaderText = "订单号";
this.dgcOrderNo.Name = "dgcOrderNo"; this.dgcOrderNo.Name = "dgcOrderNo";
this.dgcOrderNo.ReadOnly = true; this.dgcOrderNo.ReadOnly = true;
@ -139,8 +141,8 @@
// dgcSeq // dgcSeq
// //
this.dgcSeq.DataPropertyName = "SEQ"; this.dgcSeq.DataPropertyName = "SEQ";
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F); dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 15.75F);
this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle3; this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle13;
this.dgcSeq.HeaderText = "顺序号"; this.dgcSeq.HeaderText = "顺序号";
this.dgcSeq.Name = "dgcSeq"; this.dgcSeq.Name = "dgcSeq";
this.dgcSeq.ReadOnly = true; this.dgcSeq.ReadOnly = true;
@ -149,8 +151,8 @@
// dgcMaterialCode // dgcMaterialCode
// //
this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE"; this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE";
dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F); dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F);
this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle4; this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle14;
this.dgcMaterialCode.HeaderText = "零件号"; this.dgcMaterialCode.HeaderText = "零件号";
this.dgcMaterialCode.Name = "dgcMaterialCode"; this.dgcMaterialCode.Name = "dgcMaterialCode";
this.dgcMaterialCode.ReadOnly = true; this.dgcMaterialCode.ReadOnly = true;
@ -159,8 +161,8 @@
// dgcMaterialName // dgcMaterialName
// //
this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME"; this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME";
dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F); dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F);
this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle5; this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle15;
this.dgcMaterialName.HeaderText = "零件描述"; this.dgcMaterialName.HeaderText = "零件描述";
this.dgcMaterialName.Name = "dgcMaterialName"; this.dgcMaterialName.Name = "dgcMaterialName";
this.dgcMaterialName.ReadOnly = true; this.dgcMaterialName.ReadOnly = true;
@ -168,8 +170,8 @@
// //
// dgcState // dgcState
// //
dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.dgcState.DefaultCellStyle = dataGridViewCellStyle6; this.dgcState.DefaultCellStyle = dataGridViewCellStyle16;
this.dgcState.HeaderText = "工单状态"; this.dgcState.HeaderText = "工单状态";
this.dgcState.MinimumWidth = 80; this.dgcState.MinimumWidth = 80;
this.dgcState.Name = "dgcState"; this.dgcState.Name = "dgcState";
@ -179,8 +181,8 @@
// dgcPlanDate // dgcPlanDate
// //
this.dgcPlanDate.DataPropertyName = "PLAN_DATE"; this.dgcPlanDate.DataPropertyName = "PLAN_DATE";
dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 15.75F);
this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle7; this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle17;
this.dgcPlanDate.HeaderText = "计划日期"; this.dgcPlanDate.HeaderText = "计划日期";
this.dgcPlanDate.Name = "dgcPlanDate"; this.dgcPlanDate.Name = "dgcPlanDate";
this.dgcPlanDate.ReadOnly = true; this.dgcPlanDate.ReadOnly = true;
@ -189,8 +191,8 @@
// dgcShift // dgcShift
// //
this.dgcShift.DataPropertyName = "SHIFT_CODE"; this.dgcShift.DataPropertyName = "SHIFT_CODE";
dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F); dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 15.75F);
this.dgcShift.DefaultCellStyle = dataGridViewCellStyle8; this.dgcShift.DefaultCellStyle = dataGridViewCellStyle18;
this.dgcShift.HeaderText = "计划类型"; this.dgcShift.HeaderText = "计划类型";
this.dgcShift.Name = "dgcShift"; this.dgcShift.Name = "dgcShift";
this.dgcShift.ReadOnly = true; this.dgcShift.ReadOnly = true;
@ -243,7 +245,7 @@
this.tpContent.Location = new System.Drawing.Point(5, 55); this.tpContent.Location = new System.Drawing.Point(5, 55);
this.tpContent.Name = "tpContent"; this.tpContent.Name = "tpContent";
this.tpContent.SelectedIndex = 0; this.tpContent.SelectedIndex = 0;
this.tpContent.Size = new System.Drawing.Size(872, 323); this.tpContent.Size = new System.Drawing.Size(1370, 323);
this.tpContent.TabIndex = 0; this.tpContent.TabIndex = 0;
// //
// tpPlanList // tpPlanList
@ -254,7 +256,7 @@
this.tpPlanList.Location = new System.Drawing.Point(4, 49); this.tpPlanList.Location = new System.Drawing.Point(4, 49);
this.tpPlanList.Name = "tpPlanList"; this.tpPlanList.Name = "tpPlanList";
this.tpPlanList.Padding = new System.Windows.Forms.Padding(3); this.tpPlanList.Padding = new System.Windows.Forms.Padding(3);
this.tpPlanList.Size = new System.Drawing.Size(864, 270); this.tpPlanList.Size = new System.Drawing.Size(1362, 270);
this.tpPlanList.TabIndex = 0; this.tpPlanList.TabIndex = 0;
this.tpPlanList.Text = "计划列表"; this.tpPlanList.Text = "计划列表";
this.tpPlanList.UseVisualStyleBackColor = true; this.tpPlanList.UseVisualStyleBackColor = true;
@ -270,7 +272,7 @@
this.tslblOrderCount}); this.tslblOrderCount});
this.toolStrip1.Location = new System.Drawing.Point(3, 197); this.toolStrip1.Location = new System.Drawing.Point(3, 197);
this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(858, 70); this.toolStrip1.Size = new System.Drawing.Size(1356, 70);
this.toolStrip1.Stretch = true; this.toolStrip1.Stretch = true;
this.toolStrip1.TabIndex = 0; this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1"; this.toolStrip1.Text = "toolStrip1";
@ -366,7 +368,7 @@
"显示全部工单", "显示全部工单",
"隐藏挂起工单", "隐藏挂起工单",
"只看挂起工单"}); "只看挂起工单"});
this.cbPlanFilter.Location = new System.Drawing.Point(351, 66); this.cbPlanFilter.Location = new System.Drawing.Point(849, 66);
this.cbPlanFilter.Name = "cbPlanFilter"; this.cbPlanFilter.Name = "cbPlanFilter";
this.cbPlanFilter.Size = new System.Drawing.Size(175, 33); this.cbPlanFilter.Size = new System.Drawing.Size(175, 33);
this.cbPlanFilter.TabIndex = 2; this.cbPlanFilter.TabIndex = 2;
@ -376,7 +378,7 @@
this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.Location = new System.Drawing.Point(283, 72); this.label10.Location = new System.Drawing.Point(781, 72);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(65, 20); this.label10.Size = new System.Drawing.Size(65, 20);
this.label10.TabIndex = 16; this.label10.TabIndex = 16;
@ -394,7 +396,7 @@
"40", "40",
"50", "50",
"100"}); "100"});
this.cbListRowcount.Location = new System.Drawing.Point(625, 66); this.cbListRowcount.Location = new System.Drawing.Point(1123, 66);
this.cbListRowcount.Name = "cbListRowcount"; this.cbListRowcount.Name = "cbListRowcount";
this.cbListRowcount.Size = new System.Drawing.Size(78, 33); this.cbListRowcount.Size = new System.Drawing.Size(78, 33);
this.cbListRowcount.TabIndex = 3; this.cbListRowcount.TabIndex = 3;
@ -412,7 +414,7 @@
"10s", "10s",
"15s", "15s",
"20s"}); "20s"});
this.cbRefreshRate.Location = new System.Drawing.Point(802, 66); this.cbRefreshRate.Location = new System.Drawing.Point(1300, 66);
this.cbRefreshRate.Name = "cbRefreshRate"; this.cbRefreshRate.Name = "cbRefreshRate";
this.cbRefreshRate.Size = new System.Drawing.Size(66, 33); this.cbRefreshRate.Size = new System.Drawing.Size(66, 33);
this.cbRefreshRate.TabIndex = 4; this.cbRefreshRate.TabIndex = 4;
@ -422,7 +424,7 @@
this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label8.AutoSize = true; this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(529, 72); this.label8.Location = new System.Drawing.Point(1027, 72);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(93, 20); this.label8.Size = new System.Drawing.Size(93, 20);
this.label8.TabIndex = 12; this.label8.TabIndex = 12;
@ -433,7 +435,7 @@
this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label6.AutoSize = true; this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(706, 72); this.label6.Location = new System.Drawing.Point(1204, 72);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(93, 20); this.label6.Size = new System.Drawing.Size(93, 20);
this.label6.TabIndex = 13; this.label6.TabIndex = 13;
@ -445,11 +447,39 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// PrintPlanLabel // comboBox1
//
this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Items.AddRange(new object[] {
"显示全部工单",
"隐藏挂起工单",
"只看挂起工单"});
this.comboBox1.Location = new System.Drawing.Point(595, 64);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(175, 33);
this.comboBox1.TabIndex = 17;
//
// label2
//
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(524, 72);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 20);
this.label2.TabIndex = 18;
this.label2.Text = "门板位置";
//
// TJPrintPlanLabel
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(880, 382); this.ClientSize = new System.Drawing.Size(1378, 382);
this.Controls.Add(this.label2);
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.cbPlanFilter); this.Controls.Add(this.cbPlanFilter);
this.Controls.Add(this.label10); this.Controls.Add(this.label10);
this.Controls.Add(this.cbListRowcount); this.Controls.Add(this.cbListRowcount);
@ -461,7 +491,7 @@
this.Controls.Add(this.tpContent); this.Controls.Add(this.tpContent);
this.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
this.Name = "PrintPlanLabel"; this.Name = "TJPrintPlanLabel";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "门板计划标签打印"; this.Text = "门板计划标签打印";
this.Load += new System.EventHandler(this.PrintPlanLabel_Load); this.Load += new System.EventHandler(this.PrintPlanLabel_Load);
@ -507,6 +537,7 @@
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Label label2;
} }
} }

26
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs

@ -429,37 +429,31 @@ namespace QMAPP.WinForm.Forms.TianJin
} }
tsbPrint.Enabled = false; tsbPrint.Enabled = false;
var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem; var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem;
var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem;
var orders = new List<FJC.Entity.ProductionPlan.WorkOrder>(); var orders = new List<FJC.Entity.ProductionPlan.WorkOrder>();
orders.Add(order1); orders.Add(order1);
//if (string.Equals(order1.SEQ, order2.SEQ))
//{
// orders.Add(order2);
//}
List<LabelData> labels = new List<LabelData>(); List<LabelData> labels = new List<LabelData>();
foreach (var order in orders)
{
var data = DateTime.Now.ToString("yyyyMMddHHmmssfff"); var data = DateTime.Now.ToString("yyyyMMddHHmmssfff");
data = data.Substring(2, data.Length - 2);
//var codematch = System.Text.RegularExpressions.Regex.Match(order.PBOM_CODE, "_[LR][FR]_"); //var codematch = System.Text.RegularExpressions.Regex.Match(order.PBOM_CODE, "_[LR][FR]_");
string positioncode = GetNameCode(order.MATERIAL_NAME); string positioncode = GetNameCode(orders[0].MATERIAL_NAME);
var book = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetFisPhraseBook", order.MATERIAL_CODE + "", positioncode); var book = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetFisPhraseBook", orders[0].MATERIAL_CODE + "", positioncode);
LabelData labeldata = new LabelData(); LabelData labeldata = new LabelData();
labeldata.MATERIALCODE = order.MATERIAL_CODE; labeldata.MATERIALCODE = orders[0].MATERIAL_CODE;
labeldata.PlanDate = order.PLAN_DATE; labeldata.PlanDate = orders[0].PLAN_DATE;
if (book != null) if (book != null)
{ {
labeldata.Class = " " + book.Class.Substring(0, 2); labeldata.Class = " " + book.Class.Substring(0, 2);
labeldata.Description = book.Text; labeldata.Description = book.Text;
labeldata.OrderNo = book.CarModel + positioncode + data; labeldata.OrderNo = book.CarModel + positioncode + data;
} }
var mcresult = _agent.InvokeServiceFunction<DataResult<Material>>("MaterialBLL_Get", new Material { MATERIAL_CODE = order.MATERIAL_CODE }); var mcresult = _agent.InvokeServiceFunction<DataResult<Material>>("MaterialBLL_Get", new Material { MATERIAL_CODE = orders[0].MATERIAL_CODE });
var material = mcresult.IsSuccess ? mcresult.Result : null; var material = mcresult.IsSuccess ? mcresult.Result : null;
if (material != null) if (material != null)
{ {
@ -467,14 +461,12 @@ namespace QMAPP.WinForm.Forms.TianJin
labeldata.CarModel = material.PROJECTCODE; labeldata.CarModel = material.PROJECTCODE;
} }
labels.Add(labeldata); labels.Add(labeldata);
}
PrintLabel(labels); PrintLabel(labels);
//变更打印状态 0=>1 //变更打印状态 0=>1
foreach (var order in orders) _agent.InvokeServiceFunction<int>("WorkOrderBLL_SetOrderPrinted", orders[0].PID);
{
//agent.InvokeServiceFunction<int>("WorkOrderBLL_SetOrderPrinted", order.PID);
}
BindPlanView(); BindPlanView();
tsbPrint.Enabled = true; tsbPrint.Enabled = true;
} }

134
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx

@ -153,76 +153,78 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tsbPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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 Ae6xxmll7eSUAAAAAElFTkSuQmCC
RK5CYII=
</value> </value>
</data> </data>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

27
APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs

@ -53,7 +53,6 @@
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.DGView = new System.Windows.Forms.DataGridView(); this.DGView = new System.Windows.Forms.DataGridView();
this.pager1 = new QMAPP.WinForm.Controls.Pager();
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -61,6 +60,7 @@
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
this. = new System.Windows.Forms.DataGridViewTextBoxColumn(); this. = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Pid = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Pid = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pager1 = new QMAPP.WinForm.Controls.Pager();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
this.panelSearchTitle.SuspendLayout(); this.panelSearchTitle.SuspendLayout();
this.panelSearch.SuspendLayout(); this.panelSearch.SuspendLayout();
@ -282,17 +282,6 @@
this.DGView.TabIndex = 4; this.DGView.TabIndex = 4;
this.DGView.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DGView_RowPostPaint); this.DGView.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DGView_RowPostPaint);
// //
// pager1
//
this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage")));
this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pager1.Location = new System.Drawing.Point(0, 607);
this.pager1.Name = "pager1";
this.pager1.OSearch = null;
this.pager1.Size = new System.Drawing.Size(998, 35);
this.pager1.TabIndex = 7;
this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging);
//
// 条码 // 条码
// //
this..AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this..AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@ -375,7 +364,17 @@
this.Pid.Name = "Pid"; this.Pid.Name = "Pid";
this.Pid.ReadOnly = true; this.Pid.ReadOnly = true;
this.Pid.Visible = false; this.Pid.Visible = false;
this.Pid.Width = 60; //
// pager1
//
this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage")));
this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pager1.Location = new System.Drawing.Point(0, 607);
this.pager1.Name = "pager1";
this.pager1.OSearch = null;
this.pager1.Size = new System.Drawing.Size(998, 35);
this.pager1.TabIndex = 7;
this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging);
// //
// TJProductInForm // TJProductInForm
// //
@ -409,7 +408,6 @@
private System.Windows.Forms.ToolStripButton tsbSearch; private System.Windows.Forms.ToolStripButton tsbSearch;
private System.Windows.Forms.TextBox txtProductCode; private System.Windows.Forms.TextBox txtProductCode;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private Controls.Pager pager1;
private System.Windows.Forms.Panel panelSearchTitle; private System.Windows.Forms.Panel panelSearchTitle;
private System.Windows.Forms.Label lblSearchTitle; private System.Windows.Forms.Label lblSearchTitle;
private System.Windows.Forms.Panel panelSearch; private System.Windows.Forms.Panel panelSearch;
@ -429,5 +427,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn ; private System.Windows.Forms.DataGridViewTextBoxColumn ;
private System.Windows.Forms.DataGridViewTextBoxColumn ; private System.Windows.Forms.DataGridViewTextBoxColumn ;
private System.Windows.Forms.DataGridViewTextBoxColumn Pid; private System.Windows.Forms.DataGridViewTextBoxColumn Pid;
private Controls.Pager pager1;
} }
} }

20
APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs

@ -139,18 +139,18 @@ namespace QMAPP.WinForm.Forms.TianJin
/// <param name="e"></param> /// <param name="e"></param>
private void tsbAdd_Click(object sender, EventArgs e) private void tsbAdd_Click(object sender, EventArgs e)
{ {
//ProductInSendCodeForm editForm = new ProductInSendCodeForm(); TJProductInSendCodeForm editForm = new TJProductInSendCodeForm();
//DialogResult result = editForm.ShowDialog(); DialogResult result = editForm.ShowDialog();
//if (result == System.Windows.Forms.DialogResult.OK)//判断是否投料窗口已做操作 if (result == System.Windows.Forms.DialogResult.OK)//判断是否投料窗口已做操作
//{ {
// this.pager1.Init();
// BindGirdData();
//}
var form = new TJProductInSendCodeForm();
form.StartPosition = FormStartPosition.CenterScreen;
form.ShowDialog();
this.pager1.Init(); this.pager1.Init();
BindGirdData(); BindGirdData();
}
//var form = new TJProductInSendCodeForm();
//form.StartPosition = FormStartPosition.CenterScreen;
//form.Show();
//this.pager1.Init();
//BindGirdData();
} }
// 行序号 // 行序号

168
APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx

@ -124,90 +124,90 @@
<data name="tsbSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
suR/AIh+8Buz+f8AAAAAAElFTkSuQmCC y+7D8eQU3AAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="tsbAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="tsbAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

20
APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.Designer.cs

@ -30,7 +30,6 @@
{ {
this.txtCode = new System.Windows.Forms.TextBox(); this.txtCode = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.tsb_close = new System.Windows.Forms.Button();
this.labelError = new System.Windows.Forms.Label(); this.labelError = new System.Windows.Forms.Label();
this.labelOutReason = new System.Windows.Forms.Label(); this.labelOutReason = new System.Windows.Forms.Label();
this.comboBoxOutReason = new System.Windows.Forms.ComboBox(); this.comboBoxOutReason = new System.Windows.Forms.ComboBox();
@ -57,16 +56,6 @@
this.label1.TabIndex = 6; this.label1.TabIndex = 6;
this.label1.Text = "条码"; this.label1.Text = "条码";
// //
// tsb_close
//
this.tsb_close.Location = new System.Drawing.Point(270, 133);
this.tsb_close.Name = "tsb_close";
this.tsb_close.Size = new System.Drawing.Size(75, 23);
this.tsb_close.TabIndex = 8;
this.tsb_close.Text = "关闭";
this.tsb_close.UseVisualStyleBackColor = true;
this.tsb_close.Click += new System.EventHandler(this.tsb_close_Click);
//
// labelError // labelError
// //
this.labelError.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.labelError.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@ -111,13 +100,13 @@
// //
this.tsb_submit.Location = new System.Drawing.Point(119, 133); this.tsb_submit.Location = new System.Drawing.Point(119, 133);
this.tsb_submit.Name = "tsb_submit"; this.tsb_submit.Name = "tsb_submit";
this.tsb_submit.Size = new System.Drawing.Size(75, 23); this.tsb_submit.Size = new System.Drawing.Size(226, 23);
this.tsb_submit.TabIndex = 14; this.tsb_submit.TabIndex = 14;
this.tsb_submit.Text = "提交"; this.tsb_submit.Text = "提交";
this.tsb_submit.UseVisualStyleBackColor = true; this.tsb_submit.UseVisualStyleBackColor = true;
this.tsb_submit.Click += new System.EventHandler(this.submit_Click); this.tsb_submit.Click += new System.EventHandler(this.submit_Click);
// //
// SendCodeForm // TJSendCodeForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@ -127,13 +116,11 @@
this.Controls.Add(this.comboBoxOutReason); this.Controls.Add(this.comboBoxOutReason);
this.Controls.Add(this.labelOutReason); this.Controls.Add(this.labelOutReason);
this.Controls.Add(this.labelError); this.Controls.Add(this.labelError);
this.Controls.Add(this.tsb_close);
this.Controls.Add(this.txtCode); this.Controls.Add(this.txtCode);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Name = "SendCodeForm"; this.Name = "TJSendCodeForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "出库"; this.Text = "出库";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SendCodeForm_FormClosing);
this.Load += new System.EventHandler(this.Form_Load); this.Load += new System.EventHandler(this.Form_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@ -144,7 +131,6 @@
private System.Windows.Forms.TextBox txtCode; private System.Windows.Forms.TextBox txtCode;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button tsb_close;
private System.Windows.Forms.Label labelError; private System.Windows.Forms.Label labelError;
private System.Windows.Forms.Label labelOutReason; private System.Windows.Forms.Label labelOutReason;
private System.Windows.Forms.ComboBox comboBoxOutReason; private System.Windows.Forms.ComboBox comboBoxOutReason;

144
APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.cs

@ -13,6 +13,7 @@ using QMAPP.Entity;
using QMAPP.WinForm.Common; using QMAPP.WinForm.Common;
using QM.Common; using QM.Common;
using QMAPP.MD.Entity; using QMAPP.MD.Entity;
using QMAPP.MD.Entity.TianJin;
namespace QMAPP.WinForm.Forms.TianJin namespace QMAPP.WinForm.Forms.TianJin
{ {
@ -23,8 +24,6 @@ namespace QMAPP.WinForm.Forms.TianJin
/// </summary> /// </summary>
public partial class TJSendCodeForm : Form public partial class TJSendCodeForm : Form
{ {
List<Product> productList = new List<Product>();
TJOutWarehouseForm sendmain = new TJOutWarehouseForm();
public TJSendCodeForm() public TJSendCodeForm()
{ {
InitializeComponent(); InitializeComponent();
@ -37,11 +36,6 @@ namespace QMAPP.WinForm.Forms.TianJin
new KeyEvent().SetKeyToTxt(this); new KeyEvent().SetKeyToTxt(this);
//出库原因下拉 //出库原因下拉
BasicData basicData = new BasicData(); BasicData basicData = new BasicData();
//初始化控件属性
//this.comboBoxOutReason.DataSource = basicData.GetDictionaryList(EnumGeter.DictKind.OutReason.ToString());
//this.comboBoxOutReason.DisplayMember = "VALUE";
//this.comboBoxOutReason.ValueMember = "KEY";
//this.comboBoxOutReason.SelectedValue = "";
//加载物料类型分类 //加载物料类型分类
OutReason searchModelType = new OutReason(); OutReason searchModelType = new OutReason();
@ -65,40 +59,6 @@ namespace QMAPP.WinForm.Forms.TianJin
this.txtCode.Focus();//落入光标 this.txtCode.Focus();//落入光标
} }
#region 保存出库信息到ProductOut表
/// <summary>
/// 保存出库信息到ProductOut表
/// </summary>
public void SaveInfo(List<Product> productList)
{
ProductOut outInfo = new ProductOut();
outInfo.PID=Guid.NewGuid().ToString();//PID
outInfo.productList = productList;
if (ClientContext.produceShift != null)
{
outInfo.SHIFT_CODE = ClientContext.produceShift.PRODUCESHIFTTCODE;
}
outInfo.CREATEUSER = ClientContext.LoginInfo.UserID;
outInfo.CREATEDATE = DateTime.Now;
foreach (var model in productList)
{
outInfo.PRODUCT_CODE = model.PRODUCTCODE;
outInfo.MATERIAL_CODE = model.MATERIAL_CODE;
outInfo.WORKCENTER_CODE = model.WORKCENTER_CODE;
outInfo.WORKCELL_CODE = model.WORKCELL_CODE;
outInfo.OUTREASON = model.OUTREASON;
}
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
DataResult<int> result = agent.InvokeServiceFunction<DataResult<int>>("ProductOutBLL_InsertProductOut", outInfo);
//MessageBox.Show(result.Msg);
//this.DialogResult = DialogResult.OK;
productList.Clear();
this.comboBoxOutReason.SelectedItem = null;
this.txtCode.Text = "";
}
#endregion
# region 扫码枪 # region 扫码枪
/// <summary> /// <summary>
/// 扫码枪 /// 扫码枪
@ -107,94 +67,36 @@ namespace QMAPP.WinForm.Forms.TianJin
/// <param name="e"></param> /// <param name="e"></param>
private bool ValidateAndAddCode(string proCode) private bool ValidateAndAddCode(string proCode)
{ {
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
if (!string.IsNullOrEmpty(proCode)) if (!string.IsNullOrEmpty(proCode))
{ {
if (System.Text.RegularExpressions.Regex.IsMatch(proCode, "^DP\\w+(-\\w+)?-DF[LR][FR]\\w+$"))//扫描输入为门板计划标签
{
//从计划标签中截取产品码
proCode = proCode.Substring(proCode.LastIndexOf('-') + 1);
}
//出库原因 //出库原因
if (this.comboBoxOutReason.Text.ToString() == "") if (this.comboBoxOutReason.Text.ToString() == "")
{ {
this.labelError.Text ="出库原因不能为空!"; this.labelError.Text ="出库原因不能为空!";
return false; return false;
} }
#region 获取零件信息 var count = agent.InvokeServiceFunction<DataResult<int>>("StorageBLL_SelectCount", proCode);
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); if (count.Result > 0)
Product searchModel = new Product();
Main mainModel = new Main();
//去Main表查询数据
if (proCode.Substring(0, 3) == "052")
{
//从计划标签中截取产品码
mainModel.MAINCODE = proCode;
Main mainInfo = agent.InvokeServiceFunction<Main>("MainBLL_GetByCondition", mainModel);
if (mainInfo != null)
{ {
searchModel.PRODUCTCODE = mainInfo.EPIDERMISCODE; var storage = new Storage();
} storage.ProductCode = proCode;
} storage.OutStorageType = this.comboBoxOutReason.Text.ToString();
var result = agent.InvokeServiceFunction<DataResult>("StorageBLL_Update", storage);
if (result.IsSuccess)
return true;
else else
{ {
searchModel.PRODUCTCODE = proCode; this.labelError.Text = result.Msg;
}
this.labelError.ForeColor = System.Drawing.Color.Red;
List<Product> list = agent.InvokeServiceFunction<List<Product>>("ProductBLL_GetAllList", searchModel);
if (list.Count <= 0)//是否存在该零件
{
this.labelError.Text =this.txtCode.Text +"\r\n"+ Resource1.SendInfoNotFoundCode;
this.txtCode.Text = "";
return false; return false;
} }
list[0].OUTREASON = this.comboBoxOutReason.SelectedValue.ToString();
Product model = list[0];
#endregion
#region 判断零件状态
//合格返修报废
if (!model.STATUS.Equals(EnumGeter.PRODUCTSTAUTS.QUALIFIED.GetHashCode().ToString()))//合格
{
if (model.STATUS.Equals(EnumGeter.PRODUCTSTAUTS.REPAIR.GetHashCode().ToString()))//合格
{
this.labelError.Text = this.txtCode.Text + "\r\n" + Resource1.SendInfoRepaired;
this.txtCode.Text = "";
return false;
} }
else else
{ {
this.labelError.Text = this.txtCode.Text + "\r\n" + Resource1.SendInfoWadBad; this.labelError.Text = "条码未进行入库操作!";
this.txtCode.Text = "";
return false; return false;
} }
} }
//是否已出库
if (EnumGeter.OUTFLAG.INWAREHOUSE.GetHashCode().ToString().Equals(model.OUTFLAG) == false)
{
this.labelError.Text = this.txtCode.Text + "\r\n" + Resource1.SendInfoNotOk;
this.txtCode.Text = "";
return false;
}
//是否已经完成
if (EnumGeter.Finish.ENDOFLINE.GetHashCode().ToString().Equals(model.ENDOFLINE) == false)
{
this.labelError.Text = this.txtCode.Text + "\r\n" + "该本体正在加工中,未完成";
this.txtCode.Text = "";
return false;
}
#endregion
//添加到零件列表
productList.Add(model);
return true;
}
this.labelError.Text = "请选择相应信息!"; this.labelError.Text = "请选择相应信息!";
return false; return false;
@ -213,7 +115,7 @@ namespace QMAPP.WinForm.Forms.TianJin
{ {
if (ValidateAndAddCode(this.txtCode.Text.Trim())) if (ValidateAndAddCode(this.txtCode.Text.Trim()))
{ {
SaveInfo(productList); //SaveInfo(productList);
this.txtCode.Text = ""; this.txtCode.Text = "";
this.labelError.ForeColor = System.Drawing.Color.Green; this.labelError.ForeColor = System.Drawing.Color.Green;
this.labelError.Text = "操作成功"; this.labelError.Text = "操作成功";
@ -228,22 +130,20 @@ namespace QMAPP.WinForm.Forms.TianJin
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void tsb_close_Click(object sender, EventArgs e) //private void tsb_close_Click(object sender, EventArgs e)
{ //{
this.DialogResult = DialogResult.OK; // this.Close();
this.Close(); //}
}
/// <summary> /// <summary>
/// 点击右上角X关闭窗口 /// 点击右上角X关闭窗口
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void SendCodeForm_FormClosing(object sender, FormClosingEventArgs e) //private void SendCodeForm_FormClosing(object sender, EventArgs e)
{ //{
this.DialogResult = DialogResult.OK; // this.Close();
e.Cancel = false; //}
}
#endregion #endregion
@ -253,7 +153,7 @@ namespace QMAPP.WinForm.Forms.TianJin
{ {
if (ValidateAndAddCode(this.txtCode.Text.Trim().ToUpper())) if (ValidateAndAddCode(this.txtCode.Text.Trim().ToUpper()))
{ {
SaveInfo(productList); //SaveInfo(productList);
this.txtCode.Text = ""; this.txtCode.Text = "";
this.labelError.ForeColor = System.Drawing.Color.Green; this.labelError.ForeColor = System.Drawing.Color.Green;
this.labelError.Text = "操作成功"; this.labelError.Text = "操作成功";

4
APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2021.09.08.01")] [assembly: AssemblyVersion("2022.03.28.02")]
[assembly: AssemblyFileVersion("2021.09.08.01")] [assembly: AssemblyFileVersion("2022.03.28.02")]

Loading…
Cancel
Save