11

7 months ago · c78ebb4eaf
6 changed files with 2252 additions and 0 deletions
--- a/APPQ5/QMAPP.FJC.BLL/FIS/PaoMoDoorPlankPlanBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/FIS/PaoMoDoorPlankPlanBLL.cs
--- a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
+++ b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
@ -138,6 +138,7 @@
    <Compile Include="Equipment\WSHelper.cs" />
    <Compile Include="FileCopy\FileCopyRecordBLL.cs" />
    <Compile Include="FIS\DashBoardPlanBLL.cs" />
+    <Compile Include="FIS\PaoMoDoorPlankPlanBLL.cs" />
    <Compile Include="FIS\DoorPlankPlanBLL.cs" />
    <Compile Include="FIS\FisBLL.cs" />
    <Compile Include="FIS\FISInfoBLL.cs" />
--- a/APPQ5/QMAPP.FJC.Entity/FIS/PaoMoOrderPlan.cs
+++ b/APPQ5/QMAPP.FJC.Entity/FIS/PaoMoOrderPlan.cs
@ -0,0 +1,207 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMFrameWork.Data.Attributes;
+using System.Data;
+using QMAPP.Entity;
+
+
+namespace QMAPP.FJC.Entity.FIS
+{
+    /// <summary>
+    /// 工单计划——泡沫
+    /// </summary>
+    [DBTable(TableName = "T_PP_ORDERPLAN_PAOMO", TimeStampColumn = "UPDATEDATE")]
+    public class PaoMoOrderPlan : BaseEntity
+    {
+        ///<summary>
+        ///
+        ///</summary>
+        [DBColumn(ColumnName = "PID", DataType = DbType.String, IsKey = true)]
+        public string PID { get; set; }
+        public string PIDList { get; set; }
+        ///<summary>
+        ///工厂编号
+        ///</summary>
+        [DBColumn(ColumnName = "FACTORY_CODE", DataType = DbType.String)]
+        public string FACTORY_CODE { get; set; }
+
+
+        ///<summary>
+        ///计划单号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_NO", DataType = DbType.String)]
+        public string PLAN_NO { get; set; }
+
+
+        ///<summary>
+        ///计划顺序号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_SEQ", DataType = DbType.String)]
+        public String PLAN_SEQ { get; set; }
+
+
+        ///<summary>
+        ///计划状态
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_STATE", DataType = DbType.String)]
+        public string PLAN_STATE { get; set; }
+        public string PLAN_STATES { get; set; }
+
+
+        ///<summary>
+        ///物料号
+        ///</summary>
+        [DBColumn(ColumnName = "MATERIAL_CODE", DataType = DbType.String)]
+        public string MATERIAL_CODE { get; set; }
+
+        ///<summary>
+        ///设备编号
+        ///</summary>
+        [DBColumn(ColumnName = "MACHINECODDE", DataType = DbType.String)]
+        public string MACHINECODDE { get; set; }
+
+        ///<summary>
+        ///PBOM编号
+        ///</summary>
+        [DBColumn(ColumnName = "PBOM_CODE", DataType = DbType.String)]
+        public string PBOM_CODE { get; set; }
+
+
+        ///<summary>
+        ///工艺路线
+        ///</summary>
+        [DBColumn(ColumnName = "ROUTE_CODE", DataType = DbType.String)]
+        public string ROUTE_CODE { get; set; }
+
+
+        ///<summary>
+        ///描述
+        ///</summary>
+        [DBColumn(ColumnName = "REMARK", DataType = DbType.String)]
+        public string REMARK { get; set; }
+
+
+        ///<summary>
+        ///计划数量
+        ///</summary>
+        [DBColumn(ColumnName = "QTY", DataType = DbType.String)]
+        public int QTY { get; set; }
+
+
+        ///<summary>
+        ///完成数量
+        ///</summary>
+        [DBColumn(ColumnName = "COMPLETE_QTY", DataType = DbType.String)]
+        public int COMPLETE_QTY { get; set; }
+
+
+        ///<summary>
+        ///计划日期
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_DATE", DataType = DbType.DateTime)]
+        public DateTime PLAN_DATE { get; set; }
+
+        ///<summary>
+        ///班次编码
+        ///</summary>
+        [DBColumn(ColumnName = "SHIFT_CODE", DataType = DbType.String)]
+        public string SHIFT_CODE { get; set; }
+
+        ///<summary>
+        ///计划来源
+        ///0:FIS 1:建储 2：插单
+        ///</summary>
+        [DBColumn(ColumnName = "PLANSOURCE", DataType = DbType.String)]
+        public string PLANSOURCE { get; set; }
+
+        ///<summary>
+        ///工作中心
+        ///</summary>
+        [DBColumn(ColumnName = "WORKCENTER_CODE", DataType = DbType.String)]
+        public string WORKCENTER_CODE { get; set; }
+
+        ///<summary>
+        ///生产要求
+        ///</summary>
+        [DBColumn(ColumnName = "PRODUCEREQUIRE", DataType = DbType.String)]
+        public string PRODUCEREQUIRE { get; set; }
+
+        public string FACTORY_NAME { get; set; }
+        public string MATERIAL_NAME { get; set; }
+        public string SHIFT_NAME { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEUSER", DataType = DbType.String)]
+        public string CREATEUSER { get; set; }
+        public string CREATEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.DateTime, DefaultValue = DataDefaultValue.SysDate)]
+        public DateTime CREATEDATE { get; set; }
+
+        /// <summary>
+        /// 更新用户
+        /// </summary>
+        [DBColumn(ColumnName = "UPDATEUSER", DataType = DbType.String)]
+        public string UPDATEUSER { get; set; }
+        public string UPDATEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.DateTime)]
+        public DateTime UPDATEDATE { get; set; }
+
+        /// <summary>
+        /// 忽略FIS断号
+        /// </summary>
+        [DBColumn(ColumnName = "IGNORE_FISBREAK", DataType = DbType.String)]
+        public string IGNORE_FISBREAK { get; set; }
+
+        /// <summary>
+        /// FIS短语字典代码
+        /// </summary>
+        [DBColumn(ColumnName = "FIS_ASMSETCODE", DataType = DbType.String)]
+        public string FIS_ASMSETCODE { get; set; }
+
+        ///// 错误信息
+        ///// </summary>
+        //public string InfoError { get; set; }
+        ///// <summary>
+        ///// 导入时判断添加修改
+        ///// </summary>
+        //public bool IsNewInfo { get; set; }
+
+        public string ORDER_TYPE { get; set; }
+
+        public DateTime PLANTIMESTART { get; set; }
+
+        public DateTime PLANTIMEEND { get; set; }
+
+
+        [DBColumn(ColumnName = "STARTTIME", DataType = DbType.DateTime)]
+        public DateTime STARTTIME { get; set; }
+
+        [DBColumn(ColumnName = "ENDTIME", DataType = DbType.DateTime)]
+        public DateTime ENDTIME { get; set; }
+
+        public string STARTTIMEVIEW { get; set; }
+
+        public string ENDTIMEVIEW { get; set; }
+
+        public string STARTTIMEIN { get; set; }
+
+        public string ENDTIMEIN { get; set; }
+
+        public string PLAN_DATEIN { get; set; }
+
+
+        public string AsmSetCode { get; set; }
+    }
+}
--- a/APPQ5/QMAPP.FJC.Entity/FIS/ZhuSuOrderPlan.cs
+++ b/APPQ5/QMAPP.FJC.Entity/FIS/ZhuSuOrderPlan.cs
@ -0,0 +1,207 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMFrameWork.Data.Attributes;
+using System.Data;
+using QMAPP.Entity;
+
+
+namespace QMAPP.FJC.Entity.FIS
+{
+    /// <summary>
+    /// 工单计划
+    /// </summary>
+    [DBTable(TableName = "T_PP_ORDERPLAN_ZHUSU", TimeStampColumn = "UPDATEDATE")]
+    public class ZhuSuOrderPlan : BaseEntity
+    {
+        ///<summary>
+        ///
+        ///</summary>
+        [DBColumn(ColumnName = "PID", DataType = DbType.String, IsKey = true)]
+        public string PID { get; set; }
+        public string PIDList { get; set; }
+        ///<summary>
+        ///工厂编号
+        ///</summary>
+        [DBColumn(ColumnName = "FACTORY_CODE", DataType = DbType.String)]
+        public string FACTORY_CODE { get; set; }
+
+
+        ///<summary>
+        ///计划单号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_NO", DataType = DbType.String)]
+        public string PLAN_NO { get; set; }
+
+
+        ///<summary>
+        ///计划顺序号
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_SEQ", DataType = DbType.String)]
+        public String PLAN_SEQ { get; set; }
+
+
+        ///<summary>
+        ///计划状态
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_STATE", DataType = DbType.String)]
+        public string PLAN_STATE { get; set; }
+        public string PLAN_STATES { get; set; }
+
+
+        ///<summary>
+        ///物料号
+        ///</summary>
+        [DBColumn(ColumnName = "MATERIAL_CODE", DataType = DbType.String)]
+        public string MATERIAL_CODE { get; set; }
+
+        ///<summary>
+        ///设备编号
+        ///</summary>
+        [DBColumn(ColumnName = "MACHINECODDE", DataType = DbType.String)]
+        public string MACHINECODDE { get; set; }
+
+        ///<summary>
+        ///PBOM编号
+        ///</summary>
+        [DBColumn(ColumnName = "PBOM_CODE", DataType = DbType.String)]
+        public string PBOM_CODE { get; set; }
+
+
+        ///<summary>
+        ///工艺路线
+        ///</summary>
+        [DBColumn(ColumnName = "ROUTE_CODE", DataType = DbType.String)]
+        public string ROUTE_CODE { get; set; }
+
+
+        ///<summary>
+        ///描述
+        ///</summary>
+        [DBColumn(ColumnName = "REMARK", DataType = DbType.String)]
+        public string REMARK { get; set; }
+
+
+        ///<summary>
+        ///计划数量
+        ///</summary>
+        [DBColumn(ColumnName = "QTY", DataType = DbType.String)]
+        public int QTY { get; set; }
+
+
+        ///<summary>
+        ///完成数量
+        ///</summary>
+        [DBColumn(ColumnName = "COMPLETE_QTY", DataType = DbType.String)]
+        public int COMPLETE_QTY { get; set; }
+
+
+        ///<summary>
+        ///计划日期
+        ///</summary>
+        [DBColumn(ColumnName = "PLAN_DATE", DataType = DbType.DateTime)]
+        public DateTime PLAN_DATE { get; set; }
+
+        ///<summary>
+        ///班次编码
+        ///</summary>
+        [DBColumn(ColumnName = "SHIFT_CODE", DataType = DbType.String)]
+        public string SHIFT_CODE { get; set; }
+
+        ///<summary>
+        ///计划来源
+        ///0:FIS 1:建储 2：插单
+        ///</summary>
+        [DBColumn(ColumnName = "PLANSOURCE", DataType = DbType.String)]
+        public string PLANSOURCE { get; set; }
+
+        ///<summary>
+        ///工作中心
+        ///</summary>
+        [DBColumn(ColumnName = "WORKCENTER_CODE", DataType = DbType.String)]
+        public string WORKCENTER_CODE { get; set; }
+
+        ///<summary>
+        ///生产要求
+        ///</summary>
+        [DBColumn(ColumnName = "PRODUCEREQUIRE", DataType = DbType.String)]
+        public string PRODUCEREQUIRE { get; set; }
+
+        public string FACTORY_NAME { get; set; }
+        public string MATERIAL_NAME { get; set; }
+        public string SHIFT_NAME { get; set; }
+
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEUSER", DataType = DbType.String)]
+        public string CREATEUSER { get; set; }
+        public string CREATEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.DateTime, DefaultValue = DataDefaultValue.SysDate)]
+        public DateTime CREATEDATE { get; set; }
+
+        /// <summary>
+        /// 更新用户
+        /// </summary>
+        [DBColumn(ColumnName = "UPDATEUSER", DataType = DbType.String)]
+        public string UPDATEUSER { get; set; }
+        public string UPDATEUSERNAME { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.DateTime)]
+        public DateTime UPDATEDATE { get; set; }
+
+        /// <summary>
+        /// 忽略FIS断号
+        /// </summary>
+        [DBColumn(ColumnName = "IGNORE_FISBREAK", DataType = DbType.String)]
+        public string IGNORE_FISBREAK { get; set; }
+
+        /// <summary>
+        /// FIS短语字典代码
+        /// </summary>
+        [DBColumn(ColumnName = "FIS_ASMSETCODE", DataType = DbType.String)]
+        public string FIS_ASMSETCODE { get; set; }
+
+        ///// 错误信息
+        ///// </summary>
+        //public string InfoError { get; set; }
+        ///// <summary>
+        ///// 导入时判断添加修改
+        ///// </summary>
+        //public bool IsNewInfo { get; set; }
+
+        public string ORDER_TYPE { get; set; }
+
+        public DateTime PLANTIMESTART { get; set; }
+
+        public DateTime PLANTIMEEND { get; set; }
+
+
+        [DBColumn(ColumnName = "STARTTIME", DataType = DbType.DateTime)]
+        public DateTime STARTTIME { get; set; }
+
+        [DBColumn(ColumnName = "ENDTIME", DataType = DbType.DateTime)]
+        public DateTime ENDTIME { get; set; }
+
+        public string STARTTIMEVIEW { get; set; }
+
+        public string ENDTIMEVIEW { get; set; }
+
+        public string STARTTIMEIN { get; set; }
+
+        public string ENDTIMEIN { get; set; }
+
+        public string PLAN_DATEIN { get; set; }
+
+
+        public string AsmSetCode { get; set; }
+    }
+}
--- a/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
+++ b/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
@ -134,6 +134,8 @@
    <Compile Include="Equipment\AlarmTable.cs" />
    <Compile Include="FIS\FISAssembly.cs" />
    <Compile Include="FIS\FISPhraseBook.cs" />
+    <Compile Include="FIS\ZhuSuOrderPlan.cs" />
+    <Compile Include="FIS\PaoMoOrderPlan.cs" />
    <Compile Include="FIS\OrderPlanSerial.cs" />
    <Compile Include="FIS\OrderPlanTrace.cs" />
    <Compile Include="Injection\InjectHole.cs" />
--- a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
+++ b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
@ -314,6 +314,38 @@
    </Actions>
  </MenuItem>

+  <MenuItem MenuID="02070000" SystemID="FJC" MenuDes="泡沫计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02070000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02070001">查询</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02070002">添加</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="AddWholeDoor" PowerID="CD02070003">整车添加</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Edit" PowerID="CD02070004">修改</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="EditDoorPlankPlanSeq" PowerID="CD02070011">修改计划顺序号</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Insert" PowerID="CD02070005">插单</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Delete" PowerID="CD02070006">删除</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="PutOut" PowerID="CD02070007">发布</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ImportExcel" PowerID="CD02070008">导入</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ExportExcel" PowerID="CD02070009">导出</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="TemplateExcel" PowerID="CD02070010">下载模板</Action>
+    </Actions>
+  </MenuItem>
+
+  <MenuItem MenuID="02080000" SystemID="FJC" MenuDes="注塑计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02080000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02080001">查询</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02080002">添加</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="AddWholeDoor" PowerID="CD02080003">整车添加</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Edit" PowerID="CD02080004">修改</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="EditDoorPlankPlanSeq" PowerID="CD02080011">修改计划顺序号</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Insert" PowerID="CD02080005">插单</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Delete" PowerID="CD02080006">删除</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="PutOut" PowerID="CD02080007">发布</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ImportExcel" PowerID="CD02080008">导入</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ExportExcel" PowerID="CD02080009">导出</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="TemplateExcel" PowerID="CD02080010">下载模板</Action>
+    </Actions>
+  </MenuItem>
+
  <MenuItem MenuID="02040000" SystemID="FJC" MenuDes="仪表板计划管理"   Action="/DashBoardPlan/List?ORDER_TYPE=DASHBOARD" Target="url" PowerID="CD02040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
    <Actions>
      <Action ContorllerName="DashBoardPlan" ActionName="List" PowerID="CD02040001">查询</Action>