Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

YL

2021-06-28 2f919b9934f05887acfba44792ffffbbb11e3300

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -1205,6 +1205,12 @@
    <File Include="views/userfiles/images/login_BackgroundImage.jpg">
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="views/userfiles/images/2.jpg">
      <publishTime>03/25/2021 13:26:05</publishTime>
    </File>
    <File Include="views/userfiles/images/login_BackgroundImage.jpg">
      <publishTime>05/14/2021 13:45:26</publishTime>
    </File>
    <File Include="views/不良汇报/Xs_SeOrderPickUp.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
@@ -1222,6 +1228,9 @@
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBillList.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
@@ -1262,6 +1271,33 @@
    <File Include="views/基础资料/公用基础资料/Gy_Currency.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/品质管理/成品入库检验单/QC_LastPieceCheckBillList.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_Currency.html">
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_Employee.html">
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_QCCheckClass.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html">
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_WorkCenter.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_CheckItem.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Currency.html">
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Department.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1289,6 +1325,21 @@
    <File Include="views/基础资料/公用基础资料/Gy_Unit.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_PropertyList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_QCCheckClass.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_StockPlace.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Unit - å¤åˆ¶.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Unit.html">
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Warehouse.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1312,6 +1363,27 @@
    </File>
    <File Include="views/基础资料/工资基础资料/Add_Edit_Gy_Group.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Warehouse_Edit.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_WorkCenter.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/HBarPlanPrint.html">
      <publishTime>05/06/2021 17:40:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/test.html">
      <publishTime>05/09/2021 23:57:44</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Gy_Department_Edit.aspx">
      <publishTime>05/06/2021 17:40:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
    </File>
    <File Include="views/基础资料/工资基础资料/Add_Edit_Gy_Group.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/工资基础资料/Gy_Group.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1354,6 +1426,24 @@
    </File>
    <File Include="views/基础资料/辅助基础资料/Sb_Add_MaintenanceMode.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/基础资料/设备基础资料/Gy_MaintenanceAcceptItem.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/设备基础资料/Gy_MaintenanceItem.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/设备基础资料/Sb_Add_MaintenanceAcceptItem.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/设备基础资料/Sb_Add_MaintenanceItem.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/辅助基础资料/Gy_MaintenanceMode.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/辅助基础资料/Sb_Add_MaintenanceMode.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/基础资料/采购基础资料/Gy_Supplier.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1460,6 +1550,96 @@
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsRepairCheckBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapInBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapOutBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldLifeChangeBillList.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html">
      <publishTime>06/18/2021 16:05:28</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html">
      <publishTime>06/18/2021 09:38:45</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_BarCodeBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_CheckToolsFileMainList.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_Mould.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Kf_ProductInBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html">
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldDotCheckPlanBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html">
      <publishTime>06/09/2021 13:43:29</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsConkBookBillList.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsDotCheckBillList.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsDotCheckPlanBillList.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsMaintainBillList.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsMaintainPlanBillList.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsRepairCheckBillList.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Sc_CheckToolsRepairWorkBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1538,6 +1718,15 @@
    <File Include="views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/生产工序管理/工序汇报单/Sc_ProcessReport_PDA.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/生产工序管理/工序汇报单/xmlLBM_ProcessReport.aspx">
      <publishTime>04/25/2021 16:20:28</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html">
      <publishTime>05/06/2021 19:55:58</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1571,11 +1760,29 @@
    <File Include="views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html">
      <publishTime>06/18/2021 14:09:24</publishTime>
    </File>
    <File Include="views/生产管理/生产停工单/Sc_MESStopWorkBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html">
      <publishTime>06/18/2021 09:38:45</publishTime>
    </File>
    <File Include="views/生产管理/生产完工单/Sc_MESEndWorkBillList.html">
      <publishTime>06/18/2021 09:38:45</publishTime>
    </File>
    <File Include="views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html">
      <publishTime>06/18/2021 16:05:28</publishTime>
    </File>
    <File Include="views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html">
      <publishTime>06/18/2021 16:05:28</publishTime>
    </File>
    <File Include="views/生产管理/生产投料单/Sc_PPBomBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html">
      <publishTime>06/23/2021 16:00:04</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html">
      <publishTime>06/15/2021 16:41:12</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_ICMOReportBillList.html">
      <publishTime>06/23/2021 13:23:54</publishTime>
@@ -1612,6 +1819,9 @@
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>05/14/2021 09:40:07</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1706,6 +1916,90 @@
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/设备管理/Sb_Add_EqpConkBookBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_Add_EqpMaintenanceBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_Add_EqpRepairCheckBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpConkBookBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpMaintenanceBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EqpRepairCheckBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillEdit.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillEdit.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipDotCheckPlanBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillEdit.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainPlanBillEdit.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sb_EquipMaintainPlanBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/设备管理/Sc_Add_MouldDotCheckBillList.html">
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/质量管理/产品入库检验单/QC_LastPieceCheckBill.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/产品入库检验单/QC_LastPieceCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/出厂检验单/QC_OutCompCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/来料检验单/QC_POStockInCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/检验方案单/QC_Add_CheckProject.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/检验方案单/QC_CheckProjectList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
    </File>
    <File Include="views/车间管理/不良品评审单/Cj_NoPassProcList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1766,6 +2060,12 @@
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>06/19/2021 08:39:08</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>06/18/2021 15:59:36</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>06/18/2021 15:36:33</publishTime>
    </File>
    <File Include="views/车间管理/报表分析/Qk_OutProcessList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1796,6 +2096,27 @@
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/采购管理/委外订单/WW_EntrustOrderBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/采购管理/收料通知单/Cg_POInStockBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/采购管理/退料通知单/Cg_POInStockBackBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/销售管理/发货通知单/Xs_SeOutStockBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/销售管理/退货通知单/Xs_SeOutStockBackBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBackBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1804,6 +2125,9 @@
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1820,6 +2144,9 @@
    <File Include="views/领料发货/委外出库/Kf_EntrustOutBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/领料发货/委外出库/Kf_EntrustOutBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1834,6 +2161,9 @@
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1850,6 +2180,9 @@
    <File Include="views/领料发货/领料出库/Kf_MateOutBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1864,6 +2197,9 @@
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1883,6 +2219,9 @@
    <File Include="views/验收入库/其他入库/Kf_OtherInBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
@@ -1897,6 +2236,9 @@
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1916,6 +2258,9 @@
    <File Include="views/验收入库/委外入库/Kf_EntrustInBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_Fast.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>

 WebTM/WebTM.csproj

@@ -85,6 +85,7 @@
    <Content Include="views\Baseset\基础资料\Gy_ModulList.html" />
    <Content Include="views\Baseset\基础资料\Gy_PostList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WorkTypeList.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView.html" />
    <Content Include="views\CreateControl.js" />
    <Content Include="views\grf\123.txt" />
    <Content Include="views\grf\a.grf" />
@@ -562,6 +563,7 @@
    <Content Include="views\生产管理\生产汇报单\Sc_Add_ICMOReportBillList.html" />
    <Content Include="views\生产管理\生产组装追溯单\Sc_AssemblyBillList.html" />
    <Content Include="views\生产管理\生产质量汇报单\Sc_QualityReportBillList.html" />
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriodList.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillTypeList.html" />
    <Content Include="views\系统管理\日志管理\Xt_SystemLogList.html" />

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Sc_ICMOBillListView.html

New file
@@ -0,0 +1,172 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>生产任务单列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="ck-table"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;

            form.on('submit(HQuery)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var checkStatus = table.checkStatus('ck-table')
                 , data = checkStatus.data;
                parent.GetICMOBillValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#ck-table'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                  , { field: 'hmainid', width: 150, title: 'hmainid', hide: true, sort: true }
                  , { field: '订单跟踪号', width: 150, title: '订单跟踪号' }
                  , { field: '生产订单号', width: 150, title: '生产订单号' }
                  , { field: 'hdeptid', width: 150, title: 'hdeptid', hide: true }
                  , { field: '生产车间代码', width: 150, title: '生产车间代码' }
                  , { field: '生产车间名称', width: 150, title: '生产车间名称' }
                  , { field: 'hmaterid', width: 150, title: 'hmaterid', hide: true }
                  , { field: '物料代码', width: 150, title: '物料代码' }
                  , { field: '物料名称', width: 150, title: '物料名称' }
                  , { field: '规格型号', width: 150, title: '规格型号' }
                  , { field: '批号', width: 150, title: '批号' }
                  , { field: '流转卡数量', width: 150, title: '流转卡数量' }
                  , { field: 'hunitid', width: 150, title: 'hunitid', hide: true }
                  , { field: '计量单位代码', width: 150, title: '计量单位代码' }
                  , { field: '计量单位名称', width: 150, title: '计量单位名称' }
                  , { field: '计划生产数量', width: 150, title: '计划生产数量' }
                  , { field: 'hbomid', width: 150, title: 'hbomid' }
                  , { field: 'BOM单代码', width: 150, title: 'BOM单代码' }
                  , { field: 'HRoutingID', width: 150, title: 'HRoutingID' }
                  , { field: '计划开工日期', width: 150, title: '计划开工日期' }
                  , { field: '计划完工日期', width: 150, title: '计划完工日期' }
                  , { field: 'hsubid', width: 150, title: 'hsubid' }
                  , { field: '工序号', width: 150, title: '工序号' }
                  , { field: 'hprocid', width: 150, title: 'hprocid' }
                  , { field: '工序代码', width: 150, title: '工序代码' }
                  , { field: '工序', width: 150, title: '工序' }
                  , { field: '加工说明', width: 150, title: '加工说明' }
                  , { field: 'HWorkCenterID', width: 150, title: 'HWorkCenterID' }
                  , { field: '工作中心代码', width: 150, title: '工作中心代码' }
                  , { field: '工作中心', width: 150, title: '工作中心' }
                  , { field: 'HSourceID', width: 150, title: 'HSourceID' }
                  , { field: '生产资源代码', width: 150, title: '生产资源代码' }
                  , { field: '生产资源', width: 150, title: '生产资源' }
                  , { field: 'HGroupID', width: 150, title: 'HGroupID' }
                  , { field: '班组代码', width: 150, title: '班组代码' }
                  , { field: '班组', width: 150, title: '班组' }
                  , { field: 'HWorkerID', width: 150, title: 'HWorkerID' }
                  , { field: '操作工代码', width: 150, title: '操作工代码' }
                  , { field: 'HSupID', width: 150, title: 'HSupID' }
                  , { field: '供应商', width: 150, title: '供应商' }
                  , { field: '供应商代码', width: 150, title: '供应商代码' }
                  , { field: '委外标记', width: 150, title: '委外标记' }
                  , { field: '工艺参数', width: 150, title: '工艺参数' }
                  , { field: '图纸编号', width: 150, title: '图纸编号' }
                  , { field: '本工序确认记录', width: 150, title: '本工序确认记录' }
                  , { field: '操作工', width: 150, title: '操作工' }
                  , { field: '加工单价', width: 150, title: '加工单价' }
                  , { field: '良率', width: 150, title: '良率' }
                  , { field: '累计良率', width: 150, title: '累计良率' }
                  , { field: '超额比例', width: 150, title: '超额比例' }
                  , { field: '最高上限', width: 150, title: '最高上限' }
                  , { field: 'HBillType', width: 150, title: 'HBillType' }
                  , { field: '关联数量', width: 150, title: '关联数量' }
                  , { field: 'HEntryID', width: 150, title: 'HEntryID' }
                  , { field: '下道流转工序', width: 150, title: '下道流转工序' }
                  , { field: '产品CODE', width: 150, title: '产品CODE' }
                  , { field: '销售订单号', width: 150, title: '销售订单号' }
                  , { field: '客户简称', width: 150, title: '客户简称' }
                  , { field: '客户要求材料成分', width: 150, title: '客户要求材料成分' }
                  , { field: '预计出货日期', width: 150, title: '预计出货日期' }
                  , { field: '产品名称', width: 150, title: '产品名称' }
                  , { field: '客户名称', width: 150, title: '客户名称' }
                  , { field: '生产备注', width: 150, title: '生产备注' }
                  , { field: '重要提示', width: 150, title: '重要提示' }
              ]]
              , page: true
            });
            ///加载显示数据
            function RoadQuery(Where) {
                var index = layer.load();
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetSc_ICMOBillListView",
                    async: true,
                    data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] },
                    //data: { "Value": Value },
                    success: function (result) {
                        if (result.count == 1) {
                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                            table.reload('ck-table', {
                                data: ajaxReturnData
                                , height: 'full-10'
                                , loading: false
                                , done: function (index, res) {

                                }
                            });
                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (result) {
                        layer.close(index);
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

 WebTM/views/index.html

@@ -353,7 +353,18 @@
                                <dd><a lay-href="生产管理/生产完工单/Sc_MESEndWorkBillList.html">生产完工单列表</a></dd>
                            </dl>
                        </dd>
                     
                        <dd class="layui-nav-itemed">
                            <a>停工挂起单</a>
                            <dl class="layui-nav-child">
                                <dd><a lay-href="生产管理/停工挂起单/Sc_MESStopUpWorkBillList.html">停工挂起单列表</a></dd>
                            </dl>
                        </dd>
                        <dd class="layui-nav-itemed">
                            <a>组装单</a>
                            <dl class="layui-nav-child">
                                <dd><a lay-href="生产管理/组装单/Sc_GroupOrderBillList.html">组装单列表</a></dd>
                            </dl>
                        </dd>
                    </dl>
                </li>
                <li data-name="set" class="layui-nav-item">

 WebTM/views/Éú²ú¹ÜÀí/×é×°µ¥/Sc_GroupOrderBillList.html

New file
@@ -0,0 +1,332 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>产线组托单列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="开始时间" id="开始时间">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束时间</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="结束时间" id="结束时间">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">组托单号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="组托单号" id="组托单号">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>

                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">制单人</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="制单人" id="制单人">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">组托单唯一条码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="组托单唯一条码" id="组托单唯一条码">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">包装单号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="包装单号" id="包装单号">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">包装单唯一条码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="包装单唯一条码" id="包装单唯一条码">
                                        </div>
                                    </div>
                                    <!--<div class="layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="hmodel" id="hmodel">
                                        </div>
                                    </div>-->
                                </div>
                            </div>
                        </div>
                        <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container layui-form-item">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print">
                                    <i class="layui-icon layui-icon-file"></i>打印
                                </button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script type="text/html" id="toolBar">
        <a class="layui-btn layui-btn-xs" lay-event="del" style="background-color: red;">删除</a>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util;
            //var sWhere = " äº§å“ä»£ç  = 'BX0002'";
            var sWhere = "";

            var option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , cols: [[
                    { type: 'radio' }
                    , { field: '组托单类型', title: '组托单类型', sort: true, hide: true }
                    , { field: '组托单主ID', title: '组托单主ID', sort: true, hide: true }
                    , { field: '组托单号', title: '组托单号', sort: true, width:155 }
                    , { field: '制单人', title: '制单人', sort: true }
                    , {
                        field: '制单时间', title: '组托时间', sort: true, templet: function (d) {
                            if (d.制单时间 == null) {
                                return "";
                            }
                            return util.toDateString(d.制单时间, "yyyy-MM-dd");
                        }
                    }
                    , { field: '组托单唯一条码', title: '组托码', sort: true }
                    , { field: '包装单号', title: '包装单号', sort: true }
                    , { field: '包装单类型', title: '包装单类型', hide: true }
                    , { field: '包装单唯一条码', title: '包装码', width: 165 }
                    , { toolbar: '#toolBar', title: '操作', width: 115, fixed: 'right' }
                ]]
                , text: {
                    none: '暂无相关数据！'
                }
            };

            option.data = [];
            table.render(option);


            //进入页面显示的列表
            layer.load(3);
            $.ajax({
                url: GetWEBURL() + '/GroupOrderBill/List',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.closeAll("loading");
                    } else {
                        layer.closeAll("loading");
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.alert("接口失效!", { icon: 5 });
                }
            });

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#开始时间").val("");
                $("#结束时间").val("");
                $("#组托单号").val("");
                $("#制单人").val("");
                $("#组托单唯一条码").val("");
                $("#包装单号").val("");
                $("#包装单唯一条码").val("");
                $("#btnSearch").click();
            });

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var å¼€å§‹æ—¶é—´ = $("#开始时间").val();
                var ç»“束时间 = $("#结束时间").val();
                var ç»„托单号 = $("#组托单号").val();
                var åˆ¶å•äºº = $("#制单人").val();
                var ç»„托单唯一条码 = $("#组托单唯一条码").val();
                var åŒ…装单号 = $("#包装单号").val();
                var åŒ…装单唯一条码 = $("#包装单唯一条码").val();
                if (开始时间) {
                    sWhere += " and åˆ¶å•æ—¶é—´ > '" + å¼€å§‹æ—¶é—´ + "'";
                }
                if (结束时间) {
                    sWhere += " and åˆ¶å•æ—¶é—´ < '" + ç»“束时间 + "'";
                }
                if (组托单号) {
                    sWhere += " and ç»„托单号 like '%" + ç»„托单号 + "%'";
                }
                if (制单人) {
                    sWhere += " and åˆ¶å•äºº like '%" + åˆ¶å•äºº + "%'";
                }
                if (组托单唯一条码) {
                    sWhere += " and ç»„托单唯一条码 like '%" + ç»„托单唯一条码 + "%'";
                }
                if (包装单号) {
                    sWhere += " and åŒ…装单号 like '%" + åŒ…装单号 + "%'";
                }
                if (包装单唯一条码) {
                    sWhere += " and åŒ…装单唯一条码 like '%" + åŒ…装单唯一条码 + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/GroupOrderBill/List',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
            });
            //获取选中行数据
            table.on('row(mainTable)', function (obj) {
                //标注选中样式
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
            });
            //打印按钮
            form.on('submit(Print)', function (obj) {//退出
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
                var linterid = checkStatus.data[0].组托单主ID;
                //打开打印模板
                //var linterid = $("#HInterID").val();
                //var linterid = "28973";
                var Type = "ZTDPrint";
                var OpenTmp = "组托单物料标识卡(网页版)";
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
            });

            //监听表格中行工具事件
            table.on('tool(mainTable)', function (obj) { //注：tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                var data = obj.data //获得当前行数据
                    , layEvent = obj.event; //获得 lay-event å¯¹åº”的值
                if (layEvent === 'detail') {
                    layer.msg('查看操作');
                } else if (layEvent === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        $.ajax({
                            url: GetWEBURL() + '/GroupOrderBill/DelListRow',
                            type: "GET",
                            data: { "HInterID": data.组托单主ID, "HEntryID": data.组托单子ID },
                            success: function (data) {
                                if (data.count == 1) {
                                    layer.close(index);
                                    obj.del(); //删除对应行（tr）的DOM结构
                                    layer.msg('删除成功');
                                } else {
                                    layer.alert(data.code + data.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.msg("接口请求失败!", {
                                    icon: 5, btn: ['确认'], time: 100000, offset: 't',
                                    skin: 'layui-layer-lan', title: "温馨提示"
                                });
                            }
                        });
                    });
                } else if (layEvent === 'edit') {
                    //prompt层
                    layer.prompt({ title: '请输入黑标号，并确认', formType: 0 }, function (text, index) {
                        layer.close(index);
                        $.ajax({
                            url: GetWEBURL() + '/GroupOrderBill/editListRowHBarCode_Cus',
                            type: "GET",
                            data: { "HInterID": data.组托单主ID, "HBarCode_Cus": text },
                            success: function (data) {
                                if (data.count == 1) {
                                    $("#btnSearch").click();
                                    layer.msg('修改成功！');
                                } else {
                                    layer.alert(data.code + data.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.msg("接口请求失败!", {
                                    icon: 5, btn: ['确认'], time: 100000, offset: 't',
                                    skin: 'layui-layer-lan', title: "温馨提示"
                                });
                            }
                        });
                    });
                }
            });


            //以上是layui模块
        });

        function Print(data) {
            console.log("data=", data);
        }


    </script>

</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -49,7 +49,8 @@
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                            <li lay-id="2" style="padding:1px;">其他信息</li>
                            <li lay-id="3" style="padding:1px;">制单信息</li>
                            <li lay-id="3" style="padding:1px;">检移票信息</li>
                            <li lay-id="4" style="padding:1px;">制单信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--基本信息-->
@@ -105,12 +106,13 @@
                                            <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="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
                                            </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="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HQty" id="HQty">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -202,8 +204,8 @@
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">选单号</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="textBox2" id="textBox2" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: left;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="" id="" value="0">
                                            </div>
@@ -253,7 +255,7 @@
                                        <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="HMainMaterID" id="HMainMaterID" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HMainMaterID" id="HMainMaterID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -268,11 +270,11 @@
                                        <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="HKeyMaterID" id="HKeyMaterID" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HKeyMaterID" id="HKeyMaterID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;"></label>
                                            <label class="layui-form-label" style="width: 85px;">HICMOEntryID</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" style="background-color:#efefef4d;" readonly>
                                            </div>
@@ -285,6 +287,139 @@
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                </button>
                                                <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--检移票信息-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">产品CODE</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HProdMaterCode" id="HProdMaterCode">
                                            </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="HSeOrderBillNo" id="HSeOrderBillNo">
                                            </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="HCusShortName" id="HCusShortName">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 115px;padding: 9px 0px;">客户要求材料成分</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCusNeedMaterial" id="HCusNeedMaterial">
                                            </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="date" class="layui-input" name="HPlanSendGoodsDate" id="HPlanSendGoodsDate" style="padding-left: 32px;">
                                            </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="HProdMaterName" id="HProdMaterName">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <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="HCusName" id="HCusName">
                                            </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="HWorkRemark" id="HWorkRemark">
                                            </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="HImportNote" id="HImportNote">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料编号A</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber_A" id="HMaterNumber_A">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料编号B</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber_B" id="HMaterNumber_B">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料编号C</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber_C" id="HMaterNumber_C">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料编号D</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber_D" id="HMaterNumber_D">
                                            </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="HProdType" id="HProdType">
                                            </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="HMaterShortName" id="HMaterShortName">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料内码A</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterIDA" id="HMaterIDA">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料内码B</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterIDB" id="HMaterIDB">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料内码C</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterIDC" id="HMaterIDC">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">原材料内码D</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterIDD" id="HMaterIDD">
                                            </div>
                                        </div>
                                    </div>
@@ -381,13 +516,6 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script type="text/html" id="HSupColor">
        {{#  if(d.HSupFlag === "true"){ }}
        <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
        {{#  } else { }}
        <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
        {{#  } }}
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -440,6 +568,7 @@
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
            }
@@ -449,8 +578,12 @@
            }
            //初始表格数据
            var rowdata = [{
                "HProcNo": "", "工序": "", "HProcID": "0", "工作中心代码": "", "工作中心": "", "HSupID": "0", "供应商代码": ""
                , "供应商": "", "HSupFlag": "false", "HWorkQty": "", "HPassRate": "", "HRemark": ""
                "HProcNo": "0", "hprocid": "0", "HProcNumber": "", "工序": "", "加工说明": "",
                "HCenterID": "0", "工作中心代码": "", "工作中心": "", "HSupID": "0",
                "供应商": "", "供应商代码": "", "isEntrust": "否", "isEntrustValue": "false",
                "HQty": "", "加工单位": "", "HRemark": "", "行号": "", "进站数量": "", "出站数量": "",
                "委外工单数量": "", "不合格数量": "", "超额比例": "", "最高上限": "", "isEdit": "否", "isEditValue": "false",
                "良率": "", "累计良率": "", "工艺参数": "", "图纸编号": "", "本工序确认记录": ""
            }];

            var option = {
@@ -462,17 +595,35 @@
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: 'HProcNo', title: '流水号', edit: 'text' }
                    , { field: '工序', title: '工序', edit: 'text' }
                    , { field: 'HProcID', title: '工序ID' }//, hide: true
                    , { field: '工作中心代码', title: '工作中心代码', edit: 'text', width: 115 }
                    , { field: '工作中心', title: '工作中心', edit: 'text' }
                    , { field: 'HSupID', title: '供应商ID' }
                    , { field: '供应商代码', title: '供应商代码', edit: 'text', width: 110 }
                    , { field: '供应商', title: '供应商', edit: 'text' }
                    , { field: 'HSupFlag', title: '外协标记', templet: '#HSupColor', event: "HSupFlagEvent" }
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text' }
                    , { field: 'HPassRate', title: '良率', edit: 'text' }
                    , { field: 'hprocid', title: '工序ID', hide: true }
                    , { field: 'HProcNumber', title: '工序代码' }
                    , { field: '工序', title: '工序名称', event: "HProcCheck" }
                    , { field: '加工说明', title: '加工说明', edit: 'text' }
                    , { field: 'HCenterID', title: '工作中心ID', hide: true }
                    , { field: '工作中心代码', title: '工作中心代码' }
                    , { field: '工作中心', title: '工作中心名称', event: "HWorkCenterCheck" }
                    , { field: 'HSupID', title: '供应商ID', hide: true }
                    , { field: '供应商代码', title: '供应商代码' }
                    , { field: '供应商', title: '供应商', event: "HSupCheck" }
                    , { field: 'isEntrust', title: '是否委外', event: "isEntrustCheck" }
                    , { field: 'isEntrustValue', title: '是否委外值' }
                    , { field: 'HQty', title: '流转卡数量', edit: 'text' }
                    , { field: '加工单位', title: '加工单位', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { field: '行号', title: '行号', edit: 'text' }
                    , { field: '进站数量', title: '进站数量', edit: 'text' }
                    , { field: '出站数量', title: '出站数量', edit: 'text' }
                    , { field: '委外工单数量', title: '委外工单数量', edit: 'text' }
                    , { field: '不合格数量', title: '不合格数量', edit: 'text' }
                    , { field: '超额比例', title: '超额比例', edit: 'text' }
                    , { field: '最高上限', title: '最高上限', edit: 'text' }
                    , { field: 'isEdit', title: '不可编辑', event: "isEditCheck" }
                    , { field: 'isEditValue', title: '不可编辑值', hide: true }
                    , { field: '良率', title: '良率', edit: 'text' }
                    , { field: '累计良率', title: '累计良率', edit: 'text' }
                    , { field: '工艺参数', title: '工艺参数', edit: 'text' }
                    , { field: '图纸编号', title: '图纸编号', edit: 'text' }
                    , { field: '本工序确认记录', title: '本工序确认记录', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
                //, done: function (res, curr, count) {
@@ -498,8 +649,12 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HProcNo": "", "工序": "", "HProcID": "0", "工作中心代码": "", "工作中心": "", "HSupID": "0", "供应商代码": ""
                    , "供应商": "", "HSupFlag": "false", "HWorkQty": "", "HPassRate": "", "HRemark": ""
                    "HProcNo": "0", "hprocid": "0", "HProcNumber": "", "工序": "", "加工说明": "",
                    "HCenterID": "0", "工作中心代码": "", "工作中心": "", "HSupID": "0",
                    "供应商": "", "供应商代码": "", "isEntrust": "否", "isEntrustValue": "false",
                    "HQty": "", "加工单位": "", "HRemark": "", "行号": "", "进站数量": "", "出站数量": "",
                    "委外工单数量": "", "不合格数量": "", "超额比例": "", "最高上限": "", "isEdit": "否", "isEditValue": "false",
                    "良率": "", "累计良率": "", "工艺参数": "", "图纸编号": "", "本工序确认记录": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -544,20 +699,106 @@
                        }
                    });
                }
                //单击改变外协标记值
                if (obj.event === 'HSupFlagEvent') {
                    var flag = obj.data.HSupFlag;
                    if (flag === "false") {
                        flag = "true";
                //单击改变是否委外值
                if (obj.event === 'isEntrustCheck') {
                    var flag = obj.data.isEntrust;
                    var flagValue = obj.data.isEntrustValue;
                    if (flagValue === "false") {
                        flagValue = "true";
                        flag = "是";
                    }
                    else if (flag === "true") {
                        flag = "false";
                    else if (flagValue === "true") {
                        flagValue = "false";
                        flag = "否";
                    }
                    else {
                        flag = "true";
                        flagValue = "false";
                        flag = "否";
                    }
                    obj.update({
                        HSupFlag: flag
                        isEntrust: flag
                        , isEntrustValue: flagValue
                    });
                }
                if (obj.event === 'HProcCheck') {//工序
                    var _obj = obj;
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '工序列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../../views/Baseset/基础资料/Gy_ProcList.html', 'yes']
                        , resize: false
                        , end: function () {
                            _obj.update({
                                å·¥åº: subProcName
                                , hprocid: subProcID
                                , HProcNumber: subProcNumber
                            });
                        }
                    })
                }
                if (obj.event === 'HSupCheck') {//供应商
                    var _obj = obj;
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '供应商列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../../views/Baseset/基础资料/Gy_SupplierList.html', 'yes']
                        , resize: false
                        , end: function () {
                            _obj.update({
                                ä¾›åº”商: subSupName
                                , HSupID: subSupID
                                , ä¾›åº”商代码: subSupNumber
                            });
                        }
                    })
                }
                if (obj.event === 'HWorkCenterCheck') {//工作中心
                    var _obj = obj;
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '加工中心列表'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../../views/Baseset/基础资料/Gy_WorkCenterList.html', 'yes']
                        , resize: false
                        , end: function () {
                            _obj.update({
                                å·¥ä½œä¸­å¿ƒ: subWorkCenterName
                                , HCenterID: subWorkCenterID
                                , å·¥ä½œä¸­å¿ƒä»£ç : subWorkCenterNumber
                            });
                        }
                    })
                }
                //单击改变不可编辑值
                if (obj.event === 'isEditCheck') {
                    var flag = obj.data.isEdit;
                    var flagValue = obj.data.isEditValue;
                    if (flagValue === "false") {
                        flagValue = "true";
                        flag = "是";
                    }
                    else if (flagValue === "true") {
                        flagValue = "false";
                        flag = "否";
                    }
                    else {
                        flagValue = "false";
                        flag = "否";
                    }
                    obj.update({
                        isEdit: flag
                        , isEditValue: flagValue
                    });
                }
            });
@@ -571,15 +812,38 @@

            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                //var tableData = data.field;
                if ($("#HQty").val() == "" || $("#HQty").val() <= 0) {
                    layer.msg("基本信息中流转卡数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HPlanBeginDate").val()) {
                    layer.msg("请选择计划开工日期！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if (!$("#HPlanEndDate").val()) {
                    layer.msg("请选择计划完工日期！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var sSubTable = table.cache['mainTable'];
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].hprocid) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，工序不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    if (!sSubTable[i].HSupID) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，供应商不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                }
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Gy_RoutingBill/AddBill",
                    //url:"http://localhost:12761/Gy_RoutingBill/AddBill",
                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill",
                    async: true,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
@@ -645,16 +909,16 @@
                })
            });

            //选择工序计划单
            form.on('submit(HPlanID-BT)', function () {//选择工序计划单
            //选择生产任务单
            form.on('submit(btnSearchICMOBill)', function () {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '工序计划单列表'
                    , title: '生产任务单列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Sc_ProcessPlanViewList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Sc_ICMOBillListView.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -739,88 +1003,97 @@
                //window.close();//关闭当前页
            })

            form.on('submit(Saver)', function (data) {//保存
                //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "SaveBadReasonList", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
            //获取明细行
            window.GetICMOBillDetail = function (hmainid) {  //返回责任人
                $.ajax({
                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
                    type: "GET",
                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.data;
                            table.render(option);
                            }
                            else {

                                f_alert(data.Message);
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {

                            f_alert("错误:" + err);
                            console.log("Reason" + sMainStr);
                        }
                    });
            });
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

                })
            }

            //监听提交
            form.verify({
                numberOrEmpty: function (value, item) {
                    // if (value != '') {
                    if (!/^\d+$/.test(value)) {
                        return '不能为空或数字或者0';
                    }
                    //}
                }
            //以上为layui模块
            });


        });
        //定义全局变量
        var HReasonName, ReasonID, EmpName, SQProcName,
            ProcID, ZRProcName, QRName
            ;
        //定义全局变量HMainMaterID
        var subProcName, subProcNumber, subProcID,
            subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
            subSupName, subSupNumber, subSupID,
            HReasonName, ReasonID, EmpName,
            ZRProcName, QRName;


        //返回生产任务单
        function GetICMOBillValue(obj) {
            //txtHBillNo.Text = sBillNo;
            $("#HICMOInterID").val(obj[0].hmainid);
            $("#HICMOBillNo").val(obj[0].生产订单号);
            $("#HICMOEntryID").val(obj[0].HEntryID);
            $("#HOrderProcNO").val(obj[0].订单跟踪号);
            $("#HMaterID").val(obj[0].hmaterid);
            $("#HMaterName").val(obj[0].物料名称);
            $("#HMaterID2").val(obj[0].hmaterid);
            $("#HMaterName2").val(obj[0].物料名称);
            $("#HMaterNumber").val(obj[0].物料代码);
            $("#HMaterNumber2").val(obj[0].物料代码);
            $("#HModel").val(obj[0].规格型号);
            $("#HBatchNo").val(obj[0].批号);
            $("#HUnitID").val(obj[0].hunitid);
            $("#HUnitName").val(obj[0].计量单位名称);
            $("#HUnitNumber").val(obj[0].计量单位代码);
            $("#HPlanQty").val(obj[0].计划生产数量);
            $("#HQty").val(obj[0].流转卡数量);
            $("#HprocExQty").val(obj[0].流转卡数量);
            $("#HPlanBeginDate").val(obj[0].计划开工日期);
            $("#HPlanEndDate").val(obj[0].计划完工日期);
            $("#HWorkShopID").val(obj[0].hdeptid);
            $("#HWorkShopName").val(obj[0].生产车间名称);
            $("#HProdMaterCode").val(obj[0].产品CODE);
            $("#HSeOrderBillNo").val(obj[0].销售订单号);
            $("#HCusShortName").val(obj[0].客户简称);
            $("#HCusNeedMaterial").val(obj[0].客户要求材料成分);
            $("#HPlanSendGoodsDate").val(obj[0].预计出货日期);
            $("#HProdMaterName").val(obj[0].产品名称);
            $("#HCusName").val(obj[0].客户名称);
            $("#HWorkRemark").val(obj[0].生产备注);
            $("#HImportNote").val(obj[0].重要提示);
            GetICMOBillDetail(obj[0].hmainid);
        }
        function GetHReasonValue(obj)  //返回不良原因
        {
            HReasonName = obj[0].HName;
            ReasonID = obj[0].HItemID;
        }
        function GetHPlanValue(obj) {  //返回工序计划单
            $("#HMainSourceInterID").val(obj[0].hmainid);
            $("#HMainSourceEntryID").val(obj[0].hsubid);
            $("#HMainSourceBillNo").val(obj[0].单据号);
            $("#HMaterID").val(obj[0].HMaterID);
            $("#HMaterNumber").val(obj[0].物料代码);
            $("#HMater").val(obj[0].物料名称);
            $("#HCenterID").val(obj[0].HCenterID);
            $("#HWorkCenterName").val(obj[0].工作中心);
            $("#HModel").val(obj[0].规格型号);
            $("#HPlanQty").val(obj[0].计划数量);


        }
        function GetHKeeperValue(obj) {  //返回责任人
            EmpName = obj[0].HName;
            // $("#HEmpName").val(obj[0].HName);
            //$("#HItemID").val(obj[0].HItemID);
        }
        function GetHProcValue(obj) {  //返回申请工序
            SQProcName = obj[0].工序;
            ProcID = obj[0].HItemID;
            //$("#HSQProcName").val(obj[0].工序);
            //$("#HProcID").val(obj[0].HItemID);
        function GetHProcValue(obj) {
            subProcName = obj[0].工序;
            subProcID = obj[0].HItemID;
            subProcNumber = obj[0].HProcNumber;
        }
        function GetHSupValue(obj) {
            subSupName = obj[0].HName;
            subSupID = obj[0].HItemID;
            subSupNumber = obj[0].HNumber;
        }
        function GetWorkCenterValue(obj) {
            subWorkCenterName = obj[0].工作中心;
            subWorkCenterID = obj[0].HItemID;
            subWorkCenterNumber = obj[0].工作中心代码;
        }
        function GetHZRValue(obj) {   //返回责任工序
            ZRProcName = obj[0].工序;

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -247,7 +247,6 @@
            table.render(option2);
            //进入页面显示的缓存列表
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
                type: "GET",
                data: { "sWhere": sWhere },