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

jingh

2021-03-25 f988af1194fa29e2983b32bd6552356c10880ca7

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -11,10 +11,10 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>03/24/2021 10:00:01</publishTime>
      <publishTime>03/24/2021 16:35:44</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/24/2021 10:00:01</publishTime>
      <publishTime>03/24/2021 16:35:44</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -581,7 +581,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>03/23/2021 14:37:09</publishTime>
      <publishTime>03/24/2021 16:11:22</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -932,7 +932,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>03/24/2021 10:00:35</publishTime>
      <publishTime>03/24/2021 16:33:50</publishTime>
    </File>
    <File Include="views/senior/echarts/bar.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1084,11 +1084,17 @@
    <File Include="views/基础资料/公用基础资料/Gy_Warehouse.html">
      <publishTime>03/24/2021 09:17:43</publishTime>
    </File>
    <File Include="views/基础资料/工资基础资料/Gy_Group.html">
      <publishTime>03/24/2021 14:06:30</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_BadReason.html">
      <publishTime>03/24/2021 10:54:34</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_Process.html">
      <publishTime>03/23/2021 16:28:14</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_ProcessBillList.html">
      <publishTime>03/23/2021 15:48:21</publishTime>
    <File Include="views/基础资料/生产基础资料/Gy_Source.html">
      <publishTime>03/24/2021 16:33:45</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessDetail.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1099,6 +1105,18 @@
    <File Include="views/基础资料/采购基础资料/Gy_Supplier.html">
      <publishTime>03/24/2021 09:59:52</publishTime>
    </File>
    <File Include="views/基础资料/销售基础资料/Gy_Customer.html">
      <publishTime>03/24/2021 10:29:28</publishTime>
    </File>
    <File Include="views/生产工序管理/工序汇报单/Sc_ProcessReportList.html">
      <publishTime>03/24/2021 16:10:32</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html">
      <publishTime>03/24/2021 16:10:32</publishTime>
    </File>
    <File Include="views/生产工序管理/工序计划单/Sc_ProcessPlanList.html">
      <publishTime>03/24/2021 16:10:32</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
@@ -1106,24 +1124,6 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationInBill.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationInBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationInBill_PDA.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBill.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationOutBill_PDA.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/车间管理/工序流转/MES_StationInBill.html">
@@ -1262,7 +1262,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/23/2021 15:50:53</publishTime>
      <publishTime>03/24/2021 16:35:45</publishTime>
    </File>
  </ItemGroup>
</Project>