diff --git a/APP/QMAPP.Web/App_Data/MainPower.xml b/APP/QMAPP.Web/App_Data/MainPower.xml index 5ff8ee0..6fae65e 100644 --- a/APP/QMAPP.Web/App_Data/MainPower.xml +++ b/APP/QMAPP.Web/App_Data/MainPower.xml @@ -278,6 +278,11 @@ + + + + + diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index dca7b2c..1226a1d 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -298,7 +298,7 @@ --> - + 查询 添加 @@ -313,6 +313,21 @@ 下载模板 + @@ -453,7 +468,14 @@ 查询 - 导出 + + + + + 查询 + 新建 + 修改 + 删除 - - - - + - + + --> + + + + --> + + @@ -123,7 +127,7 @@ diff --git a/APPMD/QMAPP.MD.DAL/MaterialDAL.cs b/APPMD/QMAPP.MD.DAL/MaterialDAL.cs index 2bd360b..23533b2 100644 --- a/APPMD/QMAPP.MD.DAL/MaterialDAL.cs +++ b/APPMD/QMAPP.MD.DAL/MaterialDAL.cs @@ -603,7 +603,7 @@ namespace QMAPP.MD.DAL } if (string.IsNullOrEmpty(condition.REMARK) == false) { - whereBuilder.Append(" AND M.REMARK is not null "); + whereBuilder.Append($" AND M.REMARK LIKE '%{condition.REMARK}%' "); } if (string.IsNullOrEmpty(condition.MATERIAL_ATTRIBUTE) == false) diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config index 24b8e5c..e382847 100644 --- a/APPMD/QMAPP.MD.Web/Web.config +++ b/APPMD/QMAPP.MD.Web/Web.config @@ -29,19 +29,28 @@ + - + - - + + + + + - + + + + + --> + @@ -99,7 +108,7 @@ diff --git a/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs b/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs index d8e4c2c..fca2410 100644 --- a/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs +++ b/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs @@ -109,6 +109,7 @@ namespace QMAPP.MESReport.DAL.LineQTY ,tsa.[EQUIPMENT_CODE] ,tsa.[WORKCELL_CODE] ,tsa.[MATRIAL_CODE] AS [MATERIAL_CODE] + ,ma.MATERIAL_NAME ,tsa.[SHIFT_CODE] ,CONVERT(VARCHAR(10),tsa.[STATIS_DATE],120) as STATIS_DATE ,tsa.[QTY] @@ -126,7 +127,9 @@ namespace QMAPP.MESReport.DAL.LineQTY sqlBuilder.AppendLine("on tmw.WORKCELL_CODE =tsa.WORKCELL_CODE "); sqlBuilder.AppendLine("inner join T_MD_PROCESS_ROUTE_WORKCELL_SEQ tmprw "); sqlBuilder.AppendLine("on tmprw.WORKCELL_CODE =tsa.WORKCELL_CODE "); - + sqlBuilder.AppendLine("inner join T_MD_MATERIAL ma "); + sqlBuilder.AppendLine("on ma.MATERIAL_CODE =tsa.MATRIAL_CODE "); + if (string.IsNullOrEmpty(condition.START_DATE) == false) { whereBuilder.Append(" AND STATIS_DATE >= @START_DATE "); @@ -189,14 +192,14 @@ namespace QMAPP.MESReport.DAL.LineQTY try { //构成查询语句 - sqlBuilder.Append("select * from T_SA_WORKCELLQTYCOUNT"); + sqlBuilder.Append("select tsa.*,ma.MATERIAL_NAME from T_SA_WORKCELLQTYCOUNT as tsa inner join T_MD_MATERIAL ma on ma.MATERIAL_CODE = tsa.MATRIAL_CODE "); if (whereBuilder.Length > 0) { sqlBuilder.Append(whereBuilder.ToString()); } - sqlBuilder.Append(" ORDER BY STATIS_DATE DESC "); + sqlBuilder.Append(" ORDER BY tsa.STATIS_DATE DESC "); using (IDataSession session = AppDataFactory.CreateMainSession()) { diff --git a/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs b/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs index 83f90b5..fd4b9cd 100644 --- a/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs +++ b/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs @@ -58,5 +58,7 @@ namespace QMAPP.MESReport.Entity.LineQTY public string WORKCENTER_NAME { get; set; } + public string MATERIAL_NAME { get; set; } + } } diff --git a/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs b/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs index b783cbf..85a7d68 100644 --- a/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs +++ b/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs @@ -121,9 +121,18 @@ namespace QMAPP.MESReport.Web.Models.LineQTY [Description("物料号")] [HTMLInput(UpdateRead = false, required = false, MaxLength = 50, Width = 120)] [InputType(inputType.text)] - [DGColumn(frozenColumns = false, Sortable = true, Width = 150, DataAlign = DataAlign.center)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)] public string MATERIAL_CODE { get; set; } + /// + ///物料名称 + /// + [Description("物料名称")] + [HTMLInput(UpdateRead = false, required = false, MaxLength = 50, Width = 120)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = false, Sortable = true, Width = 250, DataAlign = DataAlign.center)] + public string MATERIAL_NAME { get; set; } + /// ///工序合格数 /// diff --git a/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj b/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj index a7febb8..dc7f0fb 100644 --- a/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj +++ b/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj @@ -25,6 +25,12 @@ SAK SAK SAK + + + + + + true @@ -46,6 +52,9 @@ AllRules.ruleset + + ..\..\DLL\EmitMapper.dll + False ..\..\DLL\log4net.dll @@ -540,6 +549,7 @@ PreserveNewest + diff --git a/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls b/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls new file mode 100644 index 0000000..411274c Binary files /dev/null and b/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls differ diff --git a/APPQ5/QMAPP.FJC.BLL/Andon/AndonCallBLL.cs b/APPQ5/QMAPP.FJC.BLL/Andon/AndonCallBLL.cs index 98609d0..02469b0 100644 --- a/APPQ5/QMAPP.FJC.BLL/Andon/AndonCallBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/Andon/AndonCallBLL.cs @@ -715,8 +715,6 @@ namespace QMAPP.FJC.BLL.Andon { try { - - AndonCallDAL andonDal = new AndonCallDAL(); andonDal.BaseSession = session; diff --git a/APPQ5/QMAPP.FJC.BLL/BZD/BarCodeReplaceBLL.cs b/APPQ5/QMAPP.FJC.BLL/BZD/BarCodeReplaceBLL.cs new file mode 100644 index 0000000..6737879 --- /dev/null +++ b/APPQ5/QMAPP.FJC.BLL/BZD/BarCodeReplaceBLL.cs @@ -0,0 +1,204 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using QMAPP.BLL; + +using QMFrameWork.Data; + +using QMAPP.Entity; +using QMFrameWork.Log; +using System.Data; +using QMAPP.MD.Entity; +using QMAPP.MD.DAL; +using QMAPP.FJC.Entity.BZD; +using QMAPP.FJC.DAL.BZD; + +namespace QMAPP.FJC.BLL.BZD +{ + /// + ///　模块名称：条码替换记录 + ///　作 者：张松男 + ///　编写日期：2022年11月07日 + /// + public class BarCodeReplaceBLL : BaseBLL + { + + #region 获取信息 + /// + /// 获取信息 + /// + /// 条件 + /// 信息 + public DataResult Get(BarCodeReplace model) + { + DataResult result = new DataResult(); + try + { + result.Result = new BarCodeReplaceDAL().Get(model); + } + catch (Exception ex) + { + result.IsSuccess = false; + result.Msg = Resource.SystemException; + throw ex; + } + result.IsSuccess = true; + return result; + } + + #endregion + + #region 获取列表(分页) + /// + /// 获取列表 + /// + /// 条件 + /// 数据页 + /// 数据页 + public DataResult GetList(BarCodeReplace condition, DataPage page) + { + DataResult result = new DataResult(); + try + { + //获取物料信息列表 + DataPage dataPage = new BarCodeReplaceDAL().GetList(condition, page); + + result.Result = dataPage; + } + catch (Exception ex) + { + result.IsSuccess = false; + result.Msg = Resource.SystemException; + throw ex; + } + result.IsSuccess = true; + return result; + + } + /// + /// 获取全部条码格式规则 + /// + /// + public List GetAllList(string str) + { + return new BarCodeReplaceDAL().GetAllList(); + } + #endregion + + #region 插入信息 + /// + /// 插入信息(单表) + /// + /// 信息 + /// 插入行数 + public DataResult Insert(BarCodeReplace info) + { + DataResult result = new DataResult(); + try + { + //基本信息 + info.PID = Guid.NewGuid().ToString(); + info.CREATEDATE = DateTime.Now; + info.FLGDEL = "0"; + BarCodeReplaceDAL cmdDAL = new BarCodeReplaceDAL(); + result.Result = new BarCodeReplaceDAL().Insert(info); + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 更新信息 + /// + /// 更新信息 + /// + /// 信息 + /// 更新行数 + public DataResult Update(BarCodeReplace info) + { + DataResult result = new DataResult(); + try + { + info.FLGDEL = "0"; + result.Result = new BarCodeReplaceDAL().Update(info); + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 删除 + /// + /// 删除信息 + /// + /// 主键串 + /// 删除个数 + public DataResult Delete(string strs) + { + int count = 0; + DataResult result = new DataResult(); + string[] list = strs.Split(":".ToCharArray()); + try + { + foreach (string str in list) + { + count += this.DeleteBarcodeRules(new BarCodeReplace { PID = str }); + } + result.Result = count; + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 删除信息 + /// + /// 信息 + /// 删除个数 + public int DeleteBarcodeRules(BarCodeReplace info) + { + try + { + return new BarCodeReplaceDAL().Delete(info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 导出数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(BarCodeReplace info) + { + try + { + return new BarCodeReplaceDAL().GetExportData(info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + } +} diff --git a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs index 4dc657b..41291c0 100644 --- a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs @@ -241,14 +241,30 @@ namespace QMAPP.FJC.BLL.FIS model.PID = Guid.NewGuid().ToString(); model.PLAN_STATE = "0"; model.PLANSOURCE = model.PLANSOURCE; - //var materialcode = ""; - //if (model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "L" || model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "R") - // materialcode = model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1); - //else - // materialcode = model.MATERIAL_CODE; - //Pbom pbomcode = new PbomDAL().TJGet(new Pbom { MATERIAL_CODE = materialcode }); - //model.PBOM_CODE = pbomcode.PBOM_CODE; + + var materialcode = ""; + if (model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "L" || model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "R") + { + if (model.MATERIAL_CODE.Contains("018D")) + { + materialcode = model.MATERIAL_CODE; + } + else + { + materialcode = model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1); + } + + } + else + materialcode = model.MATERIAL_CODE; + Pbom pbomcode = new PbomDAL().TJGet(new Pbom { MATERIAL_CODE = materialcode }); + model.PBOM_CODE = pbomcode.PBOM_CODE; + string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE); + + if (model.MATERIAL_CODE.Contains("018D")) + workcentercode = workcentercode.Replace("770B","018D"); + model.WORKCENTER_CODE = workcentercode; if (model.WORKCENTER_CODE != "") { @@ -264,9 +280,20 @@ namespace QMAPP.FJC.BLL.FIS foreach (var MA in ListMachine) { if (MA.MATERIALNAME.Contains("左")) - model.ROUTE_CODE = "DP_L_ASSEMBLY_770B"; - else if(MA.MATERIALNAME.Contains("右")) - model.ROUTE_CODE = "DP_R_ASSEMBLY_770B"; + { + if (model.MATERIAL_CODE.Contains("018")) + model.ROUTE_CODE = "DP_L_ASSEMBLY_018D"; + else + model.ROUTE_CODE = "DP_L_ASSEMBLY_770B"; + } + else if (MA.MATERIALNAME.Contains("右")) + { + if (model.MATERIAL_CODE.Contains("018")) + model.ROUTE_CODE = "DP_R_ASSEMBLY_018D"; + else + model.ROUTE_CODE = "DP_R_ASSEMBLY_770B"; + } + } //model.ROUTE_CODE = "DP_ASSEMBLY_770B"; @@ -1279,7 +1306,7 @@ namespace QMAPP.FJC.BLL.FIS ma.PID = Guid.NewGuid().ToString(); ma.PLAN_NO = ma.PLAN_NO; //int no = new DoorPlankPlanDAL().GetNum(ma) + (num - 1); - //ma.PLAN_SEQ = ma.PLAN_DATE.ToString("yyyyMMdd") + no; + ma.PLAN_SEQ = ma.PLAN_NO.Substring(ma.PLAN_NO.Length-3,3); ma.PLAN_STATE = EnumGeter.PLANSTATE.INIT.GetHashCode().ToString(); ma.MATERIAL_CODE = ma.MATERIAL_CODE; ma.MACHINECODDE = ma.MACHINECODDE; diff --git a/APPQ5/QMAPP.FJC.BLL/FIS/FISPhraseBLL.cs b/APPQ5/QMAPP.FJC.BLL/FIS/FISPhraseBLL.cs index d9d0fed..17e2f42 100644 --- a/APPQ5/QMAPP.FJC.BLL/FIS/FISPhraseBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/FIS/FISPhraseBLL.cs @@ -14,6 +14,11 @@ namespace QMAPP.FJC.BLL.FIS return new DAL.FIS.FISPhraseDAL().GetFisPhraseBook(assymaterialcode, positioncode); } + public FISPhraseBook GetPHRASEBOOK(string Code) + { + return new DAL.FIS.FISPhraseDAL().GetPHRASEBOOK(Code); + } + public List GetAssemblyList(FISAssembly condation) { return new DAL.FIS.FISPhraseDAL().GetAssemblyList(condation); diff --git a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs index c82ee58..05e9d28 100644 --- a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs @@ -2825,6 +2825,7 @@ namespace QMAPP.FJC.BLL.Operation proCodeInfo = new PrintCodeDAL().GetPrintCodeInfo(proCodeInfo); if (proCodeInfo != null) { + var sssss = proCodeInfo.UPDATETIME.ToShortDateString(); if (proCodeInfo.UPDATETIME.ToShortDateString() != DateTime.Now.ToShortDateString()) { proCodeInfo.SERIAL_NUM = 0; diff --git a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj index f90278e..2da4584 100644 --- a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj +++ b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj @@ -110,6 +110,7 @@ + diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs index 4449a29..050912d 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs @@ -296,7 +296,13 @@ namespace QMAPP.FJC.BLL.TianJin { try { - return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().ExistBarcode(barcodetime, pbarcode); + var DATA = QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL.TExistBarcode(barcodetime, pbarcode); + if (DATA.Rows.Count>0) + { + return new DataTable(); + } + else + return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().ExistBarcode(barcodetime, pbarcode); } catch (Exception ex) diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs index 1258c53..23fad5c 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs @@ -108,6 +108,30 @@ namespace QMAPP.FJC.BLL.TianJin } } + public List GetOrderUnPrinted018DF(string RouteCode, int filter, DataPage dataPage, string Direction, string SHIFTCODE, string BeginTime, string EndTime) + { + try + { + return new TWorkOrderDAL().GetOrderUnPrinted018DF(RouteCode, Direction, SHIFTCODE, BeginTime, EndTime, filter, dataPage.PageSize); + } + catch (Exception ex) + { + throw ex; + } + } + + public List GetOrderUnPrinted018DR(string RouteCode, int filter, DataPage dataPage, string Direction, string SHIFTCODE, string BeginTime, string EndTime) + { + try + { + return new TWorkOrderDAL().GetOrderUnPrinted018DR(RouteCode, Direction, SHIFTCODE, BeginTime, EndTime, filter, dataPage.PageSize); + } + catch (Exception ex) + { + throw ex; + } + } + public int SetOrderPrinted(string orderpid) { try diff --git a/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs b/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs index ab552ef..01d7f86 100644 --- a/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs @@ -403,7 +403,7 @@ namespace QMAPP.MD.DAL { string sqlChange = ChangeSqlByDB(sql, session); var dt = session.GetTable(sqlChange, parameters.ToArray()); - return Convert.ToInt16(dt.Rows[0].ItemArray[0]); + return Convert.ToInt32(dt.Rows[0].ItemArray[0]); } diff --git a/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplaceDAL.cs new file mode 100644 index 0000000..7bd42a0 --- /dev/null +++ b/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplaceDAL.cs @@ -0,0 +1,255 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using QMAPP.MD.Entity; +using QMFrameWork.Data; +using System.Data; +using QMAPP.Entity; +using QMAPP.FJC.Entity.BZD; + +namespace QMAPP.FJC.DAL.BZD +{ + /// + ///　模块名称：条码替换记录 + ///　作 者：张松男 + ///　编写日期：2022年11月07日 + /// + public class BarCodeReplaceDAL + { + + #region 获取信息 + /// + /// 获取信息 + /// + /// 条件 + /// *信息 + public BarCodeReplace Get(BarCodeReplace info) + { + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + info = session.Get(info); + } + return info; + } + catch (Exception ex) + { + throw ex; + } + } + + #endregion + + #region 获取列表 + /// + /// 获取列表 + /// + /// 条件 + /// 数据页 + /// 数据页 + public DataPage GetList(BarCodeReplace condition, DataPage page) + { + string sql = null; + List parameters = new List(); + try + { + sql = this.GetQuerySql(condition, ref parameters); + //分页关键字段及排序 + page.KeyName = "PID"; + if (string.IsNullOrEmpty(page.SortExpression)) + page.SortExpression = "CREATEDATE DESC"; + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + // 对应多种数据库 + //string sqlChange = this.ChangeSqlByDB(sql, session); + page = session.GetDataPage(sql, parameters.ToArray(), page); + } + return page; + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 获取全部规则 + /// + /// + public List GetAllList() + { + try + { + string sql = "SELECT * FROM [T_AW_BarCodeReplace]"; + List parameters = new List(); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql, parameters.ToArray()).ToList(); + } + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 获取查询语句 + /// + /// 获取查询语句 + /// + /// 查询条件 + /// 参数 + /// 查询语句 + private string GetQuerySql(BarCodeReplace condition, ref List parameters) + { + StringBuilder sqlBuilder = new StringBuilder(); + StringBuilder whereBuilder = new StringBuilder(); + try + { + //构成查询语句//[PID],[MPID],[barcodeFist],[Company_code],[Vehicle_type],[MATERIALCODDE],[configColor],[CREATEUSER],[CREATEDATE],[FLGDEL] + sqlBuilder.Append("SELECT * "); + sqlBuilder.Append("FROM [T_AW_BarCodeReplace] "); + whereBuilder.Append(" AND FLGDEL<> '1' "); + //查询条件 + + ////查询条件 + if (string.IsNullOrEmpty(condition.NewProductCode) == false) + { + whereBuilder.Append(" AND NewProductCode LIKE @NewProductCode "); + parameters.Add(new DataParameter { ParameterName = "NewProductCode", DataType = DbType.String, Value = "%" + condition.NewProductCode + "%" }); + } + if (string.IsNullOrEmpty(condition.OldProductCode) == false) + { + whereBuilder.Append(" AND OldProductCode LIKE @OldProductCode "); + parameters.Add(new DataParameter { ParameterName = "OldProductCode", DataType = DbType.String, Value = "%" + condition.OldProductCode + "%" }); + } + + + if (whereBuilder.Length > 0) + { + sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4)); + } + return sqlBuilder.ToString(); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 获取导出的数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(BarCodeReplace info) + { + DataTable dt = null; + string sql = null; + List parameters = new List(); + try + { + //构成查询语句 + sql = this.GetQuerySql(info, ref parameters); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + dt = session.GetTable(sql, parameters.ToArray()); + dt.TableName = "BarCodeReplace"; + } + return dt; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 插入信息 + /// + /// 插入信息(单表) + /// + /// 信息 + /// 插入行数 + public int Insert(BarCodeReplace info) + { + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //插入基本信息 + count = session.Insert(info); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 更新信息 + /// + /// 更新信息 + /// + /// + /// 更新行数 + public int Update(BarCodeReplace info) + { + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //更新基本信息 + count = session.Update(info); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 逻辑删除 + /// + /// 逻辑删除信息 + /// + /// + /// 删除个数 + public int Delete(BarCodeReplace info) + { + StringBuilder sqlBuilder = new StringBuilder(); + List parameters = new List(); + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //删除基本信息 + sqlBuilder.Append("UPDATE T_AW_BarCodeReplace "); + sqlBuilder.Append("SET FLGDEL = '1' "); + sqlBuilder.Append("WHERE PID = @PID "); + parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID }); + count = session.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray()); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + } +} diff --git a/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs b/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs index e94a9da..5de9f02 100644 --- a/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs @@ -164,7 +164,7 @@ namespace QMAPP.FJC.DAL.FIS sqlBuilder.AppendLine(" LEFT JOIN T_QM_USER C ON C.USERID=O.CREATEUSER "); sqlBuilder.AppendLine(" LEFT JOIN T_QM_USER U ON U.USERID=O.UPDATEUSER "); - whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE='{0}')", condition.ORDER_TYPE); + whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE IN ('{0}','DOORPLANK018D'))", condition.ORDER_TYPE); //查询条件 if (string.IsNullOrEmpty(condition.FACTORY_CODE) == false) diff --git a/APPQ5/QMAPP.FJC.DAL/FIS/FISPhraseDAL.cs b/APPQ5/QMAPP.FJC.DAL/FIS/FISPhraseDAL.cs index 46b4ff0..49e52a0 100644 --- a/APPQ5/QMAPP.FJC.DAL/FIS/FISPhraseDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/FIS/FISPhraseDAL.cs @@ -86,6 +86,20 @@ namespace QMAPP.FJC.DAL.FIS } } + public FISPhraseBook GetPHRASEBOOK(string Code) + { + StringBuilder sql = new StringBuilder(); + sql.AppendLine("SELECT Text "); + sql.AppendLine("FROM T_FIS_PHRASEBOOK "); + sql.AppendLine($"WHERE Code = '{Code}' "); + + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + List parameters = new List(); + return session.Get(sql.ToString(), parameters.ToArray()); + } + } + public List GetAssemblyList(FISAssembly condation) { List parameters = new List(); diff --git a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj index 673e01e..3678c15 100644 --- a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj +++ b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj @@ -103,6 +103,7 @@ + diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs index 604dc13..8218aa0 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs @@ -185,6 +185,12 @@ namespace QMAPP.FJC.DAL.TianJin whereBuilder.Append(" AND A.ProductCode = @ProductCode"); parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = condition.ProductCode }); } + if (string.IsNullOrEmpty(condition.MATERIALNAME) == false) + { + whereBuilder.Append(" AND m.MATERIAL_NAME = @MATERIALNAME"); + parameters.Add(new DataParameter { ParameterName = "MATERIALNAME", DataType = DbType.String, Value = condition.MATERIALNAME }); + } + if (condition.BeginTime != DateTime.MinValue) whereBuilder.Append($" and A.CREATEDATE >= '{condition.BeginTime}' "); if (condition.EndTime != DateTime.MinValue) diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs index 9a4d6f5..b52b98a 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs @@ -46,10 +46,18 @@ namespace QMAPP.FJC.DAL.TianJin { strSql.Append(" WHERE O.MOULD_CODE IN( 'LF', 'LR' ) "); } - else + else if(!string.IsNullOrEmpty(pFistype) && pFistype == "02") { strSql.Append(" WHERE O.MOULD_CODE IN( 'RF', 'RR' ) "); } + else if (!string.IsNullOrEmpty(pFistype) && pFistype == "03") + { + strSql.Append(" WHERE O.MOULD_CODE IN( 'LF', 'RF' ) "); + } + else if (!string.IsNullOrEmpty(pFistype) && pFistype == "04") + { + strSql.Append(" WHERE O.MOULD_CODE IN( 'LR', 'RR' ) "); + } strSql.Append(" and O.STATE in ('0','1') "); @@ -1034,7 +1042,24 @@ namespace QMAPP.FJC.DAL.TianJin } - + /// + /// 查找退返入库 + /// + /// + /// + public static DataTable TExistBarcode(int barcodetime, string pbarcode) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append($"SELECT * FROM T_AW_Storage WHERE ProductCode = '{pbarcode}' AND InStorageType = '退返入库'"); + List parameters = new List(); + //DateTime dtime = DateTime.Now; + //string bdatetime = dtime.AddDays(-barcodetime).ToShortDateString(); + //strSql.Append(string.Format(" WHERE SANBARCODE='{2}' AND SCANDATE>='{0} 00:00:00' and SCANDATE<='{1} 23:59:59' AND FLAGDEL='0' ", bdatetime, DateTime.Now.ToShortDateString(), pbarcode)); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetTable(strSql.ToString(), parameters.ToArray()); + } + } /// /// 判断条码是否重复 @@ -1298,8 +1323,8 @@ namespace QMAPP.FJC.DAL.TianJin strValues.Append("'" + ppastecard.PASTECARDNO + "',"); strValues.Append("'" + ppastecard.PASTECARDDATE + "',"); - strValues.Append("'" + ppastecard.PRODUCTIONNAME + "'"); - //strValues.Append("'" + ppastecard.PLANTNAME + "'"); + strValues.Append("'" + ppastecard.PRODUCTIONNAME + "',"); + strValues.Append("'" + ppastecard.PLANTNAME + "'"); strSql.Append(" INSERT INTO T_DAS_PASTE_CARDINDEX "); strSql.Append(" (" + strFields.ToString() + ")"); diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs index 67cb654..9db65e3 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs @@ -415,6 +415,192 @@ namespace QMAPP.FJC.DAL.TianJin } } + /// + /// 获取指定工序的生产计划清单---018D前门 + /// + /// 工序编码 + /// 数量 + /// 过滤选项：0全部；1隐藏挂起；2只看挂起 + /// + public List GetOrderUnPrinted018DF(string routecode, string Direction, string SHIFTCODE, string BeginTime, string EndTime, int filter = 0, int count = 20) + { + try + { + StringBuilder sql = new StringBuilder(); + sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count); + sql.AppendFormat(" ,W.[ORDERPLANID] "); + sql.AppendFormat(" ,W.[ORDERPLAN_NO] "); + sql.AppendFormat(" ,W.[ORDER_TYPE] "); + sql.AppendFormat(" ,W.[SEQ] "); + sql.AppendFormat(" ,W.[MATERIAL_CODE] "); + sql.AppendFormat(" ,M.[MATERIAL_NAME] "); + sql.AppendFormat(" ,W.[PBOM_CODE] "); + sql.AppendFormat(" ,W.[QTY] "); + sql.AppendFormat(" ,W.[COMPLETE_QTY] "); + sql.AppendFormat(" ,W.[PLAN_DATE] "); + sql.AppendFormat(" ,W.[SHIFT_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_NAME] "); + sql.AppendFormat(" ,W.[WORKCELL_CODE] "); + sql.AppendFormat(" ,W.[WORKCELL_NAME] "); + sql.AppendFormat(" ,W.[WORKLOC_CODE] "); + sql.AppendFormat(" ,W.[REMARK] "); + sql.AppendFormat(" ,W.[EQPT_NAME] "); + sql.AppendFormat(" ,W.[EQPT_CODE] "); + sql.AppendFormat(" ,W.[STATE] "); + sql.AppendFormat(" ,W.[MOULD_CODE] "); + sql.AppendFormat(" ,W.[PRI] "); + sql.AppendFormat(" ,W.[UPDATEDATE] "); + sql.AppendFormat(" ,W.[PRINTED] "); + sql.AppendFormat(" ,P.[IGNORE_FISBREAK] "); + sql.AppendFormat(" ,P.[FIS_ASMSETCODE] "); + sql.AppendFormat(" FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) "); + sql.AppendFormat(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] "); + sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) "); + sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] "); + + sql.AppendFormat($" WHERE P.[ROUTE_CODE]='{routecode}' "); + sql.AppendFormat(" AND W.[PRINTED]='0' "); + + if (!string.IsNullOrEmpty(Direction)) + { + sql.AppendFormat($" AND M.[MATERIAL_NAME] LIKE '%{Direction}前%' "); + } + if (!string.IsNullOrEmpty(SHIFTCODE)) + { + sql.AppendFormat($" AND W.[SHIFT_CODE] = '{SHIFTCODE}' "); + } + if (BeginTime != DateTime.MinValue.ToString()) + { + sql.AppendFormat($" AND W.[PLAN_DATE] >= '{Convert.ToDateTime(BeginTime).ToString("yyyy-MM-dd")} 00:00:00' "); + } + if (EndTime != DateTime.MinValue.ToString()) + { + sql.AppendFormat($" AND W.[PLAN_DATE] <= '{Convert.ToDateTime(EndTime).ToString("yyyy-MM-dd")} 23:59:59' "); + } + + switch (filter) + { + case 1: + { + sql.AppendFormat(" AND W.[STATE]<>4 "); + break; + } + case 2: + { + sql.AppendFormat(" AND W.[STATE]=4 "); + break; + } + } + sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],W.[ORDERPLAN_NO],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); + List parameters = new List(); + parameters.Add(new DataParameter("routecode", routecode)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 获取指定工序的生产计划清单---018D后门 + /// + /// 工序编码 + /// 数量 + /// 过滤选项：0全部；1隐藏挂起；2只看挂起 + /// + public List GetOrderUnPrinted018DR(string routecode, string Direction, string SHIFTCODE, string BeginTime, string EndTime, int filter = 0, int count = 20) + { + try + { + StringBuilder sql = new StringBuilder(); + sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count); + sql.AppendFormat(" ,W.[ORDERPLANID] "); + sql.AppendFormat(" ,W.[ORDERPLAN_NO] "); + sql.AppendFormat(" ,W.[ORDER_TYPE] "); + sql.AppendFormat(" ,W.[SEQ] "); + sql.AppendFormat(" ,W.[MATERIAL_CODE] "); + sql.AppendFormat(" ,M.[MATERIAL_NAME] "); + sql.AppendFormat(" ,W.[PBOM_CODE] "); + sql.AppendFormat(" ,W.[QTY] "); + sql.AppendFormat(" ,W.[COMPLETE_QTY] "); + sql.AppendFormat(" ,W.[PLAN_DATE] "); + sql.AppendFormat(" ,W.[SHIFT_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_NAME] "); + sql.AppendFormat(" ,W.[WORKCELL_CODE] "); + sql.AppendFormat(" ,W.[WORKCELL_NAME] "); + sql.AppendFormat(" ,W.[WORKLOC_CODE] "); + sql.AppendFormat(" ,W.[REMARK] "); + sql.AppendFormat(" ,W.[EQPT_NAME] "); + sql.AppendFormat(" ,W.[EQPT_CODE] "); + sql.AppendFormat(" ,W.[STATE] "); + sql.AppendFormat(" ,W.[MOULD_CODE] "); + sql.AppendFormat(" ,W.[PRI] "); + sql.AppendFormat(" ,W.[UPDATEDATE] "); + sql.AppendFormat(" ,W.[PRINTED] "); + sql.AppendFormat(" ,P.[IGNORE_FISBREAK] "); + sql.AppendFormat(" ,P.[FIS_ASMSETCODE] "); + sql.AppendFormat(" FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) "); + sql.AppendFormat(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] "); + sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) "); + sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] "); + + sql.AppendFormat($" WHERE P.[ROUTE_CODE]='{routecode}' "); + + sql.AppendFormat(" AND W.[PRINTED]='0' "); + + if (!string.IsNullOrEmpty(Direction)) + { + sql.AppendFormat($" AND M.[MATERIAL_NAME] LIKE '%{Direction}后%' "); + } + if (!string.IsNullOrEmpty(SHIFTCODE)) + { + sql.AppendFormat($" AND W.[SHIFT_CODE] = '{SHIFTCODE}' "); + } + if (BeginTime != DateTime.MinValue.ToString()) + { + sql.AppendFormat($" AND W.[PLAN_DATE] >= '{Convert.ToDateTime(BeginTime).ToString("yyyy-MM-dd")} 00:00:00' "); + } + if (EndTime != DateTime.MinValue.ToString()) + { + sql.AppendFormat($" AND W.[PLAN_DATE] <= '{Convert.ToDateTime(EndTime).ToString("yyyy-MM-dd")} 23:59:59' "); + } + + switch (filter) + { + case 1: + { + sql.AppendFormat(" AND W.[STATE]<>4 "); + break; + } + case 2: + { + sql.AppendFormat(" AND W.[STATE]=4 "); + break; + } + } + sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],W.[ORDERPLAN_NO],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); + List parameters = new List(); + parameters.Add(new DataParameter("routecode", routecode)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + /// /// 获取指定工序的待完成计划数量 /// diff --git a/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplace.cs b/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplace.cs new file mode 100644 index 0000000..a06a5d1 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplace.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using QMFrameWork.Data.Attributes; +using QMAPP.Entity; +using System.ComponentModel; +using System.Data; + +namespace QMAPP.FJC.Entity.BZD +{ + /// + ///　模块名称：条码替换记录 + ///　作 者：张松男 + ///　编写日期：2022年11月07日 + /// + [DBTable(TableName = "T_AW_BarCodeReplace")] + public class BarCodeReplace : BaseEntity + { + /// + /// 主键 + /// + [DBColumn(ColumnName = "PID", DataType = DbType.String, IsKey = true)] + public string PID { get; set; } + + /// + /// 新条码 + /// + [DBColumn(ColumnName = "NewProductCode", DataType = DbType.String)] + public string NewProductCode { get; set; } + + /// + /// 旧条码 + /// + [DBColumn(ColumnName = "OldProductCode", DataType = DbType.String)] + public string OldProductCode { get; set; } + + + /// + /// 创建日期 + /// + [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.DateTime)] + public DateTime CREATEDATE { get; set; } + + + /// + /// 有效标志 + /// + [DBColumn(ColumnName = "FLGDEL", DataType = DbType.String)] + public string FLGDEL { get; set; } + } +} diff --git a/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs b/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs index 564af08..12a8ce9 100644 --- a/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs +++ b/APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs @@ -56,9 +56,9 @@ namespace QMAPP.FJC.Entity.Operation public string EndTime { get; set; } /// - ///停工、复工时间 + ///停工时间 /// - [DBColumn(ColumnName = "SIGNDATE", DataType = DbType.DateTime2)] + [DBColumn(ColumnName = "SIGNDATEBEGIN", DataType = DbType.DateTime2)] public string SIGNDATE { get; set; } } } diff --git a/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj b/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj index 475c9fc..f550968 100644 --- a/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj +++ b/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj @@ -97,6 +97,7 @@ + diff --git a/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs b/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs index c3a14cd..c0def88 100644 --- a/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs +++ b/APPQ5/QMAPP.FJC.TRACING/DataValidators/TimeValidator.cs @@ -31,10 +31,14 @@ namespace QMAPP.FJC.TRACING.DataValidators else { var preStatTime = DateTime.Now; + if (!DateTime.TryParse(dataRow["CheckColumnValue"].ToString(), out preStatTime)) + { + return new ValidateResult(false, $"检测值CheckColumnValue必须是DateTime类型"); + } DateTime serviceTime = dal.GetServiceDateTime(); TimeSpan ts = serviceTime.Subtract(preStatTime); - return new ValidateResult(false, $"未达到{timeCheck.Operator}{(Convert.ToDecimal(timeCheck.Check_Value) / 3600).ToString("#0.0")}小时验证标准"); + return new ValidateResult(false, $"未达到{timeCheck.Operator}{(Convert.ToDecimal(timeCheck.Check_Value) / 3600).ToString("#0.0")}小时验证标准,条码时间{(Convert.ToDecimal(ts.TotalSeconds) / 3600).ToString("#0.0")}小时"); } diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_1Exp.xlsx b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_1Exp.xlsx new file mode 100644 index 0000000..32568b1 Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_1Exp.xlsx differ diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_1Exp.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_1Exp.xml new file mode 100644 index 0000000..be67122 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_1Exp.xml @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_2Exp.xlsx b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_2Exp.xlsx new file mode 100644 index 0000000..5040f63 Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_2Exp.xlsx differ diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_2Exp.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_2Exp.xml new file mode 100644 index 0000000..c16513f --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/T_PA_INJ_1500T_2Exp.xml @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml index f49ce8f..07dbf1e 100644 --- a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml +++ b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml @@ -456,6 +456,14 @@ 导出 + + + 查询 + 新建 + 修改 + 删除 + + + diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/BarCodeReplaceController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/BarCodeReplaceController.cs new file mode 100644 index 0000000..d0894f9 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Controllers/BarCodeReplaceController.cs @@ -0,0 +1,204 @@ +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.Basic; +using QMFrameWork.Data; +using QMAPP.FJC.Entity.Basic; +using QMAPP.ServicesAgent; +using QMAPP.Entity; +using QMAPP.MD.Entity; +using QMAPP.MD.Web.Models; +using QMFrameWork.WebUI.DataSource; +using QMFrameWork.Common.Serialization; +using QMAPP.FJC.Web.Models.BZD; +using QMAPP.FJC.Entity.BZD; + +namespace QMAPP.FJC.Web.Controllers +{ + + public class BarCodeReplaceController : QController + { + #region 获取信息 + /// + /// 加载列表 + /// + /// 结果 + [HandleException] + public ActionResult List(bool? callback) + { + BarCodeReplaceModel seachModel = new BarCodeReplaceModel(); + if (callback == true) + TryGetSelectBuffer(out seachModel); + seachModel.rownumbers = false; + seachModel.url = "/BarCodeReplace/GetList"; + return View("BarCodeReplaceList", seachModel); + } + #endregion + + #region 获取列表 + /// + /// 获取列表 + /// + /// 是否回调 + /// 列表 + [HandleException] + public ActionResult GetList(bool? callBack) + { + BarCodeReplaceModel seachModel = null; + DataPage page = null; + ServiceAgent wcfAgent = this.GetServiceAgent(); + BarCodeReplace condition = null; + DataResult pageResult = new DataResult(); + try + { + //获取查询对象 + seachModel = GetModel(); + #region 获取缓存值 + if (callBack != null) + { + TryGetSelectBuffer(out seachModel); + } + else + { + //保存搜索条件 + SetSelectBuffer(seachModel); + } + #endregion + //获取前台分页设置信息 + page = this.GetDataPage(seachModel); + condition = CopyToModel(seachModel); + #region wcf服务统一接口 + + pageResult = wcfAgent.InvokeServiceFunction>("BarCodeReplaceBLL_GetList", condition, page); + if (pageResult.IsSuccess == false) + { + SetMessage(pageResult.Msg); + return List(true); + } + DateGridResult result = new DateGridResult(); + result.Total = pageResult.Result.RecordCount; + result.Rows = JsonConvertHelper.GetDeserialize>(pageResult.Result.Result.ToString()); + #endregion + return Content(result.GetJsonSource()); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 编辑 + /// + /// 编辑载入 + /// + /// 处理结果 + [HandleException] + public ActionResult Edit() + { + BarCodeReplaceModel model = new BarCodeReplaceModel(); + string ID = Request.Params["PID"]; + BarCodeReplace Entity = new BarCodeReplace(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + if (string.IsNullOrEmpty(ID) == false) + { + //修改获取原数据 + Entity.PID = ID; + result = wcfAgent.InvokeServiceFunction>("BarCodeReplaceBLL_Get", Entity); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return View("BarCodeReplaceEdit", model); + } + model = CopyToModel(result.Result); + } + return View("BarCodeReplaceEdit", model); + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 保存 + /// + /// + /// 处理结果 + [HttpPost] + [HandleException] + [ValidateInput(false)] + public ActionResult Save(BarCodeReplaceModel saveModel) + { + BarCodeReplace Entity = null; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + Entity = CopyToModel(saveModel); + if (string.IsNullOrEmpty(Entity.PID) == true) + { + //新增 + result = wcfAgent.InvokeServiceFunction>(QMAPP.ServicesAgent.DictService.BarCodeReplaceBLL_Insert.ToString(), Entity); + if (result.IsSuccess == false) + { + SetMessage("条码已存在！"); + return View("BarCodeReplaceEdit", saveModel); + } + } + else + { + //修改 + result = wcfAgent.InvokeServiceFunction>(QMAPP.ServicesAgent.DictService.BarCodeReplaceBLL_Update.ToString(), Entity); + if (result.IsSuccess == false) + { + SetMessage("条码已存在！"); + return View("BarCodeReplaceEdit", saveModel); + } + } + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge)); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 删除 + /// + /// 删除 + /// + /// 结果 + [HttpPost] + [HandleException] + public ActionResult Delete(BarCodeReplace model) + { + string selectKey = Request.Form["selectKey"]; + ServiceAgent wcfAgent = this.GetServiceAgent(); + + try + { + var result = wcfAgent.InvokeServiceFunction>(QMAPP.ServicesAgent.DictService.BarCodeReplaceBLL_Delete.ToString(), selectKey); + if (result.Result == 0) + { + SetMessage("信息有关联，删除失败！"); + return List(true); + } + SetMessage(AppResource.DeleteMessage); + return List(true); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + } +} diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs index b7796dc..c8e2f8e 100644 --- a/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs +++ b/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs @@ -34,7 +34,7 @@ namespace QMAPP.FJC.Web.Controllers StorageModel seachModel = new StorageModel(); if (callback == true) TryGetSelectBuffer(out seachModel); - seachModel.rownumbers = false; + seachModel.rownumbers = true; seachModel.url = "/Storage/GetList"; return View("StorageList", seachModel); } diff --git a/APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplaceModel.cs b/APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplaceModel.cs new file mode 100644 index 0000000..e5b34ba --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplaceModel.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc.Html; +using QMFrameWork.WebUI.Attribute; +using QMFrameWork.WebUI; + +namespace QMAPP.FJC.Web.Models.BZD +{ + /// + ///　模块名称：条码替换记录 + ///　作 者：张松男 + ///　编写日期：2022年11月07日 + /// + public class BarCodeReplaceModel : QDGModel + { + /// + /// 主键 + /// + [Description("主键")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 36)] + [DGColumn(Hidden = true, PrimaryKey = true)] + public string PID { get; set; } + + /// + /// 新条码 + /// + [Description("新条码")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)] + public string NewProductCode { get; set; } + + /// + /// 旧条码 + /// + [Description("旧条码")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)] + public string OldProductCode { get; set; } + + /// + /// 是否可用 + /// + [Description("是否可用")] + [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center,Hidden = true)] + public string FLGDEL { get; set; } + + /// + /// 创建日期 + /// + [Description("创建时间")] + [HTMLInput(UpdateRead = true, MaxLength = 20)] + [InputType(inputType.hidden)] + [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")] + public DateTime CREATEDATE { get; set; } + + } +} diff --git a/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs b/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs index 00b4575..9355076 100644 --- a/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs +++ b/APPQ5/QMAPP.FJC.Web/Models/CheckTime/ProductTimeModel.cs @@ -162,7 +162,23 @@ namespace QMAPP.FJC.Web.Models.CheckTime [DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")] public DateTime UPDATEDATE { get; set; } + /// + /// 采集点 + /// + [Description("采集点")] + [HTMLInput(UpdateRead = true, required = false, MaxLength = 200)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)] + public string DAI_Code { get; set; } + /// + /// 验证值2 + /// + [Description("验证值2")] + [HTMLInput(UpdateRead = false, required = false, MaxLength = 200)] + [InputType(inputType.text)] + [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)] + public string Check_ValueTo { get; set; } diff --git a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj index 0ba8901..6bf2734 100644 --- a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj +++ b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj @@ -160,6 +160,7 @@ + @@ -313,6 +314,7 @@ + @@ -410,6 +412,14 @@ + + Designer + Always + + + Designer + Always + Designer Always @@ -922,6 +932,8 @@ + + @@ -1314,6 +1326,9 @@ Always + + Always + Always @@ -1434,6 +1449,9 @@ Always + + Always + Always diff --git a/APPQ5/QMAPP.FJC.Web/Views/BarCodeReplace/BarCodeReplaceEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/BarCodeReplace/BarCodeReplaceEdit.aspx new file mode 100644 index 0000000..b715e77 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/BarCodeReplace/BarCodeReplaceEdit.aspx @@ -0,0 +1,60 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 设备信息编辑 + + + <%=Html.QPEdit("条码规则信息编辑", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%> + + + + +
+ + + + + + + + + +
+ <%=Html.QV(p=>p.NewProductCode) %> + + <%=Html.QC(p => p.NewProductCode)%> +
+ <%=Html.QV(p=>p.OldProductCode) %> + + <%=Html.QC(p => p.OldProductCode)%> +
+
+ <%=Html.HiddenFor(p => p.PID)%> + <%=Html.HiddenFor(p => p.CREATEDATE)%> + <%=Html.HiddenFor(p => p.FLGDEL)%> + <%=Html.QPEnd() %> + + + + + + + + + +
+ <%=Html.QTButtonSave("User", "Save", "return Save();")%> + <%=Html.QTButtonBack("close", "List", "parent.closeAppWindow1();return false;")%> +
+ + + diff --git a/APPQ5/QMAPP.FJC.Web/Views/BarCodeReplace/BarCodeReplaceList.aspx b/APPQ5/QMAPP.FJC.Web/Views/BarCodeReplace/BarCodeReplaceList.aspx new file mode 100644 index 0000000..10c43b0 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/BarCodeReplace/BarCodeReplaceList.aspx @@ -0,0 +1,94 @@ + <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + 条码规则信息列表 + + + + <%=Html.QPSeach(100,true) %> + + + + + + + + + + +
+ <%=Html.QV(p=>p.NewProductCode) %> + + <%=Html.QC(p => p.NewProductCode)%> + + <%=Html.QV(p => p.OldProductCode)%> + + <%=Html.QC(p => p.OldProductCode)%> +
+
+ + <%=Html.QPEnd()%> + <%=Html.QPList() %> + <%=Html.QDateGrid(Model)%> + <%=Html.QPEnd() %> + <%=Html.Hidden("PID")%> + <%=Html.Hidden("selectKey")%> + + + + + + + +
+ <%=Html.QTButtonSearch("BarCodeReplace", "List", "List(1)", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonAdd("BarCodeReplace", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonUpdate("BarCodeReplace", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonDelete("BarCodeReplace", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%> +
+ + diff --git a/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx index 9397360..0d27d2c 100644 --- a/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx +++ b/APPQ5/QMAPP.FJC.Web/Views/ProductTime/ProductTimeEdit.aspx @@ -75,6 +75,14 @@ <%=Html.QC(p => p.Check_Value)%> + + + + <%=Html.QV(p=>p.Check_ValueTo) %> + + + <%=Html.QC(p => p.Check_ValueTo)%> + @@ -108,7 +116,14 @@ <%=Html.QC(p => p.Remark)%> - + + + <%=Html.QV(p=>p.DAI_Code) %> + + + <%=Html.QC(p => p.DAI_Code)%> + + diff --git a/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx b/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx index 975e328..65b46f5 100644 --- a/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx +++ b/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx @@ -20,6 +20,12 @@ <%=Html.QC(p => p.MATERIALCODE)%> + + + <%=Html.QV(p => p.MATERIALNAME)%> + + + <%=Html.QC(p => p.MATERIALNAME)%> <%=Html.QV(p => p.BeginTime)%> diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index 6d0a56a..9307f2f 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -36,19 +36,20 @@ - + +--> - - - - - - - + + + @@ -106,7 +107,7 @@ diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 7b6a016..8a730dc 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -3,11 +3,11 @@ - + - - --> - - - - + + + + @@ -33,7 +35,7 @@ - + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs index d7e1c17..60638ca 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs @@ -29,6 +29,8 @@ namespace QMAPP.WinForm.Forms.TianJin infolabel.Text = ""; infolabel.ForeColor = Color.Red; _parentForm = parentForm; + + LoadAssyMaterial(); } #region 打印按钮 @@ -66,6 +68,12 @@ namespace QMAPP.WinForm.Forms.TianJin labeldata.Class = " " + book.Class.Substring(0, 2); labeldata.Description = book.Text; labeldata.OrderNo = book.CarModel + positioncode + data; + if (MATERIAL_CODE.Contains("018D")) + { + var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", MATERIAL_CODE.Substring(5,3).Trim()); + labeldata.Remark = bookS.Text; + } + } var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = MATERIAL_CODE }); var material = mcresult.IsSuccess ? mcresult.Result : null; @@ -112,7 +120,7 @@ namespace QMAPP.WinForm.Forms.TianJin } //OrderNo,OrderType,PlanDate,Name,Class,CarModel,Text1,Text2,Text3,Text4,Text5,Text6 - dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\",\"{12}\",\"{13}\",\"{14}\"\r\n", + dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\",\"{12}\",\"{13}\",\"{14}\",\"{15}\"\r\n", label.OrderNo,//计划号 label.OrderType,//计划类型(0:FIS,1:STOCK,2:INSERT) label.PlanDate,//计划日期 @@ -127,7 +135,8 @@ namespace QMAPP.WinForm.Forms.TianJin texts[5],//装配详细信息 texts[6],//装配详细信息 texts[7],//装配详细信息 - label.MATERIALCODE// + label.MATERIALCODE,// + label.Remark ); if (label.OrderNo.Contains("018D")) { @@ -154,56 +163,7 @@ namespace QMAPP.WinForm.Forms.TianJin #endregion } - //private void PrintLabel(List labeldata) - //{ - // #region 计划标签打印 - // //string xmlPath = System.Configuration.ConfigurationSettings.AppSettings["XmlName"].ToString(); ; - // //BarcodeLib.BarCodeGenerate g = new BarcodeLib.BarCodeGenerate( xmlPath); - // //bool b = g.PrintBarCode(_operationServiceParam.main.MAINCODE); - // QM.Assist.LabelInfo ll = new QM.Assist.LabelInfo(); - // StringBuilder dataline = new StringBuilder(); - // foreach (var label in labeldata) - // { - // string[] texts = new string[6]; - - // var sourcetext = label.Description.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries); - - // for (int i = 0; i < texts.Length && i < sourcetext.Length; i++) - // { - // texts[i] = sourcetext[i]; - // } - - // //OrderNo,OrderType,PlanDate,Name,Class,CarModel,Text1,Text2,Text3,Text4,Text5,Text6 - // dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\",\"{12}\"\r\n", - // label.OrderNo,//计划号 - // label.OrderType,//计划类型(0:FIS,1:STOCK,2:INSERT) - // label.PlanDate,//计划日期 - // label.MaterialName,//总成物料名称 - // label.Class,// - // label.CarModel,//车型 - // texts[0],//装配详细信息 - // texts[1],//装配详细信息 - // texts[2],//装配详细信息 - // texts[3],//装配详细信息 - // texts[4],//装配详细信息 - // texts[5],//装配详细信息 - // label.MATERIALCODE// - // ); - - - // } - - // ll.BarCode = dataline.ToString().TrimEnd('\r', '\n'); - // ll.PrinterName = ""; - // QM.Assist.PrintUtil.LabelList2.Add(ll); - // QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil(); - // pu.PrintLabel2(System.Configuration.ConfigurationManager.AppSettings["proPath"].ToString - // (), System.Configuration.ConfigurationManager.AppSettings["PlanLabelTMPPath"].ToString - // (), System.Configuration.ConfigurationManager.AppSettings["PlanLabelDATPath"].ToString - // ()); - - // #endregion - //} + public string GetNameCode(string Name) { @@ -233,12 +193,17 @@ namespace QMAPP.WinForm.Forms.TianJin /// private void PrintForm_Load(object sender, EventArgs e) { - _Material = _agent.InvokeServiceFunction>("MaterialBLL_GetMaterialList", new Material { REMARK = "REMARK" }); + + _Material = _agent.InvokeServiceFunction>("MaterialBLL_GetMaterialList", new Material { REMARK = Lines.Text }); foreach (var t in _Material) { t.MATERIAL_NAME = t.MATERIAL_CODE + "|" + t.MATERIAL_NAME; } - LoadAssyMaterial(); + //模腔号 + this.cbMaterial.DataSource = _Material; + this.cbMaterial.DisplayMember = "MATERIAL_NAME"; + this.cbMaterial.ValueMember = "MATERIAL_CODE"; + // } #endregion @@ -250,20 +215,28 @@ namespace QMAPP.WinForm.Forms.TianJin /// private void LoadAssyMaterial() { - - //模腔号 - this.cbMaterial.DataSource = _Material; - this.cbMaterial.DisplayMember = "MATERIAL_NAME"; - this.cbMaterial.ValueMember = "MATERIAL_CODE"; + var list = new List(); + list.Add(new Linese() { NAME = "018D", CODE = "018D" }); + list.Add(new Linese() { NAME = "770B", CODE = "770B" }); + this.Lines.DataSource = list; + this.Lines.DisplayMember = "NAME"; + this.Lines.ValueMember = "CODE"; } + public class Linese + { + public string NAME { get; set; } + public string CODE { get; set; } + } + + #endregion - #endregion private void label2_Click(object sender, EventArgs e) { } + } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs index 59e4e3d..6e03d34 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs @@ -35,24 +35,28 @@ namespace QMAPP.WinForm.Forms.TianJin this.infolabel = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.cbMaterial = new System.Windows.Forms.ComboBox(); + this.Lines = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // label1 // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(258, 58); + this.label1.Location = new System.Drawing.Point(344, 72); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(169, 37); + this.label1.Size = new System.Drawing.Size(212, 47); this.label1.TabIndex = 0; this.label1.Text = "条码补打"; // // button1 // this.button1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.button1.Location = new System.Drawing.Point(233, 257); + this.button1.Location = new System.Drawing.Point(311, 375); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(221, 35); + this.button1.Size = new System.Drawing.Size(295, 44); this.button1.TabIndex = 5; this.button1.Text = "打印"; this.button1.UseVisualStyleBackColor = true; @@ -63,18 +67,20 @@ namespace QMAPP.WinForm.Forms.TianJin this.infolabel.AutoSize = true; this.infolabel.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.infolabel.ForeColor = System.Drawing.Color.Red; - this.infolabel.Location = new System.Drawing.Point(63, 328); + this.infolabel.Location = new System.Drawing.Point(84, 410); + this.infolabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.infolabel.Name = "infolabel"; - this.infolabel.Size = new System.Drawing.Size(0, 31); + this.infolabel.Size = new System.Drawing.Size(0, 39); this.infolabel.TabIndex = 6; // // label5 // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(27, 164); + this.label5.Location = new System.Drawing.Point(37, 285); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(130, 24); + this.label5.Size = new System.Drawing.Size(163, 30); this.label5.TabIndex = 2; this.label5.Text = "门板物料号"; // @@ -83,21 +89,48 @@ namespace QMAPP.WinForm.Forms.TianJin this.cbMaterial.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbMaterial.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cbMaterial.FormattingEnabled = true; - this.cbMaterial.Location = new System.Drawing.Point(173, 152); + this.cbMaterial.Location = new System.Drawing.Point(232, 270); + this.cbMaterial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbMaterial.Name = "cbMaterial"; - this.cbMaterial.Size = new System.Drawing.Size(470, 36); + this.cbMaterial.Size = new System.Drawing.Size(625, 43); this.cbMaterial.TabIndex = 7; // + // Lines + // + this.Lines.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.Lines.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Lines.FormattingEnabled = true; + this.Lines.Location = new System.Drawing.Point(232, 167); + this.Lines.Margin = new System.Windows.Forms.Padding(4); + this.Lines.Name = "Lines"; + this.Lines.Size = new System.Drawing.Size(306, 43); + this.Lines.TabIndex = 9; + this.Lines.SelectedIndexChanged += new System.EventHandler(this.PrintForm_Load); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(86, 180); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(73, 30); + this.label2.TabIndex = 8; + this.label2.Text = "产线"; + // // PlanRePrintForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(665, 399); + this.ClientSize = new System.Drawing.Size(887, 499); + this.Controls.Add(this.Lines); + this.Controls.Add(this.label2); this.Controls.Add(this.cbMaterial); this.Controls.Add(this.infolabel); this.Controls.Add(this.button1); this.Controls.Add(this.label5); this.Controls.Add(this.label1); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "PlanRePrintForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "条码补打"; @@ -114,5 +147,7 @@ namespace QMAPP.WinForm.Forms.TianJin private System.Windows.Forms.Label infolabel; private System.Windows.Forms.Label label5; private System.Windows.Forms.ComboBox cbMaterial; + private System.Windows.Forms.ComboBox Lines; + private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index c86f8c3..646d52e 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -348,7 +348,7 @@ namespace QMAPP.WinForm.Forms.TianJin try { timeRefew.Enabled = true; - //UserBuffer.Interval = CtlApp.GetInterval(QM.Config.CustomConfig.GetItem("RefreshTime")); + //UserBuffer.Interval = CtlApp.GetInterval(QM.Convvvvvvvvvvvn'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'nfig.CustomConfig.GetItem("RefreshTime")); UserBuffer.Interval = CtlApp.GetInterval(QMAPP.WinForm.Common.LocalSetting.Settings["RefreshTime","20"]); timeRefew.Interval = UserBuffer.Interval; //BarcodeTime = int.Parse(QM.Config.CustomConfig.GetItem("BarcodeTime")); @@ -366,12 +366,20 @@ namespace QMAPP.WinForm.Forms.TianJin if (!string.IsNullOrEmpty(pFisType)) { if (pFisType.Equals("01")) + { + rb_hx.Checked = true; + } + else if(pFisType.Equals("02")) { rb_dx.Checked = true; } + else if (pFisType.Equals("03")) + { + ra_hx.Checked = true; + } else { - rb_dx.Checked = true; + ra_dx.Checked = true; } } @@ -776,6 +784,14 @@ namespace QMAPP.WinForm.Forms.TianJin { strprodtype = "( 右 )"; } + else if (pFisType == "03") + { + strprodtype = "( 前 )"; + } + else if (pFisType == "04") + { + strprodtype = "( 后 )"; + } //提交数据处理 foreach (DataRow dr in tbl.Rows) { @@ -987,12 +1003,20 @@ namespace QMAPP.WinForm.Forms.TianJin //#region "隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置" if (pFisType == "01") { - strprodtype = "( 混 )"; + strprodtype = "( 左 )"; } else if (pFisType == "02") { - strprodtype = "( 单 )"; + strprodtype = "( 右 )"; } + else if (pFisType == "03") + { + strprodtype = "( 前 )"; + } + else if (pFisType == "04") + { + strprodtype = "( 后 )"; + } prin.Print(rowindex, nfpastecard, strprodtype); ClearContainer(); GetInitData(); @@ -1195,31 +1219,60 @@ namespace QMAPP.WinForm.Forms.TianJin plan.LINENO = "770B"; else plan.LINENO = "018D"; - foreach (var s in "R,F".Split(',')) + if (plan.LINENO == "770B") { - plan.PID = Guid.NewGuid().ToString(); + foreach (var s in "R,F".Split(',')) + { + plan.PID = Guid.NewGuid().ToString(); - plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + s + mach.Substring(mach.Length - 1,1); + plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + s + mach.Substring(mach.Length - 1, 1); - foreach (var rule in _barcodeRules) - { - if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX)) + foreach (var rule in _barcodeRules) { - plan.MATERIAL_CODE = rule.MATERIAL_CODE; + if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX)) + { + plan.MATERIAL_CODE = rule.MATERIAL_CODE; + } + } + var RESULT = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_Insert", plan); + if (RESULT.IsSuccess == true) + { + agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_PutOut", plan.PID); } } - - var RESULT = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_Insert", plan); - if (RESULT.IsSuccess == true) + } + else + { + foreach (var s in "L,R".Split(',')) { - agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_PutOut", plan.PID); + plan.PID = Guid.NewGuid().ToString(); + //plan.MATERIAL_CODE = mach.Substring(0, 4)+"-"+ mach.Substring(4,3)+"-" + mach.Substring(mach.Length - 1, 1) + s; + plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + mach.Substring(mach.Length - 1, 1) + s; + + foreach (var rule in _barcodeRules) + { + if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX)) + { + plan.MATERIAL_CODE = rule.MATERIAL_CODE; + } + } + + var RESULT = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_Insert", plan); + if (RESULT.IsSuccess == true) + { + agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_PutOut", plan.PID); + } } } + txtCode.Text = ""; + txtCode.Focus(); return; } else { + txtCode.Text = ""; + txtCode.Focus(); return; } } @@ -1329,8 +1382,6 @@ namespace QMAPP.WinForm.Forms.TianJin return; #endregion - - } @@ -1445,8 +1496,6 @@ namespace QMAPP.WinForm.Forms.TianJin } if (signal != false) { - #region 去数据库查询相关产品信息，外来零件忽略此步骤 - #region 校验是否有重复的扫过的条码 //------------------校验是否有重复的扫过的条码------ @@ -1473,7 +1522,7 @@ namespace QMAPP.WinForm.Forms.TianJin FISDataCompare(Code, ProMaterial, MOULD_CODE); #endregion - #endregion + } else { @@ -2045,6 +2094,14 @@ namespace QMAPP.WinForm.Forms.TianJin { strprodtype = "( 右 )"; } + else if (pFisType == "03") + { + strprodtype = "( 前 )"; + } + else if (pFisType == "04") + { + strprodtype = "( 后 )"; + } DataTable dt = new DataTable(); dt.Columns.Add("ROWINDEX"); @@ -2297,38 +2354,87 @@ namespace QMAPP.WinForm.Forms.TianJin /// /// /// - int signal = 0; + //int signal = 0; private void rb_hx_CheckedChanged(object sender, EventArgs e) { if (dgvNF.Rows.Count > 0) { - if (rb_hx.Checked == true && signal == 0) - { - signal++; - rb_dx.Checked = true; - } - else if (rb_dx.Checked == true && signal == 0) - { - signal++; - rb_hx.Checked = true; - } lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; - signal = 0; return; } lberror.Text = ""; - QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = rb_hx.Checked ? "01" : "02"; - if (this.rb_hx.Checked == true) + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"]= "01"; + + //混 + pFisType = "01"; + WORKCENTER_CODE = "IPFY01"; + + GetInitData(); + GetLastPastCard(); + } + /// + /// 右侧门板 + /// + /// + /// + private void rb_dx_CheckedChanged(object sender, EventArgs e) + { + if (dgvNF.Rows.Count > 0) { - //混 - pFisType = "01"; - WORKCENTER_CODE = "IPFY01"; + lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; + return; } - else - { //单 - pFisType = "02"; - WORKCENTER_CODE = "IPFY02"; + lberror.Text = ""; + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "01"; + + //混 + pFisType = "02"; + WORKCENTER_CODE = "IPFY02"; + + GetInitData(); + GetLastPastCard(); + } + /// + /// 018前门 + /// + /// + /// + private void ra_hx_CheckedChanged(object sender, EventArgs e) + { + if (dgvNF.Rows.Count > 0) + { + lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; + return; + } + lberror.Text = ""; + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "03"; + + //混 + pFisType = "03"; + WORKCENTER_CODE = "IPFY03"; + + GetInitData(); + GetLastPastCard(); + } + /// + /// 018后门 + /// + /// + /// + private void ra_dx_CheckedChanged(object sender, EventArgs e) + { + if (dgvNF.Rows.Count > 0) + { + lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; + return; } + lberror.Text = ""; + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "04"; + + //混 + pFisType = "04"; + WORKCENTER_CODE = "IPFY04"; + GetInitData(); GetLastPastCard(); } @@ -2460,5 +2566,7 @@ namespace QMAPP.WinForm.Forms.TianJin else return null; } + + } } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs index 6725ecb..957df4e 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panel1 = new System.Windows.Forms.FlowLayoutPanel(); @@ -42,6 +42,8 @@ this.rb_hx = new System.Windows.Forms.RadioButton(); this.rb_dx = new System.Windows.Forms.RadioButton(); this.lblCount = new System.Windows.Forms.Label(); + this.ra_hx = new System.Windows.Forms.RadioButton(); + this.ra_dx = new System.Windows.Forms.RadioButton(); this.dgvMATChange = new System.Windows.Forms.DataGridView(); this.PLAN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.REQUESTID = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -56,6 +58,19 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel4 = new System.Windows.Forms.Panel(); this.dgvNF = new System.Windows.Forms.DataGridView(); + this.CODE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PRODNO_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.CARSETDESC_CN_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MOULDCODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.CREATEDATE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SEQ = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcPRODUCT_PID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tpContainer = new System.Windows.Forms.TableLayoutPanel(); this.panel3 = new System.Windows.Forms.FlowLayoutPanel(); this.btnPrint_NF = new System.Windows.Forms.Button(); @@ -75,19 +90,6 @@ this.timeRefew = new System.Windows.Forms.Timer(this.components); this.panel7 = new System.Windows.Forms.Panel(); this.panel8 = new System.Windows.Forms.Panel(); - this.CODE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PRODNO_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CARSETDESC_CN_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.MOULDCODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CREATEDATE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.SEQ = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgcPRODUCT_PID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -146,6 +148,8 @@ this.panel1.Controls.Add(this.rb_hx); this.panel1.Controls.Add(this.rb_dx); this.panel1.Controls.Add(this.lblCount); + this.panel1.Controls.Add(this.ra_hx); + this.panel1.Controls.Add(this.ra_dx); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; @@ -230,6 +234,7 @@ this.rb_dx.TabIndex = 6; this.rb_dx.Text = "右侧门板"; this.rb_dx.UseVisualStyleBackColor = true; + this.rb_dx.CheckedChanged += new System.EventHandler(this.rb_dx_CheckedChanged); // // lblCount // @@ -243,6 +248,28 @@ this.lblCount.TabIndex = 21; this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // ra_hx + // + this.ra_hx.AutoSize = true; + this.ra_hx.Location = new System.Drawing.Point(666, 3); + this.ra_hx.Name = "ra_hx"; + this.ra_hx.Size = new System.Drawing.Size(77, 16); + this.ra_hx.TabIndex = 22; + this.ra_hx.Text = "018前门板"; + this.ra_hx.UseVisualStyleBackColor = true; + this.ra_hx.CheckedChanged += new System.EventHandler(this.ra_hx_CheckedChanged); + // + // ra_dx + // + this.ra_dx.AutoSize = true; + this.ra_dx.Location = new System.Drawing.Point(3, 32); + this.ra_dx.Name = "ra_dx"; + this.ra_dx.Size = new System.Drawing.Size(77, 16); + this.ra_dx.TabIndex = 23; + this.ra_dx.Text = "018后门板"; + this.ra_dx.UseVisualStyleBackColor = true; + this.ra_dx.CheckedChanged += new System.EventHandler(this.ra_dx_CheckedChanged); + // // dgvMATChange // this.dgvMATChange.AllowUserToAddRows = false; @@ -261,18 +288,17 @@ this.PID, this.clscanstate, this.STATE}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle5; this.dgvMATChange.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvMATChange.Location = new System.Drawing.Point(0, 0); - this.dgvMATChange.MultiSelect = true; this.dgvMATChange.Name = "dgvMATChange"; this.dgvMATChange.ReadOnly = true; this.dgvMATChange.RowHeadersWidth = 40; @@ -423,15 +449,15 @@ this.Column11, this.Column13, this.dgcPRODUCT_PID}); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvNF.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvNF.DefaultCellStyle = dataGridViewCellStyle6; this.dgvNF.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvNF.Location = new System.Drawing.Point(0, 0); this.dgvNF.Name = "dgvNF"; @@ -443,6 +469,123 @@ this.dgvNF.Size = new System.Drawing.Size(460, 364); this.dgvNF.TabIndex = 0; // + // CODE_NF + // + this.CODE_NF.DataPropertyName = "SANBARCODE"; + this.CODE_NF.HeaderText = "条码号"; + this.CODE_NF.Name = "CODE_NF"; + this.CODE_NF.ReadOnly = true; + this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.CODE_NF.Width = 57; + // + // PRODNO_NF + // + this.PRODNO_NF.DataPropertyName = "PRODNO"; + this.PRODNO_NF.HeaderText = "零件号"; + this.PRODNO_NF.Name = "PRODNO_NF"; + this.PRODNO_NF.ReadOnly = true; + this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.PRODNO_NF.Width = 57; + // + // CARSETDESC_CN_NF + // + this.CARSETDESC_CN_NF.DataPropertyName = "CARSETDESC_CN"; + this.CARSETDESC_CN_NF.HeaderText = "总成描述"; + this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF"; + this.CARSETDESC_CN_NF.ReadOnly = true; + this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.CARSETDESC_CN_NF.Width = 69; + // + // MOULDCODE + // + this.MOULDCODE.DataPropertyName = "MOULDCODE"; + this.MOULDCODE.HeaderText = "位置"; + this.MOULDCODE.Name = "MOULDCODE"; + this.MOULDCODE.ReadOnly = true; + this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.MOULDCODE.Width = 45; + // + // CREATEDATE_NF + // + this.CREATEDATE_NF.DataPropertyName = "SCANDATE"; + this.CREATEDATE_NF.HeaderText = "扫描时间"; + this.CREATEDATE_NF.Name = "CREATEDATE_NF"; + this.CREATEDATE_NF.ReadOnly = true; + this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.CREATEDATE_NF.Width = 69; + // + // Column1 + // + this.Column1.DataPropertyName = "PASTEDETAILED_CARD_KEY"; + this.Column1.HeaderText = "Column1"; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + this.Column1.Visible = false; + this.Column1.Width = 82; + // + // SEQ + // + this.SEQ.DataPropertyName = "SEQ"; + this.SEQ.HeaderText = "SEQ"; + this.SEQ.Name = "SEQ"; + this.SEQ.ReadOnly = true; + this.SEQ.Visible = false; + this.SEQ.Width = 58; + // + // Column2 + // + this.Column2.DataPropertyName = "FIS_KEY"; + this.Column2.HeaderText = "Column2"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.Visible = false; + this.Column2.Width = 82; + // + // Column3 + // + this.Column3.DataPropertyName = "PASTE_CARD_KEY"; + this.Column3.HeaderText = "Column3"; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + this.Column3.Visible = false; + this.Column3.Width = 82; + // + // Column7 + // + this.Column7.DataPropertyName = "VIN"; + this.Column7.HeaderText = "Column7"; + this.Column7.Name = "Column7"; + this.Column7.ReadOnly = true; + this.Column7.Visible = false; + this.Column7.Width = 82; + // + // Column11 + // + this.Column11.DataPropertyName = "DGVROWINDEX"; + this.Column11.HeaderText = "Column11"; + this.Column11.Name = "Column11"; + this.Column11.ReadOnly = true; + this.Column11.Visible = false; + this.Column11.Width = 88; + // + // Column13 + // + this.Column13.DataPropertyName = "LINENO"; + this.Column13.HeaderText = "Column13"; + this.Column13.Name = "Column13"; + this.Column13.ReadOnly = true; + this.Column13.Visible = false; + this.Column13.Width = 88; + // + // dgcPRODUCT_PID + // + this.dgcPRODUCT_PID.DataPropertyName = "PRODUCT_PID"; + this.dgcPRODUCT_PID.HeaderText = "产品主键"; + this.dgcPRODUCT_PID.Name = "dgcPRODUCT_PID"; + this.dgcPRODUCT_PID.ReadOnly = true; + this.dgcPRODUCT_PID.Visible = false; + this.dgcPRODUCT_PID.Width = 88; + // // tpContainer // this.tpContainer.BackColor = System.Drawing.SystemColors.ControlDark; @@ -650,123 +793,6 @@ this.panel8.Size = new System.Drawing.Size(1239, 50); this.panel8.TabIndex = 19; // - // CODE_NF - // - this.CODE_NF.DataPropertyName = "SANBARCODE"; - this.CODE_NF.HeaderText = "条码号"; - this.CODE_NF.Name = "CODE_NF"; - this.CODE_NF.ReadOnly = true; - this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CODE_NF.Width = 57; - // - // PRODNO_NF - // - this.PRODNO_NF.DataPropertyName = "PRODNO"; - this.PRODNO_NF.HeaderText = "零件号"; - this.PRODNO_NF.Name = "PRODNO_NF"; - this.PRODNO_NF.ReadOnly = true; - this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.PRODNO_NF.Width = 57; - // - // CARSETDESC_CN_NF - // - this.CARSETDESC_CN_NF.DataPropertyName = "CARSETDESC_CN"; - this.CARSETDESC_CN_NF.HeaderText = "总成描述"; - this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF"; - this.CARSETDESC_CN_NF.ReadOnly = true; - this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CARSETDESC_CN_NF.Width = 69; - // - // MOULDCODE - // - this.MOULDCODE.DataPropertyName = "MOULDCODE"; - this.MOULDCODE.HeaderText = "位置"; - this.MOULDCODE.Name = "MOULDCODE"; - this.MOULDCODE.ReadOnly = true; - this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.MOULDCODE.Width = 45; - // - // CREATEDATE_NF - // - this.CREATEDATE_NF.DataPropertyName = "SCANDATE"; - this.CREATEDATE_NF.HeaderText = "扫描时间"; - this.CREATEDATE_NF.Name = "CREATEDATE_NF"; - this.CREATEDATE_NF.ReadOnly = true; - this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CREATEDATE_NF.Width = 69; - // - // Column1 - // - this.Column1.DataPropertyName = "PASTEDETAILED_CARD_KEY"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Visible = false; - this.Column1.Width = 82; - // - // SEQ - // - this.SEQ.DataPropertyName = "SEQ"; - this.SEQ.HeaderText = "SEQ"; - this.SEQ.Name = "SEQ"; - this.SEQ.ReadOnly = true; - this.SEQ.Visible = false; - this.SEQ.Width = 58; - // - // Column2 - // - this.Column2.DataPropertyName = "FIS_KEY"; - this.Column2.HeaderText = "Column2"; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.Visible = false; - this.Column2.Width = 82; - // - // Column3 - // - this.Column3.DataPropertyName = "PASTE_CARD_KEY"; - this.Column3.HeaderText = "Column3"; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - this.Column3.Visible = false; - this.Column3.Width = 82; - // - // Column7 - // - this.Column7.DataPropertyName = "VIN"; - this.Column7.HeaderText = "Column7"; - this.Column7.Name = "Column7"; - this.Column7.ReadOnly = true; - this.Column7.Visible = false; - this.Column7.Width = 82; - // - // Column11 - // - this.Column11.DataPropertyName = "DGVROWINDEX"; - this.Column11.HeaderText = "Column11"; - this.Column11.Name = "Column11"; - this.Column11.ReadOnly = true; - this.Column11.Visible = false; - this.Column11.Width = 88; - // - // Column13 - // - this.Column13.DataPropertyName = "LINENO"; - this.Column13.HeaderText = "Column13"; - this.Column13.Name = "Column13"; - this.Column13.ReadOnly = true; - this.Column13.Visible = false; - this.Column13.Width = 88; - // - // dgcPRODUCT_PID - // - this.dgcPRODUCT_PID.DataPropertyName = "PRODUCT_PID"; - this.dgcPRODUCT_PID.HeaderText = "产品主键"; - this.dgcPRODUCT_PID.Name = "dgcPRODUCT_PID"; - this.dgcPRODUCT_PID.ReadOnly = true; - this.dgcPRODUCT_PID.Visible = false; - this.dgcPRODUCT_PID.Width = 88; - // // TJFrmPlace // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -860,5 +886,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column11; private System.Windows.Forms.DataGridViewTextBoxColumn Column13; private System.Windows.Forms.DataGridViewTextBoxColumn dgcPRODUCT_PID; + private System.Windows.Forms.RadioButton ra_hx; + private System.Windows.Forms.RadioButton ra_dx; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs index d0370f6..7bad796 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs @@ -78,6 +78,7 @@ this.dtpCREATEDATESTART = new DateTimePickerA(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.SelectStripButton = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit(); this.tpContent.SuspendLayout(); this.tpPlanList.SuspendLayout(); @@ -273,6 +274,7 @@ this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SelectStripButton, this.toolStripButton2, this.toolStripButton1, this.tsbPrint, @@ -341,7 +343,7 @@ this.tsmiSuspendOrder.Image = global::QMAPP.WinForm.Resource1.stop; this.tsmiSuspendOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); this.tsmiSuspendOrder.Name = "tsmiSuspendOrder"; - this.tsmiSuspendOrder.Size = new System.Drawing.Size(144, 26); + this.tsmiSuspendOrder.Size = new System.Drawing.Size(184, 26); this.tsmiSuspendOrder.Text = "挂起工单"; this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click); @@ -351,7 +353,7 @@ this.tsmiCancelSuspend.Image = global::QMAPP.WinForm.Resource1.back; this.tsmiCancelSuspend.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); this.tsmiCancelSuspend.Name = "tsmiCancelSuspend"; - this.tsmiCancelSuspend.Size = new System.Drawing.Size(144, 26); + this.tsmiCancelSuspend.Size = new System.Drawing.Size(184, 26); this.tsmiCancelSuspend.Text = "取消挂起"; this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click); // @@ -360,7 +362,7 @@ this.tsmiDeleteOrder.Image = global::QMAPP.WinForm.Resource1.delete; this.tsmiDeleteOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); this.tsmiDeleteOrder.Name = "tsmiDeleteOrder"; - this.tsmiDeleteOrder.Size = new System.Drawing.Size(144, 26); + this.tsmiDeleteOrder.Size = new System.Drawing.Size(184, 26); this.tsmiDeleteOrder.Text = "删除工单"; this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click); // @@ -446,7 +448,6 @@ // // timer1 // - this.timer1.Enabled = true; this.timer1.Interval = 1000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // @@ -543,6 +544,18 @@ this.label5.TabIndex = 22; this.label5.Text = "至"; // + // SelectStripButton + // + this.SelectStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.SelectStripButton.Font = new System.Drawing.Font("微软雅黑", 12F); + this.SelectStripButton.Image = ((System.Drawing.Image)(resources.GetObject("SelectStripButton.Image"))); + this.SelectStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.SelectStripButton.ImageTransparentColor = System.Drawing.Color.White; + this.SelectStripButton.Name = "SelectStripButton"; + this.SelectStripButton.Size = new System.Drawing.Size(94, 67); + this.SelectStripButton.Text = "刷新"; + this.SelectStripButton.Click += new System.EventHandler(this.SelectStripButton_Click); + // // TJPrintPlanLabel // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); @@ -619,5 +632,6 @@ private DateTimePickerA dtpCREATEDATESTART; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label5; + private System.Windows.Forms.ToolStripButton SelectStripButton; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs index 5bfdcc9..392545b 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -23,6 +23,7 @@ namespace QMAPP.WinForm.Forms.TianJin List cbsource = null; private string planMATERIAL_CODE = string.Empty; + private string FR = string.Empty; /// /// @@ -116,20 +117,41 @@ namespace QMAPP.WinForm.Forms.TianJin dataPage.PageSize = int.Parse(cbListRowcount.Text); dataPage.PageIndex = 1; dataPage.SortExpression = " ROWVALUE ASC"; - //操作开始时间 - //if (string.IsNullOrEmpty(this.dtpCREATEDATESTART.Text.Trim()) == false) - //{ - // searchModel.BeginTime = Convert.ToDateTime((this.dtpCREATEDATESTART.Value).ToString("yyyy-MM-dd") + " 00:00:00"); - //} - ////操作结束时间 - //if (string.IsNullOrEmpty(this.dtpCREATEDATEEND.Text.Trim()) == false) - //{ - // searchModel.EndTime = Convert.ToDateTime((this.dtpCREATEDATEEND.Value).ToString("yyyy-MM-dd") + " 23:59:59"); - //} - #region 服务查询 - var orderlist = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); - #endregion - this.dgvPlan.DataSource = orderlist; + + if (cbRoutes.Text.Contains("018D")) + { + var count = Convert.ToInt32(cbListRowcount.Text) / 2; + var orderlist =new List(); + var orderlistF = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted018DF", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); + var orderlistR = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted018DR", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); + for (var i = 0; i < count; i++) + { + if (string.IsNullOrEmpty(FR) || FR == "前") + { + if (i < orderlistF.Count) + orderlist.Add(orderlistF[i]); + if (i < orderlistR.Count) + orderlist.Add(orderlistR[i]); + } + else if (FR == "后") + { + if (i < orderlistR.Count) + orderlist.Add(orderlistR[i]); + if (i < orderlistF.Count) + orderlist.Add(orderlistF[i]); + } + } + this.dgvPlan.DataSource = orderlist; + + } + else + { + #region 服务查询 + var orderlist = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); + #endregion + this.dgvPlan.DataSource = orderlist; + } + } catch (Exception ex) { @@ -169,7 +191,7 @@ namespace QMAPP.WinForm.Forms.TianJin { if (!tsbOrderOperation.DropDown.Visible) { - timecounter += 1; + timecounter = 1; if (timecounter > int.Parse("20"))//计时达到刷新时间 { BindPlanView(); @@ -200,7 +222,7 @@ namespace QMAPP.WinForm.Forms.TianJin } //OrderNo,OrderType,PlanDate,Name,Class,CarModel,Text1,Text2,Text3,Text4,Text5,Text6 - dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\",\"{12}\",\"{13}\",\"{14}\"\r\n", + dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\",\"{12}\",\"{13}\",\"{14}\",\"{15}\"\r\n", label.OrderNo,//计划号 label.OrderType,//计划类型(0:FIS,1:STOCK,2:INSERT) label.PlanDate,//计划日期 @@ -215,7 +237,8 @@ namespace QMAPP.WinForm.Forms.TianJin texts[5],//装配详细信息 texts[6],//装配详细信息 texts[7],//装配详细信息 - label.MATERIALCODE// + label.MATERIALCODE,// + label.Remark ); if (label.OrderNo.Contains("018D")) { @@ -477,6 +500,16 @@ namespace QMAPP.WinForm.Forms.TianJin var orders = new List(); orders.Add(order1); + if (dgvPlan.Rows.Count > 1) + { + var orders2 = new List(); + var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem; + orders2.Add(order2); + if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))&& !orders[0].MATERIAL_CODE.Contains("018D")) + { + MessageBox.Show("计划工单即将变换配置，请注意！"); + } + } List labels = new List(); @@ -497,6 +530,11 @@ namespace QMAPP.WinForm.Forms.TianJin labeldata.Class = " " + book.CarModel.Substring(book.CarModel.Length-3, 3); labeldata.Description = book.Text; labeldata.OrderNo = book.CarModel + positioncode + data; + if (orders[0].MATERIAL_CODE.Contains("018D")) + { + var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", labeldata.Class.Trim()); + labeldata.Remark = bookS.Text; + } } var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = orders[0].MATERIAL_CODE }); var material = mcresult.IsSuccess ? mcresult.Result : null; @@ -509,7 +547,7 @@ namespace QMAPP.WinForm.Forms.TianJin WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo); - PrintLabel(labels); + //PrintLabel(labels); WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo); @@ -521,7 +559,10 @@ namespace QMAPP.WinForm.Forms.TianJin InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); - + if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前")) + FR = "后"; + else if(orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后")) + FR = "前"; BindPlanView(); tsbPrint.Enabled = true; @@ -640,13 +681,24 @@ namespace QMAPP.WinForm.Forms.TianJin for (var i = 0; i < count; i++) { - System.Threading.Thread.Sleep(3000); + System.Threading.Thread.Sleep(1000); var orders = new List(); var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i].DataBoundItem; orders.Add(order1); + if ((i+1)< count) + { + var orders2 = new List(); + var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i + 1].DataBoundItem; + orders2.Add(order2); + if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) && !orders[0].MATERIAL_CODE.Contains("018D")) + { + MessageBox.Show("计划工单即将变换配置，请注意！"); + } + } + toolStripButton1.Enabled = false; List labels = new List(); @@ -668,6 +720,12 @@ namespace QMAPP.WinForm.Forms.TianJin labeldata.Class = " " + book.Class.Substring(0, 2); labeldata.Description = book.Text; labeldata.OrderNo = book.CarModel + positioncode + data; + if (orders[0].MATERIAL_CODE.Contains("018D")) + { + var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", orders[0].MATERIAL_CODE.Substring(5,3).Trim()); + labeldata.Remark = bookS.Text; + } + } var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = orders[0].MATERIAL_CODE }); var material = mcresult.IsSuccess ? mcresult.Result : null; @@ -678,18 +736,21 @@ namespace QMAPP.WinForm.Forms.TianJin } labels.Add(labeldata); - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo); + //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo); - PrintLabel(labels); + //PrintLabel(labels); - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo); + //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo); //变更打印状态 0=>1 _agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", orders[0].PID); - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始插入记录" + labeldata.OrderNo); + //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始插入记录" + labeldata.OrderNo); InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); - - WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); + if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前")) + FR = "后"; + else if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后")) + FR = "前"; + //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); } BindPlanView(); @@ -711,6 +772,15 @@ namespace QMAPP.WinForm.Forms.TianJin { BindPlanView(); } + /// + /// 刷新 + /// + /// + /// + private void SelectStripButton_Click(object sender, EventArgs e) + { + BindPlanView(); + } } class Direction { public string Code { get; set; } @@ -733,5 +803,7 @@ namespace QMAPP.WinForm.Forms.TianJin public string CarModel { get; set; } public object[] OrderType { get; set; } + + public string Remark { get; set; } } } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx index 07453f3..f1b8096 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx @@ -154,6 +154,76 @@ 17, 17 + + + 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 + Ae6xxmll7eSUAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index edc92b8..0f4c43f 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2022.10.14.01")] -[assembly: AssemblyFileVersion("2022.10.14.01")] +[assembly: AssemblyVersion("2023.01.02.02")] +[assembly: AssemblyFileVersion("2023.01.02.02")] diff --git a/APPQ5/QMAPP.WinForm/Properties/app.manifest b/APPQ5/QMAPP.WinForm/Properties/app.manifest new file mode 100644 index 0000000..8981e8d --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Properties/app.manifest @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj index 97a3cc4..7bf0ade 100644 --- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj +++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj @@ -73,7 +73,7 @@ - true + false false @@ -88,6 +88,12 @@ QMSetupKey.pfx + + LocalIntranet + + + Properties\app.manifest + True @@ -95,9 +101,15 @@ ..\..\DLL\BarcodeLib.dll - - - + + ..\..\DLL\CrystalDecisions.CrystalReports.Engine.dll + + + ..\..\DLL\CrystalDecisions.ReportSource.dll + + + ..\..\DLL\CrystalDecisions.Shared.dll + False ..\..\DLL\FastReport\FastReport.dll @@ -1513,6 +1525,7 @@ Always + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs index 62ac63e..9220a4c 100644 --- a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs +++ b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs @@ -228,6 +228,28 @@ namespace QMAPP.ServicesAgent [Description("基础数据方法枚举")] public enum DictService { + #region 条码替换记录 + + /// + /// 插入 + /// + [Description("插入")] + BarCodeReplaceBLL_Insert, + + /// + /// 更新 + /// + [Description("更新")] + BarCodeReplaceBLL_Update, + + /// + /// 删除 + /// + [Description("删除")] + BarCodeReplaceBLL_Delete, + + #endregion + #region 天津库存 /// diff --git a/DLL/CrystalDecisions.CrystalReports.Engine.dll b/DLL/CrystalDecisions.CrystalReports.Engine.dll new file mode 100644 index 0000000..1d62c24 Binary files /dev/null and b/DLL/CrystalDecisions.CrystalReports.Engine.dll differ diff --git a/DLL/CrystalDecisions.ReportSource.dll b/DLL/CrystalDecisions.ReportSource.dll new file mode 100644 index 0000000..2d2b9f8 Binary files /dev/null and b/DLL/CrystalDecisions.ReportSource.dll differ diff --git a/DLL/CrystalDecisions.Shared.dll b/DLL/CrystalDecisions.Shared.dll new file mode 100644 index 0000000..fbb8dac Binary files /dev/null and b/DLL/CrystalDecisions.Shared.dll differ diff --git a/Exchange/QM.ServiceHost/QM.ServiceHost.csproj b/Exchange/QM.ServiceHost/QM.ServiceHost.csproj index 703702a..0950d10 100644 --- a/Exchange/QM.ServiceHost/QM.ServiceHost.csproj +++ b/Exchange/QM.ServiceHost/QM.ServiceHost.csproj @@ -18,6 +18,21 @@ SAK SAK SAK + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true x86 @@ -138,7 +153,13 @@ QM.Exchange.Core - + + + False + .NET Framework 3.5 SP1 + false + + - + diff --git a/ServicesCenter/WCF/MsgSendService/App.config b/ServicesCenter/WCF/MsgSendService/App.config index 8139e15..56ed977 100644 --- a/ServicesCenter/WCF/MsgSendService/App.config +++ b/ServicesCenter/WCF/MsgSendService/App.config @@ -10,7 +10,7 @@ - + diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml index dd4ebfa..98104e1 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml @@ -995,4 +995,11 @@ QMAPP.FJC.BLL.dll + + BarCodeReplaceBLL + 条码替换记录 + QMAPP.FJC.BLL.BZD.BarCodeReplaceBLL + QMAPP.FJC.BLL.dll + + \ No newline at end of file diff --git a/ServicesCenter/WindowsServices/OpcService/app.config b/ServicesCenter/WindowsServices/OpcService/app.config index a92e36e..eba0984 100644 --- a/ServicesCenter/WindowsServices/OpcService/app.config +++ b/ServicesCenter/WindowsServices/OpcService/app.config @@ -10,7 +10,7 @@ - +