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

yangle

2022-07-31 35acdf7394462949f170ea2f1f6340043cd83812

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

 WebTM/App_Data/MssqlReportData.cs

@@ -22,7 +22,7 @@
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    public const string SqlConnStr = "Data Source=183.129.128.86:26589;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特

    //public string sServer;
    //public string sDataBase;

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -12,16 +12,16 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="bin/layuiadmin/style/login.css">
      <publishTime>08/16/2021 17:24:30</publishTime>
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>01/28/2016 14:22:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>07/18/2022 17:47:07</publishTime>
      <publishTime>07/29/2022 08:37:32</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>07/18/2022 17:47:07</publishTime>
      <publishTime>07/29/2022 08:37:32</publishTime>
    </File>
    <File Include="HtmlPage1.html">
      <publishTime>03/14/2022 15:07:22</publishTime>
@@ -660,7 +660,7 @@
      <publishTime>12/23/2021 16:07:31</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>07/07/2022 15:47:53</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -810,7 +810,7 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_EmployeeList.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_GetProductionResourcesList.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -1100,6 +1100,9 @@
    <File Include="views/grf/b1.grf">
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/grf/cabinet-CG.grf">
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/grf/cabinet-MZJ.grf">
      <publishTime>12/24/2021 13:31:52</publishTime>
    </File>
@@ -1230,13 +1233,13 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>07/08/2022 18:21:53</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/indexMenu.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>07/08/2022 16:58:50</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/IpadIndex.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -1530,13 +1533,13 @@
      <publishTime>05/16/2022 13:49:35</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>07/07/2022 17:13:18</publishTime>
      <publishTime>07/18/2022 18:14:15</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html">
      <publishTime>07/02/2022 12:19:41</publishTime>
      <publishTime>07/18/2022 09:26:42</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html">
      <publishTime>07/07/2022 17:12:28</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
@@ -1560,10 +1563,10 @@
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/仓存管理/条码出入库记录表/KF_PonderationBillList_Query.html">
      <publishTime>07/08/2022 19:43:20</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/仓存管理/条码库存/KF_ICInventoryByMaterID.html">
      <publishTime>07/02/2022 13:07:47</publishTime>
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/仓存管理/条码库存/KF_ICInventoryList_WMS.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
@@ -1820,6 +1823,9 @@
    <File Include="views/基础资料/公用基础资料/Gy_WorkCenter.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_WorkCenterDyCol.html">
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
@@ -1830,7 +1836,7 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/HBarPlanPrint.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Pay_PeriodInfoSet.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
@@ -1952,11 +1958,14 @@
    <File Include="views/基础资料/公用基础资料/xmlLBM_QK_WLPackingBillList.aspx">
      <publishTime>05/12/2022 13:55:39</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Sc_HPPickingBillList.aspx">
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Sc_ICMOBillList.aspx">
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx">
      <publishTime>05/30/2022 13:35:03</publishTime>
      <publishTime>07/29/2022 13:22:23</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
@@ -1998,7 +2007,7 @@
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/基础资料/基础资料/InventoryAnalysis.html">
      <publishTime>07/18/2022 17:44:39</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/基础资料/基础资料/Sc_MouldStockBillMain_Temp.html">
      <publishTime>04/14/2022 09:22:30</publishTime>
@@ -2013,7 +2022,7 @@
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/HBarPlanPrint.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/test.html">
      <publishTime>08/27/2021 09:06:17</publishTime>
@@ -2028,7 +2037,7 @@
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/基础资料/工资基础资料/Gy_Group.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
      <publishTime>07/29/2022 08:37:06</publishTime>
    </File>
    <File Include="views/基础资料/工资基础资料/Gy_Group_Add_Edit.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -2157,7 +2166,7 @@
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/基础资料/隐藏列设置/Gy_GridView_Hide.html">
      <publishTime>07/05/2022 15:37:55</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="views/工资管理/Gy_DuSubsidyItemBillEdit.html">
      <publishTime>01/23/2022 20:32:28</publishTime>
@@ -2177,6 +2186,12 @@
    <File Include="views/工资管理/Gy_WorkTypeBillList.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/工资管理/工资报表/ReportList.html">
      <publishTime>07/27/2022 13:31:21</publishTime>
    </File>
    <File Include="views/工资管理/工资报表/ReportList2.html">
      <publishTime>07/27/2022 13:31:21</publishTime>
    </File>
    <File Include="views/工资管理/工资结算单%28个人%29/Kf_BarCodeEditDlg.html">
      <publishTime>09/27/2021 10:40:02</publishTime>
    </File>
@@ -2184,10 +2199,10 @@
      <publishTime>10/19/2021 09:27:19</publishTime>
    </File>
    <File Include="views/工资管理/工资结算单%28个人%29/Pay_SingleBalBillEdit.html">
      <publishTime>07/07/2022 15:44:24</publishTime>
      <publishTime>07/07/2022 15:43:14</publishTime>
    </File>
    <File Include="views/工资管理/工资结算单%28个人%29/Pay_SingleBalBillList.html">
      <publishTime>07/07/2022 15:44:24</publishTime>
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/工资管理/工资结算单%28其他%29/Kf_BarCodeEditDlg.html">
      <publishTime>09/27/2021 10:40:02</publishTime>
@@ -2246,8 +2261,14 @@
    <File Include="views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit_yqn.html">
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/工资管理/考勤汇报单/Pay_WorkTimesBillList_yqn.html">
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/报工平台/ReportPlatform.html">
      <publishTime>07/01/2021 13:15:12</publishTime>
@@ -2343,7 +2364,7 @@
      <publishTime>04/14/2022 09:22:30</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html">
      <publishTime>07/14/2022 10:48:23</publishTime>
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html">
      <publishTime>04/14/2022 09:22:30</publishTime>
@@ -2412,7 +2433,7 @@
      <publishTime>09/13/2021 10:11:41</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_MouldFile.html">
      <publishTime>07/12/2022 09:16:52</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_MouldFileList.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -2775,13 +2796,13 @@
      <publishTime>03/30/2022 17:30:55</publishTime>
    </File>
    <File Include="views/生产管理/拣料配送单/JIT_ComplementGoodsList.html">
      <publishTime>04/14/2022 09:22:30</publishTime>
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/生产管理/提料计划/JIT_LiftMaterPlaBillnList.html">
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
@@ -2835,7 +2856,7 @@
      <publishTime>12/29/2021 00:41:39</publishTime>
    </File>
    <File Include="views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
      <publishTime>07/27/2022 08:48:15</publishTime>
    </File>
    <File Include="views/生产管理/生产叫料平台/JIT_HlpBillList.html">
      <publishTime>04/14/2022 09:22:30</publishTime>
@@ -2876,8 +2897,11 @@
    <File Include="views/生产管理/生产投料单/Sc_PPBomBillList.html">
      <publishTime>04/14/2022 09:22:30</publishTime>
    </File>
    <File Include="views/生产管理/生产投料单/Sc_PPickingBillList.html">
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html">
      <publishTime>07/07/2022 17:04:05</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -2895,7 +2919,7 @@
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html">
      <publishTime>07/07/2022 17:06:33</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNewList.html">
      <publishTime>04/21/2022 13:46:59</publishTime>
@@ -2916,7 +2940,7 @@
      <publishTime>03/10/2022 14:58:38</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
@@ -2949,7 +2973,7 @@
      <publishTime>04/14/2022 09:22:30</publishTime>
    </File>
    <File Include="views/生产管理/齐套分析/JIT_CompleteDetailList.html">
      <publishTime>05/07/2022 15:04:42</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/生产管理/齐套分析/JIT_CompleteMaterialDetailList.html">
      <publishTime>05/07/2022 15:04:42</publishTime>
@@ -3000,7 +3024,10 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/组装单/Sc_AssemblyBill_Fast.html">
      <publishTime>02/08/2022 17:01:21</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/组装单/Sc_PCruxBindingPDA.html">
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -3009,7 +3036,7 @@
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillimport.html">
      <publishTime>07/14/2022 17:50:28</publishTime>
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillList.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -3294,7 +3321,7 @@
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBillList.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
      <publishTime>07/29/2022 08:37:06</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/MES_StationOutBill_PDA.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3324,10 +3351,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html">
      <publishTime>07/12/2022 11:19:28</publishTime>
      <publishTime>07/29/2022 08:37:06</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
      <publishTime>07/29/2022 10:26:44</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBill_loser.html">
      <publishTime>05/17/2021 19:07:00</publishTime>
@@ -3387,7 +3414,7 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
      <publishTime>07/27/2022 13:31:21</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList1111.html">
      <publishTime>10/19/2021 16:08:25</publishTime>
@@ -3413,6 +3440,9 @@
    <File Include="views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html">
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillDyColList.html">
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillList.html">
      <publishTime>04/14/2022 09:22:30</publishTime>
    </File>
@@ -3426,7 +3456,7 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
      <publishTime>07/27/2022 13:31:21</publishTime>
    </File>
    <File Include="views/销售管理/发货通知单/Xs_SeOutStockBillList.html">
      <publishTime>04/14/2022 09:22:30</publishTime>
@@ -3456,13 +3486,13 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_Check.html">
      <publishTime>07/07/2022 17:14:07</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_Fast.html">
      <publishTime>07/07/2022 17:14:37</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_FastList.html">
      <publishTime>07/02/2022 12:20:12</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html">
      <publishTime>03/10/2022 14:55:23</publishTime>
@@ -3480,19 +3510,19 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html">
      <publishTime>07/07/2022 17:08:25</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/领料发货/委外出库/Kf_EntrustOutBill_FastList.html">
      <publishTime>01/02/2022 22:16:06</publishTime>
    </File>
    <File Include="views/领料发货/收料入库/Kf_ReciveBill_Check.html">
      <publishTime>07/02/2022 13:05:57</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="views/领料发货/收料入库/Kf_ReciveBill_Fast.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html">
      <publishTime>07/07/2022 15:00:07</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBackBill_FastList.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3504,10 +3534,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_Fast.html">
      <publishTime>07/07/2022 15:44:24</publishTime>
      <publishTime>07/18/2022 18:14:15</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_FastList.html">
      <publishTime>07/02/2022 12:22:47</publishTime>
      <publishTime>07/18/2022 09:26:42</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBackBillEdit.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -3516,7 +3546,7 @@
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html">
      <publishTime>07/07/2022 17:02:07</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBackBill_FastList.html">
      <publishTime>08/16/2021 17:24:30</publishTime>
@@ -3537,16 +3567,16 @@
      <publishTime>05/10/2022 14:18:08</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_Fast.html">
      <publishTime>07/07/2022 17:02:48</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_FastCheck.html">
      <publishTime>04/28/2022 16:51:10</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_FastList.html">
      <publishTime>07/02/2022 12:19:19</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBackBill.html">
      <publishTime>07/07/2022 17:10:37</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBackBillList.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3558,10 +3588,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBill_Fast.html">
      <publishTime>07/07/2022 17:15:10</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBill_FastList.html">
      <publishTime>07/02/2022 12:22:01</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Xs_SeOrderPickUp_New.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3579,10 +3609,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_Fast.html">
      <publishTime>07/07/2022 17:16:53</publishTime>
      <publishTime>07/18/2022 17:45:10</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_FastList.html">
      <publishTime>07/06/2022 16:02:47</publishTime>
      <publishTime>07/18/2022 17:46:03</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherOutBill_CheckList_New.html">
      <publishTime>04/08/2022 13:12:51</publishTime>
@@ -3591,13 +3621,13 @@
      <publishTime>04/08/2022 13:17:45</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_RedOtherInBill_Fast.html">
      <publishTime>07/07/2022 15:00:03</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html">
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBackBill.html">
      <publishTime>07/07/2022 17:11:17</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBackBillList.html">
      <publishTime>03/10/2022 14:55:23</publishTime>
@@ -3609,10 +3639,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_Fast.html">
      <publishTime>07/07/2022 17:16:43</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_FastList.html">
      <publishTime>07/02/2022 12:20:45</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/qrscan.js">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3630,10 +3660,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_Fast.html">
      <publishTime>07/07/2022 17:10:16</publishTime>
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_FastList.html">
      <publishTime>07/02/2022 12:19:00</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustOutBackBill.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3642,10 +3672,10 @@
      <publishTime>05/07/2022 15:04:43</publishTime>
    </File>
    <File Include="views/验收入库/委外出库/Kf_EntrustOutBill_FastList.html">
      <publishTime>07/02/2022 12:18:34</publishTime>
      <publishTime>07/06/2022 10:43:43</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/18/2022 17:47:24</publishTime>
      <publishTime>07/29/2022 08:37:41</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/Vlog/webapi20220728.txt

@@ -51,3 +51,83 @@
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/28 15:09:18 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/28 15:09:18 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/28 15:34:01 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163','123775-3196')

2022/7/28 15:34:01 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163','123775-3196')

2022/7/28 15:53:35 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163','123775-3196')

2022/7/28 15:53:35 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163','123775-3196')

2022/7/28 15:53:36 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/28 15:53:36 ReportDataSet:2

2022/7/28 15:53:48 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163','123775-3196')

2022/7/28 15:53:48 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163','123775-3196')

2022/7/28 15:53:48 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/28 15:53:48 ReportDataSet:2

 WebTM/Vlog/webapi20220730.txt

New file
@@ -0,0 +1,87 @@
2022/7/30 11:37:30 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 11:37:30 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 11:37:30 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/30 11:37:30 ReportDataSet:1

2022/7/30 11:43:14 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 11:43:14 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 11:43:14 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/30 11:43:14 ReportDataSet:1

2022/7/30 11:44:30 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 11:44:30 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 11:44:30 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/30 11:44:30 ReportDataSet:1

2022/7/30 13:19:22 select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 13:19:22 æ‰“印sql:select b.HInterID,b.HEntryID,a.HDate as æ—¥æœŸ,m.HNumber as ç‰©æ–™ä»£ç ,m.HName as ç‰©æ–™åç§°,m.HModel as è§„格型号,
                            b.HPieceQty as ä»¶æ•°,b.HQty as æ•°é‡,a.HBillNo as é¢†æ–™å•å·,p.HBillNo as æºå•å•å·,b.HMaker åˆ¶å•äºº,u.HName è®¡é‡å•ä½
                            from Kf_ICStockBillMain a
                            left join KF_ICSTOCKBILLSUB_WMS b on b.HInterID=a.HInterID
                            left join Gy_Material m on b.HMaterID=m.HItemID
                            left join gy_unit u on m.HUnitID=u.HItemID
                            JOIN Sc_PPBomBillMain p ON b.HSourceEntryID = p.HICMOEntryID
                            where convert(varchar(50),b.HInterID)+'-'+convert(varchar(50),b.HEntryID) in  ('123159-163')

2022/7/30 13:19:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2022/7/30 13:19:23 ReportDataSet:1

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/index_Mobile.html

@@ -138,7 +138,7 @@
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="生产管理/组装单/Sc_PCruxBindingPDA.html" style="color: aqua;">
                          <a lay-href="组装单/Sc_PCruxBindingPDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              äº§çº¿å…³é”®ä»¶ç»‘定
                          </a>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList.aspx

@@ -14,7 +14,7 @@
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenOneRecordset(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.模具编号,b.工艺参数 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
            SqlXMLReportData.GenOneRecordset(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.模具编号,b.工艺参数,a.源单客户编码,a.包装标识,a.包装标识编码 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"]);
        }
    </script>
</head>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úͶÁϵ¥/Sc_PPickingBillList.html

@@ -43,6 +43,18 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">用料单</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HPPomBillNo" id="HPPomBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产单</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">条码号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillCode" id="HBillCode" style="width:190px;">
@@ -116,6 +128,9 @@
                    case 'btn-print':
                        get_PrintReport();
                        break;
                    case 'btn-view':
                        get_PrintView();
                        break;
                    default:
                        break;
                }
@@ -146,8 +161,8 @@
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type:"checkbox",fixed:"left" }
                        , { field: 'HInterID', title: 'HInterID', sort: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true }
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true}
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 150, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '条形码', title: '条形码', width: 150 }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
@@ -158,6 +173,7 @@
                        , { field: '件数', title: '件数' }
                        , { field: '领料单号', title: '领料单号' }
                        , { field: '用料清单号', title: '用料清单号' }
                        , { field: '生产订单号', title: '生产订单号' }
                    ]]
                };
                option.data = [];
@@ -167,6 +183,14 @@
            //进入页面显示的缓存列表
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_PckSplit/Get_PPickingBillList',
@@ -186,6 +210,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";
            }

            // å¿«é€Ÿè¿‡æ»¤
@@ -194,6 +219,8 @@
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var HBillCode = $("#HBillCode").val();//制单人
                var HPPomBillNo = $("#HPPomBillNo").val();//制单人
                var HICMOBillNo = $("#HICMOBillNo").val();//制单人

                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
@@ -207,6 +234,12 @@
                if (HBillCode) {
                    sWhere += " and æ¡å½¢ç  like '%" + HBillCode + "%'";
                }
                if (HPPomBillNo) {
                    sWhere += " and ç”¨æ–™æ¸…单号 like '%" + HPPomBillNo + "%'";
                }
                if (HICMOBillNo) {
                    sWhere += " and ç”Ÿäº§è®¢å•å· like '%" + HICMOBillNo + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -217,6 +250,8 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBillNo").val("");//单据号
                $("#HBillCode").val("");//部门
                $("#HPPomBillNo").val("");//部门
                $("#HICMOBillNo").val("");//部门

                sWhere = "";
            }
@@ -246,7 +281,31 @@
                    layer.msg('请选择至少一行数据打印！');
                }
            }

            //预览
            function get_PrintView() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var PrintIds = "";
                if (checkStatus.data.length >= 1) {
                    for (var i = 0; i < data.length; i++) {
                        PrintIds += data[i].HInterID + "-" + data[i].HEntryID + ","
                    }
                    PrintIds = PrintIds.substring(0, PrintIds.length - 1);
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds + '&MyMsg=' + data[0].HInterID.toString() + '&Type=HPPickingBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择至少一行数据打印！');
                }
            }
            //#endregion
            //以上是layui模块
        });

 WebTM/views/×é×°µ¥/Sc_PCruxBindingPDA.html

@@ -100,7 +100,7 @@
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HSCZY" id="HSCZY" lay-verify="HSCZY" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HSCZYID" id="HSCZY" lay-verify="HSCZYID" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HSCZYID" id="HSCZYID" lay-verify="HSCZYID" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
@@ -159,6 +159,7 @@
    <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 src="../../layuiadmin/PubCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -179,11 +180,12 @@

            //表头初始化赋值（根据登录用户获取工序 ç”Ÿäº§èµ„源、操作员、生产班组） new
            //工序 
            $("#HProcID").val(sessionStorage["HProcNo"]);
            
            $("#HProcID").val(sessionStorage["HProcID"]);
            $("#HProc").val(sessionStorage["HProc"]);
            //生产资源
            $("#HSCZY").val(sessionStorage["HSource"]);
            $("#HSCZYID").val(sessionStorage["HSourceID"]);
            $("#HSCZYID").val(sessionStorage["HSourceID"] == undefined ? "0" : sessionStorage["HSourceID"]);
            //操作员
            $("#HKeeperName").val(sessionStorage["HKeeper"]);
            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
@@ -234,14 +236,14 @@
            set_InitGridTM();

            //选择工序
            form.on('submit(HKeeperID-BT)', function () {
            form.on('submit(HProcID-BT)', function () {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_ProcList.html', 'yes']
                    , content: ['../Baseset/基础资料/Gy_ProcList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -249,8 +251,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HKeeperName").val(checkStatus.data[0].HName);
                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
                        $("#HProc").val(checkStatus.data[0].工序);
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -264,7 +266,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../PublicPage/UserInformation.html', 'yes']
                    , content: ['../PublicPage/UserInformation.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -287,7 +289,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '职员列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
                    , content: ['../PublicPage/GroupInformation.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -306,60 +308,32 @@
            //退出
            form.on('submit(Cancel)', function () {
                sessionStorage["SourceFlag"] = false;
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                layer.confirm('您确定要删除吗？', {
                    btn: ['确定', '取消'] //按钮
                    , yes: function (index, layero) {
                        Pub_Close(2);
                    }
                });
            })
           
            //删除
            form.on('submit(cmdDelete)', function () {
                var checkStatus = table.checkStatus('wl-table')
                var checkStatus = table.checkStatus('tm-table')
                    , data = checkStatus.data;
                // console.log(data);
                var sInterID = $('#HInterID').val()
                var sMaterID = data[0].HMaterID
                var sBillType = '1201'
                var sAuxPropID = data[0].HAuxPropID
                //var sMTONo = data[0].HMTONo
                var sMTONo = ''
                var sSourceInterID = data[0].HSourceInterID
                var sSourceEntryID = data[0].HSourceEntryID
                var sMouldManagerCtl = 'N'
                var sFIFOCtl = 'N'
                var sBarCode = data[0].HPJM.toString();
                $.ajax(
                    {
                        type: "Get",
                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //方法所在页面和方法名
                        url: GetWEBURL() + "/ProductIn/Delete_Json_AN",
                        url: GetWEBURL() + "/Sc_PckSplit/Delete_PHPCruxBillListByME",
                        async: true,
                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HBarCode": sBarCode},
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                $.ajax({
                                    url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_New_Json1',
                                    type: "GET",
                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                            listOption.data = result.data.list;
                                            table.render(listOption);
                                            var count = 0;
                                            var count1 = 0;
                                            for (var i = 0; i < result.data.list.length; i++) {
                                                count += result.data.list[i].HQty;
                                                count1 += result.data.list[i].HPieceQty;
                                            }
                                            $("#HSumQtys").val(count);
                                            $("#HBarCodeQtys").val(count1);
                                            //return;
                                        }
                                        else {
                                            layer.msg(result.Message);
                                        }
                                        layer.closeAll("loading");
                                    }
                                });
                                option1.data = data.data;
                                table1.render(option1);
                            }
                            else {
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -373,45 +347,24 @@

            //提交
            form.on('submit(Saver)', function (data) {//提交
                if ($("#HExplanation").val() == "") {
                    if ($("#HWHNAME").val() == "宽幅成品仓NEW" || $("#HWHNAME").val() == "样本仓NEW") {
                        $("#HWHNAME").val("");
                        $("#HWHID").val("");
                        layer.msg("请扫MES库位码！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                }
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = table.cache['wl-table'];
                var sSourceType = $("#HBillType").val();
                if (AllowLoadData(sSubStr, 'Saver') != false)//非空验证
                {
                    layer.load(3);
                    $.ajax(
                var sSubStr = JSON.stringify(table.cache['pj-table']);
                var sSubStr1 = JSON.stringify(table.cache['tm-table']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ';' + sessionStorage["HUserName"];
                 $.ajax(
                        {
                            type: "POST",
                            //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePOStockInBill_Json", //方法所在页面和方法名
                            url: GetWEBURL() + "/POStockInBill/set_SavePOStockInBill_Json",
                         url: GetWEBURL() + "/Sc_PckSplit/Add_PHPCruxBillList",
                            async: true,
                            data: { "oMain": sMainStr },
                            data: { "msg": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    sessionStorage["SourceFlag"] = false;
                                    layer.confirm("收料" + data.Message + $("#HBillNo").val(), {
                                        icon: 1,
                                        skin: 'layui-layer-lan',
                                        closeBtn: 0,
                                        btn: ['确认'],
                                        btn2: function () {
                                            //parent.layui.admin.events.closeThisTabs();关闭页签
                                            //window.close();//关闭页面，浏览器有效，PDA无效
                                            //window.location.reload();//新增
                                            parent.location.href = "../../../views/index.html"
                                        }//关闭
                                    }
                                        , function () { parent.location.href = "../../../views/index.html"; }//新增
                                    );
                                    layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { time: 1 * 1000, icon: 1 }, function () {
                                        location.reload();
                                    });
                                    //layer.msg("提交成功" + data.Message + $("#HBillNo").val(), { icon: 1, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    //location.reload();
                                }
                                else {
                                    //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
@@ -425,8 +378,6 @@
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        });
                    return false;
                }
            });

            //监听提交
@@ -444,23 +395,28 @@
            //SN码回车方法
            $('#HBarCode').on('keydown', function (event) {
                var sBarCode = $('#HBarCode').val()
                var sProcID = $('#HProcID').val()
                var sInterID = $('#HInterID').val()
                var sBillNo = $('#HBillNo').val()
                if (sBarCode == "") {
                    layer.msg("请输入SN号", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (sProcID == "" || sProcID == "undefined") {
                    sProcID = 0;
                }
                if (event.keyCode == 13) {
                    $.ajax({
                        url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
                        url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxSNBillList",
                        type: "GET",
                        async: false,
                        data: { "HBarCode": sBarCode },
                        data: { "HinterID": sInterID, "HBarCode": sBarCode, "HProcID": sProcID, "HBillNo": sBillNo},
                        success: function (result) {
                            if (result.count == 1) {
                                option.data = result.data;
                                table.render(option);
                            }
                            else {
                                playSound();
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
@@ -470,281 +426,39 @@
                    $("#HPCrux").focus();
                }
            });
            

             //关键件回车方法
            $('#HPCrux').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    GetMeesageBySourceBillNo();
                }
            });


            //扫条码
            function GetMeesageByBarCode(obj) {  //返回工作中心
                var sSubStr = table.cache['wl-table'];
                var sBarCode = $('#HBarCode').val()
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var sQty = $("#HQty").val()
                var sHBillType = $("#HBillType").val()  //源单类型
                var sBillType = '1201'
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                var sSourceBillNo = $("#HSourceBillNo").val()
                var sMouldManagerCtl = "N";  //是否启用器具管理
                var sFIFOCtl = "N";          //是否启用先进先出管理

                if (sQty == "") {
                    sQty = 0;
                }

                //判断条码是否为空  new
                if (sBarCode == '') {
                    playSound();
                    layer.msg("条码为空，不能扫描！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                var sHPCrux = $('#HPCrux').val()
                var sInterID = $('#HInterID').val()
                var sBillNo = $('#HBillNo').val()
                if (sHPCrux == "") {
                    layer.msg("请输入关键码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (sBarCode != "") {
                    $('#HBarCode').val("");
                }
                if (sQty != "") {
                    $('#HQty').val("");
                }
                if (sHWHID == "184154") {
                    if (sHSPID == "0") {
                        playSound();
                        layer.msg("仓位为空，请选择仓位！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return false;
                    }
                }
                $.ajax({
                    url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
                    type: "GET",
                    async: false,
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            playSound1();
                            if (result.data.HBarType == '仓库条码') {
                                $("#HWHNAME").val(result.data.HWhName);
                                $("#HWHID").val(result.data.HWhID);
                                $("#HStockPlaceName").val("");
                                $("#HNote").val(";一键扫码仓库条码");
                                element.tabChange('tab-POStockInBill', '2');  //跳转页签
                if (event.keyCode == 13) {
                    $.ajax({
                        url: GetWEBURL() + "/Sc_PckSplit/Get_PHPCruxBillList",
                        type: "GET",
                        async: false,
                        data: { "HinterID": sInterID, "HPCrux": sHPCrux, "HBillNo": sBillNo},
                        success: function (result) {
                            if (result.count == 1) {
                                option1.data = result.data;
                                table1.render(option1);
                            }
                            else if (result.data.HBarType == '仓位条码') {
                                $("#HStockPlaceName").val(result.data.HSPName);
                                $("#HStockPlaceID").val(result.data.HSPID);
                                $("#HWHNAME").val(result.data.HWhName);
                                $("#HWHID").val(result.data.HWhID);
                                $("#HNote").val(";一键扫码仓位条码");
                                element.tabChange('tab-POStockInBill', '2');//跳转页签
                            }
                            else if (result.data.HBarType == '部门条码') {
                                $("#HDeptName").val(result.data.HDeptName);
                                $("#HDeptID").val(result.data.HDeptID);
                                $("#HNote").val(";一键扫码部门条码");
                                element.tabChange('tab-POStockInBill', '2');//跳转页签
                            }
                            else if (result.data.HBarType == '源单条码') {
                                $("#HSupName").val(result.data.HSupName);
                                $("#HSupID").val(result.data.HSupID);
                                $("#HDeptName").val(result.data.HDeptName);
                                $("#HDeptID").val(result.data.HDeptID);
                                $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                $("#HBillType").val(result.data.hSourceBillTypeField)
                                sessionStorage["SourceFlag"] = true;
                                //获取源单类型、源单单号
                                if (result.data.HSourceBillType == "1102") {
                                    $("#HBillType").val("1102");

                                }
                                else if (result.data.HSourceBillType == "1103") {
                                    $("#HBillType").val("1103");
                                }
                                else {
                                    $("#HBillType").val("手工录入");
                                }
                                $("#HNote").val(";一键扫码源单条码");
                                element.tabChange('tab-POStockInBill', '3');
                            else if (result.count == 2) {
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            else {
                                if (HSourceFlag == true) {
                                    element.tabChange('tab-POStockInBill', '3');
                                }
                                else {
                                    $("#HSupName").val(result.data.hSupNameField);
                                    $("#HSupID").val(result.data.hSupIDField);
                                    //$("#HDeptName").val(result.data.HDept);
                                    //$("#HDeptID").val(result.data.HDeptID);
                                    //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    //$("#HBillType").val(result.data.hSourceBillTypeField)
                                    HSourceFlag = true;
                                    //获取源单类型、源单单号
                                    if (result.data.hSourceBillTypeField == "1102") {
                                        $("#HBillType").empty();
                                        $("#HBillType").val("1102");
                                        var optionHtml = '';
                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '采购订单' + "</option>";
                                        $("#HBillType").append(optionHtml);
                                        layui.form.render('select');
                                        $("#HBillType").attr("readonly", "readonly");
                                    }
                                    if (result.data.hSourceBillTypeField == "1103") {
                                        $("#HBillType").empty();
                                        $("#HBillType").val("1103");
                                        var optionHtml = '';
                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '收料通知单' + "</option>";
                                        $("#HBillType").append(optionHtml);
                                        layui.form.render('select');
                                        $("#HBillType").attr("readonly", "readonly");
                                    }
                                    else {
                                        //$("#HBillType").val("-1");
                                    }
                                    $("#HSourceBillNo").attr("readonly", "readonly");
                                    $("#HNote").val(";物料条码");
                                    element.tabChange('tab-POStockInBill', '3');
                                }
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }

                            layer.load(3)
                            $.ajax({
                                url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
                                type: "GET",
                                data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                success: function (result) {
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        listOption.data = result.data.list;
                                        table.render(listOption);
                                        $("#HBarCode_B").val(result.data.list2[0].HBarCode);
                                        $("#HMaterName_B").val(result.data.list2[0].HMaterName);
                                        $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
                                        $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
                                        $("#HUnitName_B").val(result.data.list2[0].HUnitName);
                                        $("#HQty_B").val(result.data.list2[0].HQty);
                                        $("#HTMQty_B").val(result.data.list2[0].HTMQty);
                                        $("#HWHName_B").val(result.data.list2[0].HWHName);
                                        $("#HSPName_B").val(result.data.list2[0].HSPName);

                                        var count = 0;
                                        var count1 = 0;
                                        for (var i = 0; i < result.data.list.length; i++) {
                                            count += result.data.list[i].HQty;
                                            count1 += result.data.list[i].HPieceQty;
                                        }
                                        $("#HSumQtys").val(count);
                                        $("#HBarCodeQtys").val(count1);
                                    }
                                    else {
                                        layer.msg(result.Message);
                                    }
                                    layer.closeAll("loading");
                                }
                            });
                            layer.closeAll("loading");
                        }
                        else {
                            playSound();
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        layer.closeAll("loading");
                    }
                });
            }
            var listOption = {
                elem: '#wl-table'
                , toolbar: '#toolbarDemo'
                , totalRow: true
                , cellMinWidth: 90
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HSNO', title: '序号', width: 60 }
                    , { field: 'HQty', title: '数量', width: 80, totalRow: true }
                    , { field: 'HQtyMust', title: '应发数量', width: 80, totalRow: true}
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HBatchNo', title: '批次', width: 150 }
                    , { field: 'HPieceQty', title: '条码数量', width: 150 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                    });
                    //显示完后，光标到关键件上
                    $("#HPCrux").focus();
                }
            }
            function playSound() {
                var audio = document.getElementById("cs");
                audio.play();
            }
            function playSound1() {
                var audio = document.getElementById("cs2");
                audio.play();
            }
            //扫源单
            function GetMeesageBySourceBillNo(obj) {
                var HSourceBillNo = $('#HSourceBillNo').val()
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var HSourceBillType = $("#HBillType").val()
                if (HSourceBillNo == "" || sInterID <= 0) {
                    layer.msg("源单号为空，或者内码不存在！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    url: GetWEBURL() + "/POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    type: "GET",
                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HSupID").val(result.data[0].HSupID);
                            $("#HSupName").val(result.data[0].HSupName);
                            sessionStorage["SourceFlag"] = true;
                            layer.load(3);
                            element.tabChange('tab-POStockInBill', '2');

                            table.render({
                                elem: '#wl-table'
                                , cellMinWidth: 80
                                , totalRow: true
                                //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
                                , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                                //, toolbar: '#toolbarDemo'
                                , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
                                , cols: [[
                                    { type: 'radio' }
                                    , { field: 'HQty', title: '数量', sort: true, width: 100, totalRow: true}
                                    , { field: 'HQtyMust', title: '应收数量', sort: true, width: 100, totalRow: true}
                                    , { field: 'HMaterNumber', title: '物料代码', sort: true, width: 200 }
                                    , { field: 'HMaterName', title: '物料名称', sort: true, width: 200 }
                                    , { field: 'HMaterModel', title: '规格型号', sort: true, width: 200 }
                                    , { field: 'HSourceInterID', title: '源单主内码', sort: true, width: 200 }
                                    , { field: 'HSourceEntryID', title: '源单子内码', sort: true, width: 200 }
                                    , { field: 'HSourceBillNo', title: '源单单号', sort: true, width: 200 }
                                    , { field: 'HBatchNo', title: '批次' }
                                ]]
                                // , data: [linterid]
                                // , page: true
                                , height: 500
                                , done: function () {
                                    layer.closeAll("loading");
                                }
                            });
                        }
                        else {
                            // $("#verifycode").click();
                            //layer.msg(result.Message, { icon: 5 });
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        layer.closeAll("loading");
                    }
                });
            }
            });


            //初始化表格—配件
@@ -775,6 +489,7 @@
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 150, hide: true }
                    , { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 150, hide: true }
                    , { field: 'HMaterName', title: '物料名称', edit: 'text', width: 150 }
                    , { field: 'HMaterSpec', title: '规格型号', edit: 'text', width: 150 }
                    , { field: 'HQty', title: '数量', edit: 'text', width: 150 }
@@ -792,50 +507,7 @@
                option1.data = [];
                table1.render(option1);
            }
            //非空验证
            function AllowLoadData(sSubStr, bnt) {  
                if ($("#HDeptName").val() == '') {
                    layer.msg("部门没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HSecManager").val() == '') {
                    layer.msg("验收人没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HKeeper").val() == '') {
                    layer.msg("保管人没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HBillNo").val() == '') {
                    layer.msg("错误的单据号", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if ($("#HInterID").val() == '') {
                    layer.msg("错误的内码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (typeof (sSubStr) == "undefined") {
                    //layer.msg("没有物料明细记录", { icon: 5, btn: ['确定'], time: 100000, offset: 't' });
                    layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (bnt == 'Saver') {
                    if (!typeof (sSubStr) == "undefined") {
                        for (var i = 0; i <= sSubStr.length - 1; i++) {   //判断扫码数量不能为0
                            if (parseFloat(sSubStr[i].HQty) > 0) {
                                s = 1;
                            }
                        }
                        if (s == 0) {
                            layer.msg("外购入库记录未扫码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                    }
                }
                else {
                    return true;
                }
            }
            
        });
        
        

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

@@ -342,6 +342,9 @@
                        , { field: 'HBillType', title: 'HBillType', width: 80, hide: true}
                        , { field: 'hsubid', title: 'hsubid', width: 80, hide: true}
                        , { field: '拆分数量', title: '拆分数量' }
                        , { field: '源单客户编码', title: '源单客户编码', width: 80 }
                        , { field: '包装标识', title: '包装标识', width: 80 }
                        , { field: '包装标识编码', title: '包装标识编码', width: 80 }
                    ]]
                };
                table.render(option);