zgq
2021-06-09 2d3379f98663099ad14594d9434ce795c069f3ae
新增派工单
1个文件已添加
4个文件已修改
326 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/webtm.pubxml.user 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/裁切派工单/Xs_CutWorkSendBill.html 293 ●●●●● 补丁 | 查看 | 原始文档 | 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>03/10/2021 18:20:18</publishTime>
      <publishTime>06/08/2021 15:44:33</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>03/10/2021 18:20:18</publishTime>
      <publishTime>06/08/2021 15:44:33</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>04/22/2021 14:17:56</publishTime>
      <publishTime>06/08/2021 15:47:30</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>03/10/2021 18:24:32</publishTime>
      <publishTime>06/08/2021 15:52:16</publishTime>
    </File>
    <File Include="views/senior/echarts/bar.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1107,6 +1107,9 @@
    <File Include="views/仓存管理/仓库调拨/Kf_WaitingLookingFor.html">
      <publishTime>02/25/2021 14:28:42</publishTime>
    </File>
    <File Include="views/仓存管理/裁切派工单/Xs_CutWorkSendBill.html">
      <publishTime>06/09/2021 11:34:36</publishTime>
    </File>
    <File Include="views/仓库调拨/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
@@ -1225,7 +1228,7 @@
      <publishTime>01/14/2021 10:06:24</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_Fast.html">
      <publishTime>04/22/2021 14:13:47</publishTime>
      <publishTime>05/31/2021 14:06:46</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1279,7 +1282,7 @@
      <publishTime>03/04/2020 11:43:34</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_Fast.html">
      <publishTime>03/10/2021 19:28:55</publishTime>
      <publishTime>05/24/2021 10:52:18</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_FastList.html">
      <publishTime>01/14/2021 10:06:24</publishTime>
@@ -1303,7 +1306,7 @@
      <publishTime>05/08/2020 23:33:42</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/22/2021 14:14:01</publishTime>
      <publishTime>05/24/2021 10:54:18</publishTime>
    </File>
  </ItemGroup>
</Project>
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_CutWorkSendBill.html" />
    <Content Include="views\公共页面\Kf_BarCodeEditDlg.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessList.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
@@ -119,6 +119,13 @@
                              <dd><a href="仓存管理/仓库调拨/Kf_WaitingLookingFor.html" target="main_self_frame">待发区找货</a></dd>-->
                          </dl>
                      </dd>
                      <dd class="layui-nav-itemed">
                          <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>
                          </dl>
                      </dd>
                  </dl>
              </li>
              <li data-name="set" class="layui-nav-item">
WebTM/views/²Ö´æ¹ÜÀí/²ÃÇÐÅɹ¤µ¥/Xs_CutWorkSendBill.html
New file
@@ -0,0 +1,293 @@
<!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">
</head>
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 5px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>裁切派工单</span>
                    </div>
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <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>
                            </div>
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">找货单号</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HSEOrderBillNo" id="HSEOrderBillNo" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">派工单号</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HBillNo" id="HBillNo" autocomplete="off" class="layui-input" readonly>
                            </div>
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">派工单ID</label>
                            </div>
                            <div class="layui-col-xs8">
                                <input type="text" name="HInterID" id="HInterID" autocomplete="off" class="layui-input" readonly>
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab layui-col-xs12" lay-filter="tab-LookingForBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">扫码记录</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--明细信息-->
                            <div class="layui-tab-item layui-show">
                                <table class="layui-hide" id="smjl-table" lay-filter="smjl-table"></table>
                            </div>
                        </div>
                    </div>
                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">提交</button>
                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">退出</button>
                    </div>
                    <input type="hidden" name="HMaker" id="HMaker">
                </form>
            </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 type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            //判断是否登录 æœªç™»å½•则跳到登录页
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效,请重新登录!", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }
            $("#HMaker").val(sessionStorage["HUserName"]);
            var load = layer.load(1, {
                content: '班组加载中。。。',
                shade: [0.4, '#393D49'],
                // time: 10 * 1000,
                success: function (layero) {
                    layero.css('padding-left', '30px');
                    layero.find('.layui-layer-content').css({
                        'padding-top': '40px',
                        'width': '120px',
                        'color': 'white',
                        'background-position-x': '16px'
                    });
                }
            })
            //获取登录页组织列
            var HGroup = '<option value="" style="color:red;">请选择班组</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetHGroup",
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            HGroup += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#HGroup").append(HGroup);
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
            //获取最大单据号 new
            $("#HInterID").val("");
            $("#HBillNo").val("");
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '9191' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
            //主表列表
            var option = {
                elem: '#smjl-table'
                //, toolbar: '#toolbarDemo'
                , page: true
                , totalRow: true
                //, height: 256
                , cellMinWidth: 90
                , limit: 500
                , cols: [[
                    { type: 'numbers', title: '序号', totalRowText: '合计行', width: 60 }
                    , { field: 'HMainSourceBillNo', title: '找货单号' }
                    , { field: 'HMainSourceInterID', title: '找货单ID', hide: true }
                    , { field: 'pages', title: '张数', totalRow: true }
                    , { field: 'HMaker', title: '制单人', hide: true }
                    , { field: 'HGroupID', title: '班组', hide: true }
                    , { field: 'HBillNo', title: '单据号', hide: true }
                    , { field: 'HInterID', title: '单据ID', hide: true }
                ]]
                , text: {
                    none: '暂无相关数据,请先扫描找货单号!' //默认:无数据。注:该属性为 layui 2.2.5 å¼€å§‹æ–°å¢ž
                }
            };
            //初始加载表格
            option.data = [];
            table.render(option);
            //进入页面默认光标在源单号上
            $("#HSourceBillNo").focus();
            //扫找货单(销售订单)
            $('#HSEOrderBillNo').on('keydown', function (event) {
                var HSEOrderBillNo = $('#HSEOrderBillNo').val();
                if (event.keyCode == 13) {
                    var index = layer.load();
                    $.ajax({
                        url: GetWEBURL() + "/Xs_CutWorkSendBill/getHSEOrderBillNo",
                        type: "GET",
                        data: { "HSEOrderBillNo": HSEOrderBillNo },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var sSubStr = result.data;
                                var tableStr = table.cache['smjl-table'];
                                for (var i = 0; i < tableStr.length; i++) {
                                    if (tableStr[i].HMainSourceBillNo == sSubStr[0].HMainSourceBillNo) {
                                        layer.close(index);
                                        $('#HSEOrderBillNo').val("");
                                        layer.msg("该实物已扫码,请勿重复扫码", { icon: 0, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                        return;
                                    }
                                }
                                var last = tableStr.length;
                                sSubStr[0].HMaker = $("#HMaker").val();
                                option.data.push(sSubStr[0]);
                                table.render(option);
                                option.data = table.cache["smjl-table"];
                                table.render(option);
                                layer.close(index);
                                $('#HSEOrderBillNo').val("");
                                layer.msg("扫码成功!", { icon: 1, time: 1000 });
                            }
                            else {
                                layer.close(index);
                                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("接口请求失败!" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                }
            });
            //退出按钮
            form.on('submit(Cancel)', function () {
                parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
            })
            //提交
            form.on('submit(Saver)', function (data) {//提交
                var tableStr = table.cache['smjl-table'];
                for (var i = 0; i < tableStr.length; i++) {
                    tableStr[i].HGroupID = $("#HGroup").val();
                    tableStr[i].HBillNo = $("#HBillNo").val();
                    tableStr[i].HInterID = $("#HInterID").val();
                }
                var tableData = tableStr;
                var sSubStr = JSON.stringify(tableData);
                sSubStr = "{\"oSub\": " + sSubStr + "}";
                var index = layer.load();
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Xs_CutWorkSendBill/set_SaveCutWorkSendBill",
                        //url:"http://localhost:12761/LookingFor/set_SaveLookingForBill_Json",
                        async: true,
                        data: { "oMain": sSubStr },
                        dataType: "json",
                        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(); });//新增
                            }
                            else {
                                layer.close(index);
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
            });
            //行内事件
            table.on('tool(smjl-table)', function (obj) {
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗?', function (index) {
                        obj.del();
                        option.data = table.cache["smjl-table"];
                        table.reload(option);
                        layer.close(index);
                    });
                }
            });
        });
    </script>
</body>
</html>