1
yangle
2023-12-25 f96739d5368fcbd2c31f6b4bb1f79cef400923f1
1
12个文件已修改
744 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 114 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_SellOutBillList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ICMOBillQualityStatus_TmpList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ICMOBillWorkQtyStatus_TmpList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html 455 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_Add_EqpConkBookBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
      <publishTime>01/28/2016 14:22:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>12/20/2023 09:37:30</publishTime>
      <publishTime>12/20/2023 13:29:50</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>12/20/2023 09:37:30</publishTime>
      <publishTime>12/20/2023 13:29:50</publishTime>
    </File>
    <File Include="HtmlPage1.html">
      <publishTime>04/11/2023 16:34:42</publishTime>
@@ -915,16 +915,16 @@
      <publishTime>07/21/2023 16:12:43</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_InspectInstruMentList.html">
      <publishTime>08/22/2023 16:34:18</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_InspectValueList.html">
      <publishTime>08/03/2023 11:11:59</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_LineCenter.html">
      <publishTime>07/21/2023 16:28:04</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_MaterialList.html">
      <publishTime>09/22/2023 14:03:35</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_MaterialList_LSQP.html">
      <publishTime>07/21/2023 16:14:46</publishTime>
@@ -957,10 +957,10 @@
      <publishTime>07/21/2023 16:16:39</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_QCCheckProjectListView.html">
      <publishTime>07/21/2023 16:16:55</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_RepairList.html">
      <publishTime>07/21/2023 16:17:11</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_RoutingBillList.html">
      <publishTime>09/14/2023 13:59:10</publishTime>
@@ -969,7 +969,7 @@
      <publishTime>07/21/2023 16:17:49</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_SampleSchemeListView.html">
      <publishTime>08/03/2023 11:11:59</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_ScrapReasonList.html">
      <publishTime>07/21/2023 16:18:07</publishTime>
@@ -999,7 +999,7 @@
      <publishTime>07/21/2023 16:20:42</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_UnitList.html">
      <publishTime>12/20/2023 10:27:11</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_WarehouseList.html">
      <publishTime>12/20/2023 10:28:07</publishTime>
@@ -1533,25 +1533,25 @@
      <publishTime>08/27/2021 14:42:06</publishTime>
    </File>
    <File Include="views/PublicPage/DeptInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/DeptInformation_PDA.html">
      <publishTime>11/16/2023 11:08:40</publishTime>
    </File>
    <File Include="views/PublicPage/EqpInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/FaultReasonInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/FaultTypeInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/GroupInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/Gy_Maintain.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/Gy_MaterType.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -1584,7 +1584,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/PublicPage/PartInformation.html">
      <publishTime>09/12/2023 16:41:17</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/PeopleInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -1608,10 +1608,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/PublicPage/RepairCheckItemInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/RepairItemInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/RepairItemInformation_PDA.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
@@ -1623,19 +1623,19 @@
      <publishTime>08/27/2021 14:42:06</publishTime>
    </File>
    <File Include="views/PublicPage/SourceInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/SupplierInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/transfer.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/PublicPage/UnitInformation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/UserInformation.html">
      <publishTime>07/24/2023 08:33:13</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/PublicPage/UserInformation_PDA.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
@@ -2190,31 +2190,31 @@
      <publishTime>09/06/2023 13:38:37</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent.html">
      <publishTime>07/21/2023 16:45:36</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent_Edit.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent.html">
      <publishTime>07/21/2023 16:45:36</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent_Edit.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent.html">
      <publishTime>07/21/2023 16:45:36</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent_Edit.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipType.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipTypeEdit.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipType.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipTypeEdit.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -2403,7 +2403,7 @@
      <publishTime>05/19/2023 09:24:32</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Kf_SellOutBillList.aspx">
      <publishTime>11/12/2023 22:04:14</publishTime>
      <publishTime>12/20/2023 13:23:33</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx">
      <publishTime>12/12/2023 23:54:38</publishTime>
@@ -2538,7 +2538,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/基础资料/基础资料/Gy_DotCheckList.html">
      <publishTime>07/24/2023 08:06:01</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/基础资料/基础资料/Gy_EquipStatus.html">
      <publishTime>07/24/2023 08:06:42</publishTime>
@@ -2787,7 +2787,7 @@
      <publishTime>09/18/2023 15:40:42</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_Source.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessDetail.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -3828,7 +3828,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html">
      <publishTime>07/24/2023 08:52:38</publishTime>
@@ -4050,10 +4050,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpConkBookBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpMaintenanceBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpMaintenanceBillList_PDA.html">
      <publishTime>11/16/2023 11:08:40</publishTime>
@@ -4104,7 +4104,7 @@
      <publishTime>12/01/2023 15:22:04</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillEdit.html">
      <publishTime>12/01/2023 15:22:04</publishTime>
@@ -4131,7 +4131,7 @@
      <publishTime>12/01/2023 15:22:04</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainPlanBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipRepairCheckBillList_PDA.html">
      <publishTime>11/16/2023 11:08:40</publishTime>
@@ -4233,7 +4233,7 @@
      <publishTime>11/28/2023 12:03:19</publishTime>
    </File>
    <File Include="views/设备管理/设备规程单/Sb_EquipDotCheckRuleList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/设备规程单/Sb_EquipDotCheckRuleList_PDA.html">
      <publishTime>11/16/2023 11:08:40</publishTime>
@@ -4245,7 +4245,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/设备管理/设备规程单/Sb_EquipMaintainRuleList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/产品入库检验单/Kf_ProductInCheckBill_Fast.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4275,7 +4275,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -4302,16 +4302,16 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_FirstPassRateReport.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_FirstPassRateWeekReport.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_ProdBadReasonStatistics.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_ProdBadReasonStatistics_Sum.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_ProductQtyWarningReport.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
@@ -4320,16 +4320,16 @@
      <publishTime>12/13/2023 00:09:29</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_FirstPassRateReport.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_FirstPassRateWeekReport.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_ProdBadReasonStatistics.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_ProdBadReasonStatistics_Sum.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/质量报表/QC_ProductQtyWarningReport.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
@@ -4344,7 +4344,7 @@
      <publishTime>07/20/2021 01:15:26</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -4359,10 +4359,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpConkBookBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpMaintenanceBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpRepairCheckBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
@@ -4377,7 +4377,7 @@
      <publishTime>12/01/2023 15:22:04</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillEdit.html">
      <publishTime>12/01/2023 15:22:04</publishTime>
@@ -4389,7 +4389,7 @@
      <publishTime>12/01/2023 15:22:04</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainPlanBillList.html">
      <publishTime>11/08/2023 09:01:07</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/设备管理/Sc_Add_MouldDotCheckBillList.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4410,7 +4410,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -4428,7 +4428,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -4461,7 +4461,7 @@
      <publishTime>11/28/2023 12:03:19</publishTime>
    </File>
    <File Include="views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html">
      <publishTime>12/13/2023 00:09:29</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/车间管理/单品过站/RetrospectiveQueryReport.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
@@ -4521,7 +4521,7 @@
      <publishTime>09/02/2023 18:53:25</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>12/20/2023 10:55:06</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBillSubList.html">
      <publishTime>09/14/2023 13:59:10</publishTime>
@@ -5007,7 +5007,7 @@
      <publishTime>11/30/2023 11:42:53</publishTime>
    </File>
    <File Include="views/销售管理/销售退货单/Add_Edit_Kf_ICStockBillMainList.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>12/20/2023 11:38:42</publishTime>
    </File>
    <File Include="views/销售管理/销售退货单/Kf_ICStockBillMainList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -5334,7 +5334,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>12/20/2023 09:37:36</publishTime>
      <publishTime>12/20/2023 13:29:55</publishTime>
    </File>
  </ItemGroup>
</Project>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Kf_SellOutBillList.aspx
@@ -15,7 +15,7 @@
        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_SellOutBillList where hmainid=" + Request.Params["linterid"]);
        SqlXMLReportData.GenOneRecordset(this, "exec h_p_Kf_SellOutBillList_PrintSellOutBill " + Request.Params["linterid"]);
    }
</script>
</head>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldConkBookBillList.html
@@ -728,7 +728,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../PublicPage/UserInformation.html', 'yes'],
                                content: ['../../Baseset/基础资料/Gy_EmployeeList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html
@@ -883,18 +883,29 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {
                            //    if (data.Verify == "Y") //自动审核
                            //    {
                            //        layer.close(index);
                            //        SaveVerify(); //审核
                            //    }
                            //    else {
                            //        layer.close(index);
                            //    }
                            //});
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html
@@ -184,6 +184,25 @@
            //#endregion
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //初始化表格
@@ -193,9 +212,12 @@
                    elem: '#mainTable'
                    , height: 'full-50'
                    , page: true
                    , limit:500
                    , totalRow: true
                    , limits: [100, 500, 1000, 2000]
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
                        , { field: 'HDate', title: '日期', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: 'HBillNo', title: '单据号', width: 200 }
@@ -212,7 +234,7 @@
                        , { field: 'HMaterCode', title: '产品代码', width: 200 }
                        , { field: 'HMaterName', title: '产品名称', width: 200 }
                        , { field: 'HMaterSpec', title: '产品规格', width: 200 }
                        , { field: 'HQty', title: '汇报数量', width: 200 }
                        , { field: 'HQty', title: '汇报数量', width: 200, totalRow: true }
                        , { field: 'HSourceID', title: '生产资源ID', width: 200, hide: true }
                        , { field: 'HSourceCode', title: '生产资源代码', width: 200 }
                        , { field: 'HSourceName', title: '生产资源', width: 200 }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ICMOBillQualityStatus_TmpList.html
@@ -297,10 +297,10 @@
            }
            if (HDate) {
                sWhere += " and åˆ¶å•日期 >= '" + HDate + "'";
                sWhere += " and CONVERT(varchar(100), åˆ¶å•日期, 23) >= '" + HDate + "'";
            }
            if (HDate1) {
                sWhere += " and åˆ¶å•日期 <= '" + HDate1 + "'";
                sWhere += " and CONVERT(varchar(100), åˆ¶å•日期, 23) <= '" + HDate1 + "'";
            }
            if (HICMOBillNo) {
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ICMOBillWorkQtyStatus_TmpList.html
@@ -297,10 +297,10 @@
            }
            if (HDate) {
                sWhere += " and é‡‡é›†æ—¶é—´ >= '" + HDate + "'";
                sWhere += " and CONVERT(varchar(100), é‡‡é›†æ—¶é—´, 23) >= '" + HDate + "'";
            }
            if (HDate1) {
                sWhere += " and é‡‡é›†æ—¶é—´ <= '" + HDate1 + "'";
                sWhere += " and CONVERT(varchar(100), é‡‡é›†æ—¶é—´, 23) <= '" + HDate1 + "'";
            }
            if (HICMOBillNo) {
WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ깤µ¥/Sc_Add_MESEndWorkBillList.html
@@ -793,18 +793,29 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {
                            //    if (data.Verify == "Y") //自动审核
                            //    {
                            //        layer.close(index);
                            //        SaveVerify(); //审核
                            //    }
                            //    else {
                            //        layer.close(index);
                            //    }
                            //});
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html
@@ -634,18 +634,30 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                    if (data.Verify == "Y") //自动审核
                                    {
                                        layer.close(index);
                                        SaveVerify(); //审核
                                    }
                                    else {
                                        layer.close(index);
                                    }
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {
                            //        if (data.Verify == "Y") //自动审核
                            //        {
                            //            layer.close(index);
                            //            SaveVerify(); //审核
                            //        }
                            //        else {
                            //            layer.close(index);
                            //        }
                            //});
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html
@@ -569,7 +569,7 @@
            //#region å®¡æ ¸
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill()
            });
            //#endregion
@@ -647,6 +647,35 @@
                        }
                    });
                }
            }
            //#endregion
            //#region å®¡æ ¸
            function set_CheckBill() {
                var InterID = $("#HInterID").val();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
@@ -911,7 +940,7 @@
                    success: function (d) {
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html
@@ -181,7 +181,40 @@
                            </div>
                        </div>
                        <div id="HProgressBar"></div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-row" style="padding:10px 0">
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                        </div>
                        <div class="layui-tab layui-tab-card" style="margin-top:40px;">
                            <ul class="layui-tab-title">
                                <li class="layui-this">生产订单</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">车间</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">生产订单</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">查询</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                                    <!--待排订单-->
                                    <table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
@@ -194,6 +227,13 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>准备排序</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>选产线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>排产</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layuiiconform"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
@@ -227,9 +267,13 @@
            , element = layui.element;
        var sWhere = "";
        var sWhere_ICMO = "";
        var option = [];
        var option2 = [];
        var option_columns = [];
        var HModName = "JIT_DayPlanPlatForm";
        //不需要显示的字段 å¯æ‰©å±•
        var titleData = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -413,9 +457,28 @@
                case 'set_Souce':
                    set_Souce(data);
                    break;
            }
        });
        table.on('toolbar(mainTable_ICMO)', function (obj) {
            var checkStatus = table.checkStatus(obj.config.id);
            switch (obj.event) {
                //排产
                case 'set_Arrangement':
                    set_Arrangement();
                    break;
                //退出按钮
                case 'btn-Close':
                    parent.layui.admin.events.closeThisTabs();
                    break;
                //列设置
                case 'set_HideColumn2':
                    get_HideColumn2();
                    break;
            };
        });
        //导入
@@ -562,6 +625,7 @@
            get_FastQuery(1);
            //隐藏勾选字段
            DisPlay_HideColumn();
            get_Display2(sWhere_ICMO);
        }
         //#endregion
@@ -614,6 +678,7 @@
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150, edit: 'text' });
            columns.push({ field: '昨日数量', title: '昨日数量'});
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '拆单汇报数量', title: '拆单汇报数量', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID" });
            columns.push({
@@ -768,12 +833,12 @@
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
            columns.push({ field: '生产资源代码', title: '生产资源代码', width: 150, hide: true });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
            option_columns = columns;
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
@@ -1142,6 +1207,70 @@
            sWhere = ""//调用接口后清空sWhere缓存
        }
        //快速过滤
        function get_FastQuery_ICMO(number) {
            var HWorkShopID = 0;
            var HProdORGID = 0;
            HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (number == 2) {
                if (HWorkShopID == 0) {
                    return layer.msg("生产车间不能为空!");
                }
                HProdORGID = $("#HProdORGID").val();//生产订单组织
            }
            if (number == 1) {
                HProdORGID = sessionStorage["OrganizationID"];//生产订单组织
            }
            var HPlanBeginDate = $("#HPlanBeginDate").val();//开工起始日期
            var HPlanEndDate = $("#HPlanEndDate").val();//开工截止日期
            var HMastersDate = $("#HMastersDate").val();//排产日期
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HMaterID = $("#HMaterID").val();//物料编码id
            var HICMOBillNo = $("#HICMOBillNo").val();//生产订单号
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var sWhere_ICMO = "";
            if (ColName != 0 && Comparator != 0) {
                var com = "";
                switch (Comparator) {
                    case "7":
                        com = "like''%" + ColContent + "%''";
                        break;
                    case "8":
                        com = "like''%" + ColContent + "''";
                        break;
                    case "9":
                        com = "like''" + ColContent + "%''";
                        break;
                    case "10":
                        com = "not like''%" + ColContent + "%''";
                        break;
                    default:
                        com = "" + Comparator + "''" + ColContent + "''";
                        break;
                }
                sWhere_ICMO += " and [" + ColName + "] " + com;
            }
            sWhere_ICMO = {
                HPlanBeginDate: HPlanBeginDate
                , HProdORGID: HProdORGID
                , HSeOrderBillNo: HSeOrderBillNo
                , HPlanEndDate: HPlanEndDate
                , HMaterID: HMaterID
                , HICMOBillNo: HICMOBillNo
                , HWorkShopID: HWorkShopID
                , HMastersDate: HMastersDate
                , sWheres: sWheres
            }
            get_Display2(JSON.stringify(sWhere_ICMO));
            sWhere_ICMO = ""//调用接口后清空sWhere缓存
        }
        //双击跳转齐套分析明细表
        function btnrowDouble(obj) {
@@ -1183,6 +1312,27 @@
            $("#Comparator").val("0");
            form.render('select');
            sWhere = "";
        }
        //重置
        function set_ClearQuery_ICMO() {
            $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开工起始日期
            $("#HSeOrderBillNo").val("");//销售订单号
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//开工截止日期
            $("#HMastersDate").val("");//排产日期
            $("#HMaterID").val("0");//物料编码id
            $("#HMaterNumber").val("");//物料编码
            $("#HMaterName").val("");//物料名称
            $("#HMaterModel").val("");//规格型号
            $("#HICMOBillNo").val("");//生产订单号
            $("#HWorkShopID").val("0");//生产车间id
            $("#HWorkShopIDName").val("");//生产车间
            $("#HProdORGID").val(sessionStorage["OrganizationID"])//生产订单组织
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');
            sWhere_ICMO = "";
        }
        //齐套分析
@@ -2211,13 +2361,13 @@
                    }
                })
            }
            else {
                return layer.msg("请选择数据!")
            }
        }
        //保存
        function set_AddNew() {
@@ -2228,7 +2378,7 @@
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) == 0) {
                        return layer.msg("第" + (i + 1) + "行,拆产数量有误,请重新输入!");
                    }
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) < parseFloat(table.cache["mainTable"][i]["日计划数量总量"]) + parseFloat(table.cache["mainTable"][i]["今日之前日计划数量"])) { // - å·²æ±‡æŠ¥æ•°é‡
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) - parseFloat(table.cache["mainTable"][i]["拆单汇报数量"]) < parseFloat(table.cache["mainTable"][i]["日计划数量总量"])) { // - å·²æ±‡æŠ¥æ•°é‡
                        return layer.msg("第" + (i + 1) + "行,排产数量超出订单数量!");
                    }
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
@@ -2404,6 +2554,177 @@
            }
        }
        //查询未排产的生产订单
        function get_Display2(sWhere_ICMO) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                type: "GET",
                data: { "sWhere": sWhere_ICMO, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                }
                            }
                        }
                        //动态显示列名
                        option2 = {
                            elem: '#mainTable_ICMO'
                            , toolbar: '#toolbarDemo2'
                            , cols: [col]
                            , data: data1.data
                            , height: 400
                            , page: true
                            , limits: [50, 500, 5000, 50000]
                            , limit: 200
                            , cellMinWidth: 90
                        }
                        table.render(option2);
                        //刷新表格数据
                        DisPlay_HideColumn2();
                        layer.close(ajaxLoad);
                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                        //    ColFilter();
                        //}
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //排产功能
        function set_Arrangement() {
            var checkStatus = table.checkStatus('mainTable_ICMO')
                , data = checkStatus.data;
            if (checkStatus.data.length > 0) {
                console.log(option.data);
                var arr_field = [];
                //获取已排订单列表字段
                for (let i = 0; i < option_columns.length; i++) {
                    if (option_columns[i].field != undefined && option_columns[i].field != null) {
                        arr_field.push(option_columns[i].field);
                    }
                }
                //把已排订单列表字段存入obj对象中,以便给字段赋值
                var obj = {};
                for (let i = 0; i < arr_field.length; i++) {
                    var key = arr_field[i];
                    var value = '';
                    obj[key] = value;
                }
                //获取勾选上的待排生产订单
                for (var i = 0; i < checkStatus.data.length; i++) {
                    obj.HMaterID = data[i].HMaterID;
                    obj.HProdORGID = data[i].HPRDORGID;
                    obj.HUnitID = data[i].HUnitID;
                    obj.HWorkShopID = data[i].HDeptID;
                    obj.拆单数量 = data[i].生产任务单数量;
                    obj.源单主内码 = data[i].hmainid;
                    obj.源单子内码 = data[i].HEntryID;
                    obj.物料代码 = data[i].产品代码;
                    obj.物料名称 = data[i].产品名称;
                    obj.生产组织 = "智云迈思";
                    obj.生产订单单据类型 = data[i].单据类型;
                    obj.生产订单号 = data[i].单据号;
                    obj.生产订单明细行号 = data[i].HEntryID;
                    obj.生产车间 = data[i].生产车间;
                    obj.规格型号 = data[i].规格型号;
                    obj.计划开始日期 = data[i].计划开工日期;
                    obj.计划数量 = data[i].生产任务单数量;
                    obj.计划结束日期 = data[i].计划完工日期;
                    obj.计量单位 = data[i].计量单位;
                    obj.订单可排数量 = data[i].生产任务单数量;
                    obj.订单等级 = data[i].订单等级;
                    obj.订单类型 = data[i].单据类型;
                    obj.销售订单号 = data[i].销售订单号;
                    obj.销售订单数量 = data[i].销售数量;
                    option.data.push(obj);
                    table.render(option)
                }
                //获取上方排产列表数据,用于对比下方生产订单列表,将下方生产订单列表相同的数据不显示
                var compareList = [];
                for (var i = 0; i < option.data.length; i++) {
                    var temp = option.data[i]["源单主内码"] + "|" + option.data[i]["源单子内码"];
                    compareList.push(temp);
                }
                //剔除上方排产列表中已经加入的生产订单
                var tables = [];
                for (var i = 0; i < option2.data.length; i++) {
                    var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                    if ($.inArray(temp, compareList) == -1) {
                        tables.push(option2.data[i]);
                    }
                }
                option2.data = tables;
                //重新渲染子表2
                table.render(option2);
                //var wait = layer.load();
                ////逻辑方法
                //$.ajax({
                //    url: GetWEBURL() + '/LEMS/ProcessExchangeArrangement_Add',
                //    type: "GET",
                //    data: { "HInterID_S": HInterID_S.toString(), "HSourceID": DataSourceID, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                //    success: function (result) {
                //        if (result.count == 1) {
                //            layer.msg(result.Message, { icon: 1 }, function () {
                //                // å¾—到frame索引
                //                var index = layer.getFrameIndex(window.name);
                //                //关闭当前frame
                //                layer.close(wait);
                //                get_Display("  and HSourceID=" + DataSourceID);
                //                //修改为功后刷新界面
                //                get_FastQuery();
                //            });
                //        } else {
                //            layer.alert(result.code + result.Message, { icon: 5 });
                //            layer.close(wait);
                //        }
                //    }, error: function () {
                //        layer.alert("接口请求失败!", { icon: 5 });
                //        layer.close(wait);
                //    }
                //});
            }
            else {
                layer.msg('请选择数据!');
            }
        }
        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
@@ -2522,6 +2843,124 @@
            })
        }
        function get_HideColumn2() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option2.cols[0].length; i++) {
                colName += option2.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + "Main" + '&colName=' + colName;
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn2();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }
        function DisPlay_HideColumn2() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {
                        var dataCol = [];//数据库查询出的列数据
                        /* var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option2.cols[0].length - 1; i++) {
                            if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                            }
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option2.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option2.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option2.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                                option2.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option2.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option2.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option2.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option2.cols[0].length - 1; i++) {
                            if (option2.cols[0][i]["fixed"] != null) {
                                option2.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option2.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option2);
                    } else {
                        table.render(option2);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }
        //列明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
WebTM/views/É豸¹ÜÀí/Sb_Add_EqpConkBookBillList.html
@@ -107,7 +107,7 @@
                                                <label class="layui-form-label">故障类别</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HConkTypeList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -378,7 +378,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                                content: ['../Baseset/基础资料/Gy_EmployeeList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {