Merge branch 'master' of https://e.coding.net/ccwin-in/Adient/CD-MES

APP/QMAPP.Web/App_Data/MainPower.xml

@@ -292,23 +292,27 @@
 
   <PowerInfo PowerID="CD14050000" PowerDes="料筒信息" PowerType="" ActionList="" Visible="true" Seq="1" SuperID="CD14000000"/>
   <PowerInfo PowerID="CD14050001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD14050000"/>
-  <PowerInfo PowerID="CD14050002" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14050000"/>
+  <PowerInfo PowerID="CD14050004" PowerDes="添加" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14050000"/>
-  <PowerInfo PowerID="CD14050003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14050000"/>
+  <PowerInfo PowerID="CD14050002" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14050000"/>
+  <PowerInfo PowerID="CD14050003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="4" SuperID="CD14050000"/>
 
   <PowerInfo PowerID="CD14090000" PowerDes="料筒绑定" PowerType="" ActionList="" Visible="true" Seq="1" SuperID="CD14000000"/>
   <PowerInfo PowerID="CD14090001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD14090000"/>
-  <PowerInfo PowerID="CD14090002" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14090000"/>
+  <PowerInfo PowerID="CD14090004" PowerDes="添加" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14090000"/>
-  <PowerInfo PowerID="CD14090003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14090000"/>
+  <PowerInfo PowerID="CD14090002" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14090000"/>
+  <PowerInfo PowerID="CD14090003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="4" SuperID="CD14090000"/>
 
   <PowerInfo PowerID="CD14080000" PowerDes="零件号绑定" PowerType="" ActionList="" Visible="true" Seq="1" SuperID="CD14000000"/>
   <PowerInfo PowerID="CD14080001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD14080000"/>
-  <PowerInfo PowerID="CD14080002" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14080000"/>
+  <PowerInfo PowerID="CD14080004" PowerDes="添加" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14080000"/>
-  <PowerInfo PowerID="CD14080003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14080000"/>
+  <PowerInfo PowerID="CD14080002" PowerDes="修改" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14080000"/>
+  <PowerInfo PowerID="CD14080003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="4" SuperID="CD14080000"/>
 
   <PowerInfo PowerID="CD14060000" PowerDes="注塑投料查询" PowerType="" ActionList="" Visible="true" Seq="1" SuperID="CD14000000"/>
   <PowerInfo PowerID="CD14060001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD14060000"/>
-  <PowerInfo PowerID="CD14060002" PowerDes="修改批次号" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14060000"/>
+  <PowerInfo PowerID="CD14060004" PowerDes="添加" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD14060000"/>
-  <PowerInfo PowerID="CD14060003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14060000"/>
+  <PowerInfo PowerID="CD14060002" PowerDes="修改批次号" PowerType="button" ActionList="" Visible="true" Seq="3" SuperID="CD14060000"/>
+  <PowerInfo PowerID="CD14060003" PowerDes="删除" PowerType="button" ActionList="" Visible="true" Seq="4" SuperID="CD14060000"/>
 
   <PowerInfo PowerID="CD14070000" PowerDes="注塑打印记录" PowerType="" ActionList="" Visible="true" Seq="1" SuperID="CD14000000"/>
   <PowerInfo PowerID="CD14070001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD14070000"/>

APP/QMAPP.Web/App_Data/Menu.xml

@@ -489,6 +489,7 @@
   <MenuItem MenuID="14050000" SystemID="FJC" MenuDes="料筒信息" Action="/BucketInfo/List" Target="url" PowerID="CD14050000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
     <Actions>
       <Action ContorllerName="BucketInfo" ActionName="List" PowerID="CD14050001">查询</Action>
+      <Action ContorllerName="BucketInfo" ActionName="Add" PowerID="CD14050004">添加</Action>
       <Action ContorllerName="BucketInfo" ActionName="Update" PowerID="CD14050002">修改</Action>
       <Action ContorllerName="BucketInfo" ActionName="Delete" PowerID="CD14050003">删除</Action>
     </Actions>
@@ -497,6 +498,7 @@
   <MenuItem MenuID="14090000" SystemID="FJC" MenuDes="料筒绑定" Action="/BucketMaterial/List" Target="url" PowerID="CD14090000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
     <Actions>
       <Action ContorllerName="BucketMaterial" ActionName="List" PowerID="CD14090001">查询</Action>
+      <Action ContorllerName="BucketMaterial" ActionName="Add" PowerID="CD14090004">添加</Action>
       <Action ContorllerName="BucketMaterial" ActionName="Update" PowerID="CD14090002">修改</Action>
       <Action ContorllerName="BucketMaterial" ActionName="Delete" PowerID="CD14090003">删除</Action>
     </Actions>
@@ -504,6 +506,7 @@
   <MenuItem MenuID="14080000" SystemID="FJC" MenuDes="零件号绑定" Action="/BucketMaterialClass/List" Target="url" PowerID="CD14080000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
     <Actions>
       <Action ContorllerName="BucketMaterialClass" ActionName="List" PowerID="CD14080001">查询</Action>
+      <Action ContorllerName="BucketMaterialClass" ActionName="Add" PowerID="CD14080004">添加</Action>
       <Action ContorllerName="BucketMaterialClass" ActionName="Update" PowerID="CD14080002">修改</Action>
       <Action ContorllerName="BucketMaterialClass" ActionName="Delete" PowerID="CD14080003">删除</Action>
     </Actions>
@@ -511,6 +514,7 @@
   <MenuItem MenuID="14060000" SystemID="FJC" MenuDes="注塑投料查询" Action="/RawMaterial/List" Target="url" PowerID="CD14060000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
     <Actions>
       <Action ContorllerName="RawMaterial" ActionName="List" PowerID="CD14060001">查询</Action>
+      <Action ContorllerName="RawMaterial" ActionName="Add" PowerID="CD14060004">添加</Action>
       <Action ContorllerName="RawMaterial" ActionName="Update" PowerID="CD14060002">修改批次号</Action>
       <Action ContorllerName="RawMaterial" ActionName="Delete" PowerID="CD14060003">删除</Action>
     </Actions>

APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml

@@ -253,6 +253,12 @@
       <Action  ContorllerName="BarCodeReplacement" ActionName="List"  PowerID="CD03891001">查询</Action>
     </Actions>
   </MenuItem>
+  <MenuItem MenuID="03892000" MenuDes="生产配置" SystemID="FJC"  Action="/AppConfig/List" Target="url" PowerID="CD03892000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="03000000" Seq="1">
+    <Actions>
+      <Action  ContorllerName="AppConfig" ActionName="List"  PowerID="CD03892001">查询</Action>
+      <Action  ContorllerName="AppConfig" ActionName="Edit"  PowerID="CD03892003">修改</Action>
+    </Actions>
+  </MenuItem>
   <!--<MenuItem MenuID="03810000" MenuDes="物料分类信息" SystemID="MainData"  Action="/MaterialClass/List" Target="url" PowerID="CD03810000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="03000000" Seq="1">
     <Actions>
       <Action  ContorllerName="MaterialClass" ActionName="List"  PowerID="CD03810001">查询</Action>
@@ -285,21 +291,23 @@
       <Action ContorllerName="OrderPlan" ActionName="TemplateExcel" PowerID="CD02020008">下载模板</Action>
     </Actions>
   </MenuItem>-->
-  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+  <!--TJDoorPlankPlanPrint   DoorPlankPlan-->
-    <Actions>
+  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
-      <Action ContorllerName="DoorPlankPlan" ActionName="List" PowerID="CD02030001">查询</Action>
+    <Actions>
-      <Action ContorllerName="DoorPlankPlan" ActionName="Add" PowerID="CD02030002">添加</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02030001">查询</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="AddWholeDoor" PowerID="CD02030003">整车添加</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02030002">添加</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="Edit" PowerID="CD02030004">修改</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="AddWholeDoor" PowerID="CD02030003">整车添加</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="EditDoorPlankPlanSeq" PowerID="CD02030011">修改计划顺序号</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Edit" PowerID="CD02030004">修改</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="Insert" PowerID="CD02030005">插单</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="EditDoorPlankPlanSeq" PowerID="CD02030011">修改计划顺序号</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="Delete" PowerID="CD02030006">删除</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Insert" PowerID="CD02030005">插单</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="PutOut" PowerID="CD02030007">发布</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Delete" PowerID="CD02030006">删除</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="ImportExcel" PowerID="CD02030008">导入</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="PutOut" PowerID="CD02030007">发布</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ImportExcel" PowerID="CD02030008">导入</Action>
-      <Action ContorllerName="DoorPlankPlan" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
+      <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</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>
@@ -320,6 +328,22 @@
     </Actions>
   </MenuItem>
 
+  <MenuItem MenuID="02060000" SystemID="FJC" MenuDes="TJ门板发运计划"   Action="/TJDoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02060000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="DoorPlankPlan" ActionName="List" PowerID="CD02060001">查询</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Add" PowerID="CD02060002">添加</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="AddWholeDoor" PowerID="CD02060003">整车添加</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Edit" PowerID="CD02060004">修改</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="EditDoorPlankPlanSeq" PowerID="CD02060011">修改计划顺序号</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Insert" PowerID="CD02060005">插单</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Delete" PowerID="CD02060006">删除</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="PutOut" PowerID="CD02060007">发布</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="ImportExcel" PowerID="CD02060008">导入</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="ExportExcel" PowerID="CD02060009">导出</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="TemplateExcel" PowerID="CD02060010">下载模板</Action>
+    </Actions>
+  </MenuItem>
+
   <MenuItem MenuID="05000000" SystemID="Main" MenuDes="物料管理" Action="" PowerID="CD05000000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="" Seq="2">
     <Actions>
     </Actions>
@@ -401,6 +425,23 @@
       <Action ContorllerName="MainOperation" ActionName="ExportExcel" PowerID="CD10030002">导出</Action>
     </Actions>
   </MenuItem>
+  <MenuItem MenuID="10050000" SystemID="FJC" MenuDes="表皮称重" Action="/TSWeighRecore/List" Target="url" PowerID="CD10050000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="TSWeighRecore" ActionName="List" PowerID="CD10030001">查询</Action>
+    </Actions>
+  </MenuItem>
+  <MenuItem MenuID="10060000" SystemID="FJC" MenuDes="库存信息" Action="/Storage/List" Target="url" PowerID="CD10060000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="Storage" ActionName="List" PowerID="CD10060001">查询</Action>
+      <Action ContorllerName="Storage" ActionName="ExportExcel" PowerID="CD10060002">导出</Action>
+    </Actions>
+  </MenuItem>
+  <MenuItem MenuID="10070000" SystemID="FJC" MenuDes="出入库记录" Action="/StorageLog/List" Target="url" PowerID="CD10070000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="StorageLog" ActionName="List" PowerID="CD10070001">查询</Action>
+      <Action ContorllerName="StorageLog" ActionName="ExportExcel" PowerID="CD10070002">导出</Action>
+    </Actions>
+  </MenuItem>
   <!--<MenuItem MenuID="10040000" SystemID="FJC" MenuDes="生产进度查询" Action="" Target="url" PowerID="CD10040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">
     <Actions>
     </Actions>
@@ -421,13 +462,13 @@
     </Actions>
   </MenuItem>
 
-  <MenuItem MenuID="14010000" SystemID="FJC" MenuDes="注塑投料查询" Action="/InJectionRecorder/List?recordtype=1" Target="url" PowerID="CD14010000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
+  <!--<MenuItem MenuID="14010000" SystemID="FJC" MenuDes="注塑投料查询" Action="/InJectionRecorder/List?recordtype=1" Target="url" PowerID="CD14010000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
     <Actions>
       <Action ContorllerName="InJectionRecorder" ActionName="List" PowerID="CD14010001">查询</Action>
       <Action ContorllerName="InJectionRecorder" ActionName="Update" PowerID="CD14010002">修改批次号</Action>
       <Action ContorllerName="InJectionRecorder" ActionName="Delete" PowerID="CD14010003">删除</Action>
     </Actions>
-  </MenuItem>
+  </MenuItem>-->
 
   <MenuItem MenuID="14030000" SystemID="FJC" MenuDes="搪塑投料查询" Action="/InJectionRecorder/List?recordtype=0" Target="url" PowerID="CD14030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
     <Actions>
@@ -445,6 +486,45 @@
     </Actions>
   </MenuItem>
 
+  <MenuItem MenuID="14050000" SystemID="FJC" MenuDes="料筒信息" Action="/BucketInfo/List" Target="url" PowerID="CD14050000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="BucketInfo" ActionName="List" PowerID="CD14050001">查询</Action>
+      <Action ContorllerName="BucketInfo" ActionName="Add" PowerID="CD14050004">添加</Action>
+      <Action ContorllerName="BucketInfo" ActionName="Update" PowerID="CD14050002">修改</Action>
+      <Action ContorllerName="BucketInfo" ActionName="Delete" PowerID="CD14050003">删除</Action>
+    </Actions>
+  </MenuItem>
+
+  <MenuItem MenuID="14090000" SystemID="FJC" MenuDes="料筒绑定" Action="/BucketMaterial/List" Target="url" PowerID="CD14090000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="BucketMaterial" ActionName="List" PowerID="CD14090001">查询</Action>
+      <Action ContorllerName="BucketMaterial" ActionName="Add" PowerID="CD14090004">添加</Action>
+      <Action ContorllerName="BucketMaterial" ActionName="Update" PowerID="CD14090002">修改</Action>
+      <Action ContorllerName="BucketMaterial" ActionName="Delete" PowerID="CD14090003">删除</Action>
+    </Actions>
+  </MenuItem>
+  <MenuItem MenuID="14080000" SystemID="FJC" MenuDes="零件号绑定" Action="/BucketMaterialClass/List" Target="url" PowerID="CD14080000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="BucketMaterialClass" ActionName="List" PowerID="CD14080001">查询</Action>
+      <Action ContorllerName="BucketMaterialClass" ActionName="Add" PowerID="CD14080004">添加</Action>
+      <Action ContorllerName="BucketMaterialClass" ActionName="Update" PowerID="CD14080002">修改</Action>
+      <Action ContorllerName="BucketMaterialClass" ActionName="Delete" PowerID="CD14080003">删除</Action>
+    </Actions>
+  </MenuItem>
+  <MenuItem MenuID="14060000" SystemID="FJC" MenuDes="注塑投料查询" Action="/RawMaterial/List" Target="url" PowerID="CD14060000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="RawMaterial" ActionName="List" PowerID="CD14060001">查询</Action>
+      <Action ContorllerName="RawMaterial" ActionName="Add" PowerID="CD14060004">添加</Action>
+      <Action ContorllerName="RawMaterial" ActionName="Update" PowerID="CD14060002">修改批次号</Action>
+      <Action ContorllerName="RawMaterial" ActionName="Delete" PowerID="CD14060003">删除</Action>
+    </Actions>
+  </MenuItem>
+  <MenuItem MenuID="14070000" SystemID="FJC" MenuDes="注塑打印记录" Action="/RawMaterialRecord/List" Target="url" PowerID="CD14070000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="14000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="RawMaterialRecord" ActionName="List" PowerID="CD14070001">查询</Action>
+    </Actions>
+  </MenuItem>
+
   <!--<MenuItem MenuID="15000000" SystemID="Main" MenuDes="能源管理" Action="" PowerID="CD15000000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="" Seq="2">
     <Actions>
     </Actions>