ch
2021-07-19 5f7870fca094b4bee99e4a8408fc720645ac18db
委外领料扫码
4个文件已修改
230 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html 198 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -15,10 +15,10 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>07/15/2021 15:22:36</publishTime>
      <publishTime>07/15/2021 21:28:20</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>07/15/2021 15:22:36</publishTime>
      <publishTime>07/15/2021 21:28:20</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -630,7 +630,7 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>07/14/2021 16:00:40</publishTime>
      <publishTime>07/15/2021 21:28:19</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -1065,10 +1065,10 @@
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>07/14/2021 20:10:46</publishTime>
      <publishTime>07/15/2021 20:50:03</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
      <publishTime>07/15/2021 21:18:20</publishTime>
    </File>
    <File Include="views/IpadIndex.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
@@ -1560,7 +1560,7 @@
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:30:44</publishTime>
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapOutBillList.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
@@ -1581,7 +1581,7 @@
      <publishTime>07/02/2021 08:44:26</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:06:33</publishTime>
      <publishTime>07/15/2021 20:50:03</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill_PDA.html">
      <publishTime>07/02/2021 08:44:26</publishTime>
@@ -1662,7 +1662,7 @@
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:30:44</publishTime>
      <publishTime>07/14/2021 10:12:32</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_Add_MouldScrapOutBillList.html">
      <publishTime>07/14/2021 10:12:32</publishTime>
@@ -1683,7 +1683,7 @@
      <publishTime>07/02/2021 08:44:26</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html">
      <publishTime>07/14/2021 21:06:33</publishTime>
      <publishTime>07/15/2021 20:50:03</publishTime>
    </File>
    <File Include="views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html">
      <publishTime>07/02/2021 08:44:26</publishTime>
@@ -2292,7 +2292,7 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
      <publishTime>07/15/2021 21:24:18</publishTime>
    </File>
    <File Include="views/领料发货/委外出库/Kf_EntrustOutBill_FastList.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -2367,7 +2367,7 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_Fast.html">
      <publishTime>07/15/2021 17:48:37</publishTime>
      <publishTime>07/15/2021 20:49:39</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_FastList.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
@@ -2406,13 +2406,13 @@
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_Fast.html">
      <publishTime>07/15/2021 17:49:46</publishTime>
      <publishTime>07/16/2021 16:58:55</publishTime>
    </File>
    <File Include="views/验收入库/委外入库/Kf_EntrustInBill_FastList.html">
      <publishTime>05/10/2021 09:25:59</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/15/2021 15:22:44</publishTime>
      <publishTime>07/15/2021 21:28:24</publishTime>
    </File>
  </ItemGroup>
</Project>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//王永波本地配置,请勿更改
     //var WEBURL = "http://101.37.171.70/API/";   //公司服务器
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
@@ -10,7 +10,7 @@
    //var WEBURL = "http://10.1.4.154/API/";   //江丰客户
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
    var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
    return WEBURL
}
WebTM/views/ÁìÁÏ·¢»õ/ίÍâ³ö¿â/Kf_EntrustOutBill_Fast.html
@@ -198,7 +198,7 @@
    <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 src="../../../layuiadmin/timeFormat/timeFormat.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBill_Fast.html
@@ -236,7 +236,7 @@
    <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 src="../../../layuiadmin/timeFormat/timeFormat.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -244,11 +244,11 @@
            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;
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var RZ = "";
            var Flag = sessionStorage["SourceFlag"];
@@ -289,10 +289,9 @@
            var params = getUrlVars();
            var linterid = params[params[0]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            //加载表头
            function  RoadBillMain(linterid)
            {
            function RoadBillMain(linterid) {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetPonderationBill",
                    type: "GET",
@@ -314,8 +313,7 @@
            }
            //加载表体
            function RoadBillSub(linterid)
            {
            function RoadBillSub(linterid) {
                table.render({
                    elem: '#wl-table'
                    , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
@@ -323,15 +321,15 @@
                    , where: { HBillID: linterid, HBillType: '1210', sWhere: '' }
                    , cols: [[
                        { type: 'radio' }
                    , { field: 'HQty', title: '数量', width: 150 }
                    , { field: 'HQtyMust', title: '应收数量', width: 150 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HBatchNo', title: '批次', width: 150 }
                        , { field: 'HQty', title: '数量', width: 150 }
                        , { field: 'HQtyMust', title: '应收数量', width: 150 }
                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                        , { field: 'HMaterModel', title: '规格型号', width: 150 }
                        , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                        , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                        , { field: 'HBatchNo', title: '批次', width: 150 }
                    ]]
                    , height: 500
                    , done: function () {
@@ -339,21 +337,21 @@
                    }
                });
            }
            //动态加载源单类型列表 new
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $.ajax({
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '1210' },
@@ -514,40 +512,40 @@
                {
                    layer.load(3);
                    $.ajax(
                    {
                        type: "POST",
                        //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/set_SaveEntrustInBill_Json", //方法所在页面和方法名
                        //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json",
                        url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
                        async: true,
                        data: { "oMain": sMainStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                layer.confirm("生成委外入库单" + data.Message + $("#HBillNo").val(), {
                                    icon: 1,
                                    skin: 'layui-layer-lan',
                                    closeBtn: 0,
                                    btn: ['新增'],
                                    btn2: function () {
                                        //parent.layui.admin.events.closeThisTabs();关闭页签
                                        //window.close();//关闭页面,浏览器有效,PDA无效
                                        parent.location.href = "../../../views/index.html"
                                    }//关闭
                        {
                            type: "POST",
                            //url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/set_SaveEntrustInBill_Json", //方法所在页面和方法名
                            //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json",
                            url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
                            async: true,
                            data: { "oMain": sMainStr },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                    layer.confirm("生成委外入库单" + data.Message + $("#HBillNo").val(), {
                                        icon: 1,
                                        skin: 'layui-layer-lan',
                                        closeBtn: 0,
                                        btn: ['新增'],
                                        btn2: function () {
                                            //parent.layui.admin.events.closeThisTabs();关闭页签
                                            //window.close();//关闭页面,浏览器有效,PDA无效
                                            parent.location.href = "../../../views/index.html"
                                        }//关闭
                                    }
                                        , function () { window.location.reload(); }//新增
                                    );
                                }
                                , function () { window.location.reload(); }//新增
                                );
                                else {
                                    layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                                layer.closeAll("loading");
                                layui.form.render();
                            },
                            error: function (err) {
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            else {
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                            layui.form.render();
                        },
                        error: function (err) {
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                        });
                    return false;
                }
            });
@@ -564,7 +562,7 @@
            });
            //扫条码
            $('#HBarCode').on('keydown', function (event) {
            $('#HBarCode').on('keydown', function (event) {
                var sSubStr = table.cache['wl-table'];
                var sBarCode = $('#HBarCode').val()
                var sInterID = $("#HInterID").val()
@@ -700,13 +698,13 @@
                                //$("#HDeptName").val(result.data.HDeptName);
                                layer.load(3)
                                table.render({
                                    elem: '#wl-table'
                                      , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
                                      , toolbar: '#toolbarDemo'
                                      , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
                                      , cellMinWidth: 90
                                      , cols: [[
                                          { type: 'radio' }
                                    elem: '#wl-table'
                                    , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
                                    , toolbar: '#toolbarDemo'
                                    , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
                                    , cellMinWidth: 90
                                    , cols: [[
                                        { type: 'radio' }
                                        , { field: 'HQty', title: '数量', width: 150 }
                                        , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
@@ -716,11 +714,11 @@
                                        , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                        , { field: 'HBatchNo', title: '批次', width: 150 }
                                      ]]
                                      , height: 500
                                      , done: function () {
                                          layer.closeAll("loading");
                                      }
                                    ]]
                                    , height: 500
                                    , done: function () {
                                        layer.closeAll("loading");
                                    }
                                });
                            }
                            else {
@@ -744,7 +742,7 @@
            });
            //扫源单方法
            $('#HSourceBillNo').on('keydown', function (event) {
            $('#HSourceBillNo').on('keydown', function (event) {
                var HSourceBillNo = $('#HSourceBillNo').val()
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
@@ -768,27 +766,27 @@
                                table.render({
                                    elem: '#wl-table'
                                    //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
                                  , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
                                  , toolbar: '#toolbarDemo'
                                  , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
                                  , cols: [[
                                      { type: 'radio' }
                                    , { field: 'HQty', title: '数量', width: 150 }
                                    , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                    , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                    , { field: 'HBatchNo', title: '批次', width: 150 }
                                  ]]
                                    , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
                                    , toolbar: '#toolbarDemo'
                                    , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
                                    , cols: [[
                                        { type: 'radio' }
                                        , { field: 'HQty', title: '数量', width: 150 }
                                        , { field: 'HQtyMust', title: '应收数量', width: 150 }
                                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                                        , { field: 'HMaterModel', title: '规格型号', width: 150 }
                                        , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                                        , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                                        , { field: 'HBatchNo', title: '批次', width: 150 }
                                    ]]
                                    // , data: [linterid]
                                    // , page: true
                                  , height: 500
                                  , done: function () {
                                      layer.closeAll("loading");
                                  }
                                    , height: 500
                                    , done: function () {
                                        layer.closeAll("loading");
                                    }
                                });
                            }
                            else {
@@ -804,7 +802,7 @@
            });
            //扫仓位
            $('#HStockPlaceName').on('keydown', function (event) {
            $('#HStockPlaceName').on('keydown', function (event) {
                var HBarCode = $('#HStockPlaceName').val()
                if (event.keyCode == 13) {
                    //判断文本框是否有数据    new
@@ -833,13 +831,13 @@
                // , url: 'http://localhost:8083/Kf_EntrustInBill/GetHBarCodeShowBillSub'
                //, toolbar: '#toolbarDemo'
                // , where: { sMsg: linterid, sMsg2: lentryid }
             , cols: [[
               , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
             ]]
             , page: true
             , height: 500
             , done: function () {
             }
                , cols: [[
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                ]]
                , page: true
                , height: 500
                , done: function () {
                }
            });
            //扫MES仓位
@@ -882,7 +880,7 @@
                }
            });
        //以上为layui模块
            //以上为layui模块
        });
        //清空表头
        //function f_ClearTitle() {