zgq
2021-07-02 4fe1033595d41b9cceb721072a2b1f6b7d8f635f
调拨单扫码记录
4个文件已修改
1个文件已添加
291 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/WMSBarCodeDetailsList.html 168 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -15,10 +15,10 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>07/01/2021 09:38:32</publishTime>
      <publishTime>07/02/2021 14:43:48</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>07/01/2021 09:38:32</publishTime>
      <publishTime>07/02/2021 14:43:48</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -812,6 +812,9 @@
    <File Include="views/Baseset/基础资料/Sc_ProcessPlanViewList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/WMSBarCodeDetailsList.html">
      <publishTime>07/02/2021 14:43:34</publishTime>
    </File>
    <File Include="views/component/anim/index.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
@@ -1044,7 +1047,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>07/01/2021 09:38:09</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>07/01/2021 09:39:42</publishTime>
@@ -1197,7 +1200,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="views/user/login.html">
      <publishTime>05/28/2021 08:53:29</publishTime>
      <publishTime>07/02/2021 09:44:36</publishTime>
    </File>
    <File Include="views/user/reg.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1245,7 +1248,7 @@
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>03/29/2021 10:47:09</publishTime>
      <publishTime>07/02/2021 14:30:00</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html">
      <publishTime>03/29/2021 10:47:31</publishTime>
@@ -1311,13 +1314,19 @@
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Department.html">
      <publishTime>05/10/2021 08:54:50</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Department_Edit.html">
      <publishTime>05/06/2021 17:40:06</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Employee.html">
      <publishTime>05/29/2021 15:26:46</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_EquipMent_Edit.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_Material.html">
      <publishTime>03/29/2021 10:48:22</publishTime>
@@ -1460,8 +1469,14 @@
    <File Include="views/基础资料/采购基础资料/Gy_Supplier.html">
      <publishTime>03/29/2021 10:48:22</publishTime>
    </File>
    <File Include="views/基础资料/采购基础资料/Gy_Supplier_Edit.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/基础资料/销售基础资料/Gy_Customer.html">
      <publishTime>03/29/2021 10:48:23</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/基础资料/销售基础资料/Gy_Customer_Edit.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/报工平台/ReportPlatform.html">
      <publishTime>07/01/2021 13:15:12</publishTime>
@@ -1530,7 +1545,7 @@
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_Mould.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Kf_ProductInBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
@@ -1620,7 +1635,7 @@
      <publishTime>04/08/2021 09:14:52</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Gy_Mould.html">
      <publishTime>04/08/2021 09:14:52</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/模治具管理/模治具管理/Kf_ProductInBillList.html">
      <publishTime>04/16/2021 14:21:33</publishTime>
@@ -1824,16 +1839,25 @@
      <publishTime>06/22/2021 14:19:35</publishTime>
    </File>
    <File Include="views/系统管理/会计期间/Xt_AccountPeriodList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/系统管理/会计期间/Xt_AccountPeriod_Edit.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/系统管理/单据类型/Xt_BillTypeList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/系统管理/单据类型/Xt_BillType_Edit.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/系统管理/日志管理/Xt_SystemLogList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
    </File>
    <File Include="views/系统管理/模块管理/Xt_XtgnbList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/系统管理/模块管理/Xt_Xtgnb_Edit.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Xt_UserGroupList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
@@ -1842,7 +1866,10 @@
      <publishTime>04/29/2021 16:21:52</publishTime>
    </File>
    <File Include="views/系统管理/系统参数管理/Xt_SystemParameterList.html">
      <publishTime>04/29/2021 16:21:52</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/系统管理/系统参数管理/Xt_SystemParameter_Edit.html">
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/组装单/Sc_AssemblyBill_Fast.html">
      <publishTime>03/29/2021 10:48:24</publishTime>
@@ -1911,10 +1938,10 @@
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/质量管理/产品入库检验单/QC_LastPieceCheckBill.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/质量管理/产品入库检验单/QC_LastPieceCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/质量管理/出厂检验单/QC_OutCompCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
@@ -1995,10 +2022,10 @@
      <publishTime>06/09/2021 13:43:30</publishTime>
    </File>
    <File Include="views/质量管理/产品入库检验单/QC_LastPieceCheckBill.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/质量管理/产品入库检验单/QC_LastPieceCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
      <publishTime>07/02/2021 09:07:44</publishTime>
    </File>
    <File Include="views/质量管理/出厂检验单/QC_OutCompCheckBillList.html">
      <publishTime>05/24/2021 10:08:23</publishTime>
WebTM/WebTM.csproj
@@ -78,6 +78,7 @@
    <Content Include="layuiadmin\myicon\车间管理.svg" />
    <Content Include="layuiadmin\treeTable.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\基础资料\WMSBarCodeDetailsList.html" />
    <Content Include="views\Baseset\基础资料\Gy_RepairList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ScrapReasonList.html" />
    <Content Include="views\Baseset\基础资料\Gy_CheckItemList.html" />
@@ -493,7 +494,6 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Edit.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_Customer_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Unit - å¤åˆ¶.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkCenter.html" />
    <Content Include="views\基础资料\公用基础资料\test.html" />
    <Content Include="views\基础资料\公用基础资料\Xt_ORGANIZATIONSList.html" />
@@ -580,6 +580,24 @@
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
    <Content Include="views\设备管理\Sb_Add_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpRepairCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EqpRepairCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckPlanBillList.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\质量管理\巡检记录单\QC_Add_Edit_PatrolProcCheckBill.html" />
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBill.html" />
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBillList.html" />
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/";   //颜晓军本地配置
@@ -9,6 +9,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //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/";   //zgq本地
    return WEBURL
}
WebTM/views/Baseset/»ù´¡×ÊÁÏ/WMSBarCodeDetailsList.html
New file
@@ -0,0 +1,168 @@
<!DOCTYPE html>
<html>
<head>
    <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <style type="text/css">
        .layui-form-label {
            width: 85px;
        }
    </style>
</head>
<body>
    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
            <div class="layui-col-md12">
                <div class="layui-card">
                    <div class="layui-card-body" style="padding: 15px;">
                        <form class="layui-form" action="" lay-filter="component-form-group">
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Exit">退出</button>
                                </div>
                            </div>
                        </form>
                    </div>
                </div>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <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>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></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
                , laydate = layui.laydate
                , element = layui.element;
            //获取参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            var params = getUrlVars();
            //var HInterID = params[params[0]];
            //var HBillType = params[params[2]];
            var HInterID = 367;
            var HBillType = "3789";
            form.on('submit(FH)', function () {
                var checkStatus = table.checkStatus('ck-table')
                    , data = checkStatus.data;
                parent.GetHKeeperValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            form.on('submit(Exit)', function () {
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery(HInterID, HBillType);
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
                , toolbar: '#toolbarDemo'
                , data: []
                , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 æ–°å¢ž
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', width: 150, title: 'HInterID', hide: true }//, hide: true
                    , { field: 'HBillType', width: 150, title: '单据类型' }
                    , { field: 'HMaterID', width: 150, title: 'HMaterID', hide: true }
                    , { field: 'HMaterNumber', width: 150, title: '产品编码' }
                    , { field: 'HMaterName', width: 150, title: '产品名称' }
                    , { field: 'HMaterModel', width: 150, title: '规格型号' }
                    , { field: 'HQty', width: 150, title: '数量' }
                    , { field: 'HQtyMust', width: 150, title: '应收数量' }
                    , { field: 'HBatchNo', width: 150, title: '批次' }
                    , { field: 'HPieceQty', width: 150, title: '件数' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
                , page: true
            });
            ///加载显示数据
            function RoadQuery(HInterID, HBillType) {
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetWMSBarCodeDetailsList",
                    async: true,
                    data: { "HInterID": HInterID, "HBillType": HBillType },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {
                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            };
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event === 'del') {
                    var _obj = obj;
                    $.ajax({
                        type: "get",
                        url: GetWEBURL() + "/Web/GetWMSBarCodeDetailsList",
                        async: true,
                        data: { "HInterID": HInterID, "HBillType": HBillType },
                        success: function (result) {
                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                            table.reload('mainTable', {
                                data: ajaxReturnData
                                , height: 'full-10'
                                , loading: false
                                , done: function (index, res) {
                                }
                            });
                        },
                        error: function (result) {
                            console.log(result);
                            //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                        }
                    });
                }
            });
            //以上为layui模块
        });
    </script>
</body>
</html>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -268,6 +268,9 @@
            </div>
        </div>
    </div>
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</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>
@@ -369,6 +372,7 @@
                    , { field: 'HMaterID', title: '物料内码', width: 150, hide: true }
                    , { field: 'HAuxPropID', title: '', width: 150, hide: true }
                    , { field: 'HMTONo', title: '计划跟踪号', width: 150, hide: true }
                        , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                    ]] 
                    , height: 500
                    , done: function () {
@@ -881,6 +885,35 @@
         , done: function () {
         }
        });
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'edit') {
                    var _obj = obj;
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '扫码详情列表'
                        , shade: 0.6
                        , maxmin: true
                        , anim: 0
                        , content: ['../../../views/Baseset/基础资料/WMSBarCodeDetailsList.html?HInterID=' + $("#HInterID").val() + '&HBillType=1234', 'yes']
                        , resize: false
                        , end: function () {
                            _obj.update({
                                ä¾›åº”商: subSupName
                                , HSupID: subSupID
                                , ä¾›åº”商代码: subSupNumber
                            });
                        }
                    })
                }
            });
            //以上为layui模块
    });
    //清空表头
    //function f_ClearTitle() {
@@ -974,8 +1007,7 @@
        //    layer.msg("请先扫源单!", { icon: 5 });
        //    return false;
        //}
        if($("#HDeptName").val()=='')
        {
            if ($("#HDeptName").val() == '') {
            layer.msg("部门没有选择!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
@@ -1007,8 +1039,7 @@
            layer.msg("错误的内码!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }
        if (typeof (sSubStr) == "undefined")
        {
            if (typeof (sSubStr) == "undefined") {
            layer.msg("没有物料明细记录!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            return false;
        }