zgq
2021-06-17 73ffdd29452e978bd4e7ef79580116f96e1ae33b
裁切派工优化
5个文件已修改
1个文件已添加
240 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/webtm.pubxml.user 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/裁切派工单/Xs_CutWorkSendBill.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/裁切派工单/Xs_CutWorkSendBillList.html 190 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>06/08/2021 15:44:33</publishTime>
      <publishTime>06/10/2021 14:45:20</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>06/08/2021 15:44:33</publishTime>
      <publishTime>06/10/2021 14:45:20</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>01/14/2021 10:06:23</publishTime>
@@ -583,7 +583,7 @@
      <publishTime>01/14/2021 10:06:23</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>06/08/2021 15:47:30</publishTime>
      <publishTime>06/17/2021 13:45:05</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -955,7 +955,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>06/08/2021 15:52:16</publishTime>
      <publishTime>06/10/2021 14:51:26</publishTime>
    </File>
    <File Include="views/senior/echarts/bar.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1108,7 +1108,10 @@
      <publishTime>02/25/2021 14:28:42</publishTime>
    </File>
    <File Include="views/仓存管理/裁切派工单/Xs_CutWorkSendBill.html">
      <publishTime>06/09/2021 11:34:36</publishTime>
      <publishTime>06/17/2021 13:44:16</publishTime>
    </File>
    <File Include="views/仓存管理/裁切派工单/Xs_CutWorkSendBillList.html">
      <publishTime>06/17/2021 13:12:12</publishTime>
    </File>
    <File Include="views/仓库调拨/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
WebTM/WebTM.csproj
@@ -421,6 +421,7 @@
    <Content Include="views\仓存管理\仓库调拨\Kf_UpMoveStockBill.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Fast.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_FastList.html" />
    <Content Include="views\仓存管理\裁切派工单\Xs_CutWorkSendBillList.html" />
    <Content Include="views\仓存管理\裁切派工单\Xs_CutWorkSendBill.html" />
    <Content Include="views\公共页面\Kf_BarCodeEditDlg.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,8 +1,8 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://124.70.129.242/WebAPI/";          //雅琪诺
    var WEBURL = "http://124.70.129.242/WebAPI/";          //雅琪诺
    //var WEBURL = "http://124.70.129.242:9090/WebAPI/";          //雅琪诺测试
    var WEBURL = "http://localhost:8084/WebAPI/";
    //var WEBURL = "http://localhost:8084/WebAPI/";
    //61.130.49.162:9090
    //WEBURL = "";
    return WEBURL
@@ -10,9 +10,9 @@
function GetWEBURL1() {
    //var WEBURL = 'http://192.168.16.80:8011/';           //办公室服务器
    //var WEBURL = 'http://124.70.129.242/WebAPI/';          //雅琪诺
    var WEBURL = 'http://124.70.129.242/WebAPI/';          //雅琪诺
    //var WEBURL = 'http://124.70.129.242:9090/WebAPI/';          //雅琪诺测试
    var WEBURL = 'http://localhost:8084/WebAPI/';
    //var WEBURL = 'http://localhost:8084/WebAPI/';
    //61.130.49.162:9090
    //WEBURL = "";
    return WEBURL
WebTM/views/index.html
@@ -123,7 +123,7 @@
                          <a>裁切派工单</a>
                          <dl class="layui-nav-child">
                              <dd><a href="仓存管理/裁切派工单/Xs_CutWorkSendBill.html" target="main_self_frame">裁切派工单</a></dd>
                              <dd><a href="仓存管理/裁切派工单/Xs_CutWorkSendBill.html" target="main_self_frame">裁切派工单列表</a></dd>
                              <dd><a lay-href="仓存管理/裁切派工单/Xs_CutWorkSendBillList.html">裁切派工单列表</a></dd>
                          </dl>
                      </dd>
                  </dl>
WebTM/views/²Ö´æ¹ÜÀí/²ÃÇÐÅɹ¤µ¥/Xs_CutWorkSendBill.html
@@ -24,7 +24,7 @@
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">班组</label>
                            </div>
                            <div class="layui-col-xs8">
                                <select name="HGroup" id="HGroup" lay-verify="required" lay-search class="layui-input">
                                <select name="HGroup" id="HGroup" lay-search class="layui-input">
                                    <!--动态渲染班组-->
                                </select>
                            </div>
@@ -111,7 +111,7 @@
                }
            })
            //获取登录页组织列
            var HGroup = '<option value="" style="color:red;">请选择班组</option>';
            var HGroup = '<option value="0" style="color:red;">请选择班组</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetHGroup",
@@ -174,6 +174,11 @@
            //扫找货单(销售订单)
            $('#HSEOrderBillNo').on('keydown', function (event) {
                if ($('#HGroup').val()=="0") {
                    layer.msg("请先选择班组");
                    $('#HSEOrderBillNo').val("");
                    return;
                }
                var HSEOrderBillNo = $('#HSEOrderBillNo').val();
                if (event.keyCode == 13) {
                    var index = layer.load();
@@ -235,6 +240,10 @@
                }
                var tableData = tableStr;
                var sSubStr = JSON.stringify(tableData);
                if (sSubStr == "[]") {
                    layer.msg("没有明细行!");
                    return;
                }
                sSubStr = "{\"oSub\": " + sSubStr + "}";
                var index = layer.load();
                $.ajax(
@@ -248,13 +257,12 @@
                        success: function (result) {
                            if (result.count == 1) {
                                layer.confirm(result.Message, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                    btn2: function () {
                                        //parent.layui.admin.events.closeThisTabs();关闭页签
                                        //window.close();//关闭页面,浏览器有效,PDA无效
                                        parent.location.href = "../../../views/index.html"
                                    }//关闭
                                }, function () { window.location.reload(); });//新增
                                        icon: 1,
                                        skin: 'layui-layer-lan',                                         title: "温馨提示",                                         closeBtn: 0,                                         btn: ['新增', '关闭'],                                         btn2: function () {//关闭
                                            parent.location.href = "../../../views/index.html";
                                        }
                                    }, function () {//新增                                         window.location.reload();
                                    }                                 );
                            }
                            else {
                                layer.close(index);
WebTM/views/²Ö´æ¹ÜÀí/²ÃÇÐÅɹ¤µ¥/Xs_CutWorkSendBillList.html
New file
@@ -0,0 +1,190 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>裁切派工单列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span></span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">物料</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="hnumber" id="hnumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据类型</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                    </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'
                ,height: 'full-50'
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    { field: '单据主内码', title: '单据主内码',hide:true }
                    , { field: '单据号', title: '单据号' }
                    , { field: '制单人', title: '制单人' }
                    , { field: '制单时间', title: '制单时间' }
                    , { field: '班组名称', title: '班组名称' }
                    , { 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() + '/Xs_CutWorkSendBill/List',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (result) {
                    if (result.count == 1) {
                        option.data = result.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(result.code + result.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#WorkCenter").val("");//单据号
                $("#hnumber").val("");//物料
                $("#HOrderProcNO").val("");//单据类型
                $("#btnSearch").click();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {//选择仓位
                var HOrderProcNO = $("#HOrderProcNO").val();//单据类型
                var hnumber = $("#hnumber").val();//物料
                var WorkCenter = $("#WorkCenter").val();//单据号
                if (HOrderProcNO) {
                    sWhere += " and å•据类型 like '%" + HOrderProcNO + "%'";
                }
                if (hnumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + hnumber + "%' or ç‰©æ–™åç§° like '%" + hnumber + "%'"
                }
                if (WorkCenter) {
                    sWhere += " and å•据号 like '%" + WorkCenter + "%'";
                }
                $.ajax({
                    url: GetWEBURL1() + '/Xs_CutWorkSendBill/List',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(result.code + result.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>