zgq
2021-03-24 5849968d7f87ff596a98de0072b1111d4b10b1f5
新增生产资源设置
5个文件已修改
2个文件已添加
265 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/webtm.pubxml.user 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_Source.html 180 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml
New file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <DeleteExistingFiles>True</DeleteExistingFiles>
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>F:\网站发布\江丰\JFTM</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>
</Project>
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 14:06:39</publishTime>
      <publishTime>03/24/2021 16:35:44</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/24/2021 14:06:39</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 14:01:04</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>
@@ -1093,8 +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 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>
@@ -1108,6 +1108,15 @@
    <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>
@@ -1115,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">
@@ -1271,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>
WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -11,10 +11,10 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>03/24/2021 16:11:44</publishTime>
      <publishTime>03/24/2021 16:33:50</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/24/2021 16:11:44</publishTime>
      <publishTime>03/24/2021 16:33:50</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 16:10:32</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>
@@ -1096,20 +1096,29 @@
    <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>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessDetail.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <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 14:04:02</publishTime>
      <publishTime>03/24/2021 16:10:32</publishTime>
    </File>
    <File Include="views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html">
      <publishTime>03/24/2021 15:22:58</publishTime>
      <publishTime>03/24/2021 16:10:32</publishTime>
    </File>
    <File Include="views/生产工序管理/工序计划单/Sc_ProcessPlanList.html">
      <publishTime>03/24/2021 14:50:32</publishTime>
      <publishTime>03/24/2021 16:10:32</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
WebTM/WebTM.csproj
@@ -63,6 +63,7 @@
    <Content Include="layuiadmin\layui\font\iconfont.eot" />
    <Content Include="layuiadmin\layui\font\iconfont.ttf" />
    <Content Include="layuiadmin\layui\font\iconfont.woff" />
    <None Include="Properties\PublishProfiles\JFTM.pubxml" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -427,6 +428,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Employee.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Department.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Source.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Process.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
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>webtm</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/views/index.html
@@ -203,7 +203,7 @@
                          <a>生产基础资料</a>
                          <dl class="layui-nav-child">
                              <dd><a lay-href="基础资料/生产基础资料/Gy_Process.html">工序设置</a></dd>
                              <dd><a lay-href="基础资料/生产基础资料/Gy_Process.html">生产资源设置</a></dd>
                              <dd><a lay-href="基础资料/生产基础资料/Gy_Source.html">生产资源设置</a></dd>
                              <dd><a lay-href="基础资料/生产基础资料/Gy_BadReason.html">不良原因设置</a></dd>
                          </dl>
                      </dd>
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html
New file
@@ -0,0 +1,180 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title>生产资源设置</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产资源代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产资源名称</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <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>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            var sWhere = "";
            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                ,height: 'full-50'
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    , { field: '生产资源代码', title: '生产资源代码' }
                    , { field: '生产资源名称', title: '生产资源名称' }
                    , { field: '条码编号', title: '条码编号' }
                    , { field: 'Hprocid', title: 'Hprocid', hide: true }
                    , { field: '工序', title: '工序' }
                    , { field: '工作中心', title: '工作中心' }
                    , { field: '禁用标记', title: '禁用标记' }
                    , { field: '备注', title: '备注' }
                ]]
            };
            var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
            $.ajax({
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Gy_Source/list',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HNumber").val("");
                $("#HName").val("");
                $("#btnSearch").click();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and ç”Ÿäº§èµ„源代码 like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and ç”Ÿäº§èµ„源名称 like '%" + HName + "%'";
                }
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL1() + '/Gy_Source/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
            });
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
            //    , trigger: 'click'
            //    , format:'yyyy-MM-dd HH:mm'
            //});
            //以上是layui模块
        });
    </script>
</body>
</html>