nothing

zgq

2021-03-29 3b59fc3e88c231534e2e98aa8e3b9b8e08d02ce1

nothing

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

File was deleted

 WebTM/Properties/PublishProfiles/LAYUI.pubxml

 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user

File was renamed from WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -4,17 +4,17 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\WebTM</_PublishTargetUrl>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\LAYUI</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="bin/layuiadmin/layui/layui.js">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>03/24/2021 13:58:43</publishTime>
      <publishTime>03/24/2021 16:35:44</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/24/2021 13:58:43</publishTime>
      <publishTime>03/24/2021 16:35:44</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <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 08:57:24</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>
@@ -1085,19 +1085,7 @@
      <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_Employee.html">
      <publishTime>03/24/2021 15:58:05</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Material.html">
      <publishTime>03/24/2021 15:58:05</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Warehouse.html">
      <publishTime>03/24/2021 15:58:05</publishTime>
      <publishTime>03/25/2021 16:17:08</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_BadReason.html">
      <publishTime>03/24/2021 15:58:05</publishTime>
@@ -1105,11 +1093,8 @@
    <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>
    <File Include="views/基础资料/生产基础资料/Gy_Source.html">
      <publishTime>03/24/2021 16:33:45</publishTime>
      <publishTime>03/25/2021 16:17:08</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessDetail.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1118,52 +1103,43 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/基础资料/采购基础资料/Gy_Supplier.html">
      <publishTime>03/24/2021 09:59:52</publishTime>
      <publishTime>03/24/2021 10:10:09</publishTime>
    </File>
    <File Include="views/基础资料/销售基础资料/Gy_Customer.html">
      <publishTime>03/24/2021 10:29:28</publishTime>
    <File Include="views/模治具管理/Sc_CheckToolsRepairWorkBillList.html">
      <publishTime>03/24/2021 14:28:14</publishTime>
    </File>
    <File Include="views/生产工序管理/委外工单/WW_EntrustWorkOrderBillMainList.html">
      <publishTime>03/25/2021 14:47:08</publishTime>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>03/24/2021 08:53:43</publishTime>
    </File>
    <File Include="views/生产工序管理/委外工序汇报单/Sc_StationOutBillMainList.html">
      <publishTime>03/25/2021 14:46:45</publishTime>
    <File Include="views/组装单/Sc_AssemblyBill_Fast.html">
      <publishTime>03/24/2021 08:53:43</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillList.html">
      <publishTime>03/24/2021 08:53:43</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>
      <publishTime>03/25/2021 17:22:08</publishTime>
    </File>
    <File Include="views/生产工序管理/工序计划单/Sc_ProcessPlanList.html">
      <publishTime>03/24/2021 14:50:32</publishTime>
      <publishTime>03/26/2021 17:29:36</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
      <publishTime>03/23/2021 16:57:43</publishTime>
    </File>
    <File Include="views/组装单/Sc_AssemblyBill_Fast.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
      <publishTime>03/23/2021 16:57:43</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
      <publishTime>03/23/2021 16:57:43</publishTime>
    </File>
    <File Include="views/车间管理/工序汇报/MES_StationInBill.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    <File Include="views/车间管理/不良品评审单/Cj_NoPassProc.html">
      <publishTime>03/26/2021 09:58:10</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 Include="views/车间管理/不良品评审单/Cj_NoPassProcList.html">
      <publishTime>03/26/2021 15:41:47</publishTime>
    </File>
    <File Include="views/车间管理/工序流转/MES_StationInBill.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1301,7 +1277,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>03/24/2021 13:58:47</publishTime>
      <publishTime>03/24/2021 16:35:45</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/Properties/PublishProfiles/webtm.pubxml

File was deleted

 WebTM/WebTM.csproj

@@ -64,7 +64,6 @@
    <Content Include="layuiadmin\layui\font\iconfont.ttf" />
    <Content Include="layuiadmin\layui\font\iconfont.woff" />
    <None Include="Properties\PublishProfiles\JFTM.pubxml" />
    <None Include="Properties\PublishProfiles\SWETM.pubxml" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -436,8 +435,6 @@
    <Content Include="views\基础资料\生产基础资料\Gy_Process.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessList.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_CheckToolsRepairWorkBillList.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillList.html" />
    <Content Include="views\组装单\Sc_AssemblyBill_Fast.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList.html" />
@@ -489,7 +486,6 @@
    <Content Include="views\验收入库\委外入库\Kf_EntrustInBill_FastList.html" />
    <Content Include="Web.config" />
    <None Include="Properties\PublishProfiles\Web.pubxml" />
    <None Include="Properties\PublishProfiles\webtm.pubxml" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />

 WebTM/WebTM.csproj.user

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>SWETM</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -2,6 +2,8 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    var WEBURL = "http://localhost:8081/JFAPI/";       //zgq本地
    var WEBURL = "http://localhost:8085/JFAPI/";
     //var WEBURL = "http://localhost:8081/lubaoWebAPI/";//王永波本地配置
    return WEBURL
}


 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤µ¥/WW_EntrustWorkOrderBillMainList.html

@@ -109,7 +109,8 @@
                ,cellMinWidth: 90
                , cols: [[
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                    { field: 'HBillType ', title: '单据类型', sort: true, width: 120 }
                      { type: 'checkbox' }
                    ,{ field: 'HBillType ', title: '单据类型', sort: true, width: 120 }
                    , { field: 'HBillSubType', title: '子类型', sort: true, width: 170 }
                    //, { field: 'HBillStatus ', title: '单据状态', width: 105 }
                    , { field: 'HDate', title: '日期' }

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤Ðò»ã±¨µ¥/Sc_StationOutBillMainList.html

@@ -109,7 +109,8 @@
                ,cellMinWidth: 90
                , cols: [[
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                    { field: 'HBillType ', title: '单据类型', sort: true, width: 120 }
                      { type: 'checkbox' }
                    ,{ field: 'HBillType ', title: '单据类型', sort: true, width: 120 }
                    , { field: 'HBillSubType', title: '子类型', sort: true, width: 170 }
                    //, { field: 'HBillStatus ', title: '单据状态', width: 105 }
                    , { field: 'HDate', title: '日期' }

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò»ã±¨µ¥/Sc_ProcessReportList.html

@@ -109,7 +109,8 @@
                ,cellMinWidth: 90
                , cols: [[
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                    { field: 'HDate', title: '日期', sort: true, width: 120 }
                     { type: 'checkbox' }
                    ,{ field: 'HDate', title: '日期', sort: true, width: 120 }
                    , { field: 'HBillNo', title: '单据号', sort: true, width: 170 }
                    //, { field: 'HBillStatus ', title: '单据状态', width: 105 }
                    , { field: 'HICMOBillNo', title: '任务单号' }

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤ÐòÅɹ¤µ¥/Sc_ProcessSendWorkList.html

@@ -109,7 +109,8 @@
                ,cellMinWidth: 90
                , cols: [[
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                    { field: 'HDate', title: '日期', sort: true, width: 120 }
                       { type: 'checkbox' }
                     ,{ field: 'HDate', title: '日期', sort: true, width: 120 }
                    , { field: 'HBillNo', title: '单据号', sort: true, width: 170 }
                    , { field: 'HBillStatus ', title: '单据状态', width: 105 }
                    , { field: 'HICMOBillNo', title: '任务单号' }

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò¼Æ»®µ¥/Sc_ProcessPlanList.html

@@ -66,12 +66,9 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="detail"><i class="layui-icon layui-icon-form"></i>下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>添加</button>

                            </div>
                        </script>
@@ -80,6 +77,35 @@
            </div>
        </div>
    </div>
      
       <!--layer弹窗-->
        <div class="site-text" style="margin: 5%; display: none" id="window"  target="test123">	
            <form class="layui-form" id="book" method="post" lay-filter="example">
              <div class="layui-form-item">
                <label class="layui-form-label">单据号</label>
                <div class="layui-input-block">
                  <input type="text" id="HBillNo" name="HBillNo" lay-verify="title" autocomplete="off" placeholder="请输入单据号" class="layui-input">
                </div>
              </div>
              <div class="layui-form-item">
                <label class="layui-form-label">任务单号</label>
                <div class="layui-input-block">
                  <input type="text" id="HICMOBillNo" name="HICMOBillNo" lay-verify="title" autocomplete="off" placeholder="请输入任务单号" class="layui-input">
                </div>
              </div>
              <div class="layui-form-item">
                <label class="layui-form-label">生产数量</label>
                <div class="layui-input-block">
                  <input type="text" id="HPlanQty" name="HPlanQty" lay-verify="title" autocomplete="off" placeholder="请输入生产数量" class="layui-input">
                </div>
              </div>
            </form>
        </div>

    <script type="text/html" id="barDemo">
  <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 src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -103,13 +129,14 @@

            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , toolbar: '#toolbarDemo'
                ,height: 'full-50' 
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    { type: 'checkbox' }
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                    { field: 'HDate', title: '日期', sort: true, width: 120 }
                    ,{ field: 'HDate', title: '日期', sort: true, width: 120 }
                    , { field: 'HBillNo', title: '单据号', sort: true, width: 170 }
                    //, { field: 'HBillStatus ', title: '单据状态', width: 105 }
                    , { field: 'HICMOBillNo', title: '任务单号' }
@@ -158,9 +185,80 @@
                    //, { field: '关闭类型', title: '关闭类型' }
                    //, { field: '单据类型', title: '单据类型' }
                    //, { field: '计划跟踪号', title: '计划跟踪号' }
                     //,{fixed: 'right', title:'操作', toolbar: '#barDemo', width:150}
                ]]
            };

   
//监听行工具事件
  //table.on('tool(mainTable)', function(obj){
  //  var data = obj.data;
  //  //console.log(obj)
  //  if(obj.event == 'del'){
  //    layer.confirm('真的删除行么', function(index){
  //      obj.del();
  //      layer.close(index);
  //    });
  //  } else if(obj.event == 'edit'){
  //    layer.prompt({
  //      formType: 2
  //      ,value: data.HDate
  //    }, function(value, index){
  //      obj.update({
  //        HDate: value
  //      });
  //      layer.close(index);
  //      });
  //      //layer.alert('我是编辑上');
  //  }
  //});
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
                switch (obj.event) {
                    case 'detail':
                        if (checkStatus.data.length < 1) {
                            layer.msg('请选择一行数据下推');
                        } else
                        {
                  
                //页面层
                layer.open({
                               type: 1 //Page层类型
                               ,skin: 'layui-layer-molv'
                               ,area: ['666px', '666px']
                               ,title: ['编辑信息','font-size:18px']
                               ,btn: ['确定', '取消'] 
                               ,shadeClose: true
                               ,shade: 0 //遮罩透明度
                               ,maxmin: true //允许全屏最小化
                               ,content:$("#window")
                    , success: function () {
                        $('#HBillNo').val();
                                $('#HICMOBillNo').val("HICMOBillNo"); 
                                $('#HPlanQty').val("HPlanQty"); 
                               }
                    , yes: function () {
                        alert('asdasd');
                               }
                           });
  		


                            //var data = checkStatus.data;
                            //layer.alert(JSON.stringify(data));
                        }
                        break;
                    case 'add':
                        layer.msg('添加');
                        break;
                    case '':
                        layer.msg('');
                        break;

                };
            });

            //进入页面显示的缓存列表
            var index0 = layer.load(0, { shade: false });
            $.ajax({