1

wangyi

1 天以前 92d3128fcd8e322f91020f988fe383fcb6caef13

1

 WebTM/WebTM.csproj

@@ -472,7 +472,6 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelation_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
@@ -2702,13 +2701,6 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.designer.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/WebTM.csproj.user

@@ -10,7 +10,7 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,35 +1,17 @@

function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
<<<<<<< HEAD
=======
   /* var WEBURL = "http://localhost:8080/API/";    //王仪本地配置*/
>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8080/API/";    //王仪本地配置
// var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
<<<<<<< HEAD
   // var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
=======

    /*var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置*/
>>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
   /* var WEBURL = "http://localhost:8080/API/";    //王仪本地配置*/
  //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //余思杰本地配置
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
    //var WEBURL = "http://localhost:81/API/";          //陈镐哲本地配置
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8080/API/";        //王仪本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器外网
@@ -45,7 +27,7 @@
    //var WEBURL = "http://60.190.4.42:9003/API";       //夏宝外网
    //var WEBURL = "http://192.168.60.12/API";          //中控
    //var WEBURL = "http://192.168.6.5:8082/API/";    //舜成
    /*var WEBURL = "http://121.36.199.126:8181/API/";    //三升*/
    //var WEBURL = "http://121.36.199.126:8181/API/";   //三升
    //var WEBURL = "http://36.134.2.30:200/WEBS-API/";  //金帅
    //var WEBURL = "http://172.16.1.85/API/";           //迦南
    return WEBURL
@@ -55,9 +37,3 @@
    return GetWEBURL()
}


//function GetWEBURL1() {
//    //var WEBURL = 'http://192.168.16.80:8011/';           //办公室服务器
//    var WEBURL = 'http://localhost:9011/WebAPI';
//    return WEBURL
//}

 WebTM/views/WMSɨÂëÄ£¿é/¿â´æתÒÆ/kf_InventoryTransfer.html

@@ -138,7 +138,7 @@
                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MaterialUpperBill_PDA">
                            <ul class="layui-tab-title" lay-filter="tab-all">
                                <li lay-id="1" style="padding:1px;">单据信息</li>
                                <!--<li lay-id="2" style="padding:1px;">上架信息</li>-->
                                <li lay-id="2" style="padding:1px;">物料条码信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <!--单据信息-->
@@ -481,6 +481,7 @@
                var data = [];
                listOption.cols = [[
                    { field: '数量', title: '数量', width: 100 }
                    , { field: '物料条码', title: '物料条码', width: 100 }
                    , { field: '物料代码', title: '物料代码', width: 100 }
                    , { field: '物料名称', title: '物料名称', width: 100 }
                    , { field: '规格型号', title: '规格型号', width: 100 }
@@ -777,10 +778,76 @@
                        });
                        return;
                    }
                    else {
                        GetMeesageByCarBarCode();
                    }
                }
            });

            //扫条码
            function GetMeesageByCarBarCode(obj) {
                //仓库、仓位文本框为空时，清空对应ID
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                var sHQty = $("#HQty").val()
                var sSourceBillType = "-1"
                var sCarBarCode = $("#HCarBarCode").val()
                //todo æ²¡æœ‰å†™*删除条码的功能，后续若有需要再完善
                if (sCarBarCode == '') {
                        playSound();
                        layer.msg("小车条码为空，请扫描小车条码！", {
                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                        }, function () {
                            $("#HCarBarCode").select();
                            $("#HCarBarCode").focus();
                        });
                        return;
                    }
                    layer.load(3)
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/Get_BarCode_WorkShop_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillType": sSourceBillType, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
                        success: function (result) {
                            if (result.count == 1) {
                                playSound_OK();
                                if (sBarCode.startsWith("GXLX")) {
                                    $("#HMainSourceBillNo").val(sBarCode);
                                    $("#HSourceBillNo").val(sBarCode);
                                }

                                if (HSourceFlag != true) {
                                    HSourceFlag = true;
                                }
                                element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
                                //显示表体明细
                                DisBillEntryList();
                            }
                            else {
                                playSound();
                                layer.msg(result.Message, {
                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                }, function () {
                                    $("#HBarCode").select();
                                    $("#HBarCode").focus();
                                });
                            }
                        },
                        complete: function (XHR, TS) { XHR = null },//回收资源
                        error: function (err) {
                            playSound();
                            layer.msg("错误！" + err, {
                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                            }, function () {
                                $("#HBarCode").select();
                                $("#HBarCode").focus();
                            });
                        }
                    });
                    layer.closeAll("loading");
                
            }

            //#endregion

@@ -1241,6 +1308,7 @@
                        else {
                            listOption.cols = [[
                                { field: '数量', title: '数量', width: 100 }
                                , { field: '物料条码', title: '物料条码', width: 100 }
                                , { field: '物料代码', title: '物料代码', width: 100 }
                                , { field: '物料名称', title: '物料名称', width: 100 }
                                , { field: '规格型号', title: '规格型号', width: 100 }
@@ -1256,7 +1324,80 @@
            }

            //#endregion
            //#region æ˜¾ç¤ºç‰©æ–™åˆ—表信息

            function DisBillEntryList_CarMaterial() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                    success: function (result) {
                        var data = [];
                        var col = [];
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //给空的数组赋值
                            for (var key in result.list) {
                                //动态获取列表所有列名
                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(result.list[key].ColmCols)) {
                                    titleData[key] = result.list[key].ColmCols;
                                }
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'radio', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:

                                            if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                            } else if (data[i].name == '物料代码') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
                                            } else if (data[i].name == '物料名称' || data[i].name == '规格型号') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
                                            }
                                    }
                                }
                            }
                            columns = col;
                            listOption.cols = [columns];
                            listOption.data = result.data;
                            listOption.totalRow = true;
                            table.cache['wl-table'] = null;         //清空表格缓存数据
                            table.render(listOption);
                        }
                        else {
                            listOption.cols = [[
                                { field: '数量', title: '数量', width: 100 }
                                , { field: '物料代码', title: '物料代码', width: 100 }
                                , { field: '物料名称', title: '物料名称', width: 100 }
                                , { field: '规格型号', title: '规格型号', width: 100 }
                                , { field: '辅助属性', title: '辅助属性', width: 100 }
                                , { field: '条码个数', title: '条码个数', width: 100 }
                            ]];
                            listOption.data = data;
                            table.render(listOption);
                        }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
            }

            //#endregion


        });

 WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBill_Check_PDA.html

@@ -81,7 +81,8 @@
                            <ul class="layui-tab-title" lay-filter="tab-all">
                                <li lay-id="1" style="padding:1px;">表头信息</li>
                                <li lay-id="2" style="padding:1px;">物料信息</li>
                                <li lay-id="3" style="padding:1px;">条码信息</li>
                                <li lay-id="3" style="padding:1px;">下架信息</li>
                                <li lay-id="4" style="padding:1px;">条码信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <!--表头信息-->
@@ -147,6 +148,15 @@
                                        <div class="layui-col-xs12">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                        </div>
                                    </div>
                                </div>
                                <!--下架信息-->
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                            <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
                                        </div>
                                    </div>
                                </div>
@@ -296,6 +306,7 @@
            var HSourceBarCodeCtl = "N" //是否进行源单对应条码核对（'Y'为核对）
            var OperationType = 1       //操作类型（1新增、2从缓存列表中返回）
            var listOption = [];
            var FIFOListOption = [];
            var columns = "";
            var HModName = "Kf_MateOutBill_Check_PDA";
            var ModRightName = "CE_MateOutCheck";    //模块权限参数
@@ -397,6 +408,8 @@
                ]];
                listOption.data = data;
                table.render(listOption);
                FIFOListOption.data = data;
                table.render(FIFOListOption);

                //光标默认在单据号位置上
                var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
                        layer.closeAll("loading");
                    }
                };

                //下架信息
                FIFOListOption = {
                    elem: '#FIFOList-table'
                    //, toolbar: '#toolbarDemo'
                    , cellMinWidth: 90
                    , limit: 3000
                    , totalRow: true
                    , cols: [[
                        { field: '数量', title: '数量', width: 80, totalRow: true }
                        , { field: '下架数量', title: '下架数量', width: 90 }
                        , { field: '仓库', title: '仓库', width: 150 }
                        , { field: '仓位', title: '仓位', width: 150 }
                        , { field: '物料代码', title: '物料代码', width: 150 }
                        , { field: '物料名称', title: '物料名称', width: 150 }
                        , { field: '规格型号', title: '规格型号', width: 150 }
                        , { field: '控制值', title: '控制值', width: 150 }
                        , { field: '辅助属性', title: '辅助属性', width: 150 }
                    ]]
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                }
            }

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -774,6 +811,15 @@

            form.on('submit(cmdCancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    //更新先进先出临时表状态（更新 HlineStatus =1）
                    $.ajax({
                        type: "Get",
                        url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                    if (OperationType == 2) {
                        var index = parent.layer.getFrameIndex(window.name);    //先得到当前iframe层的索引
                        parent.location.reload();                               //刷新父页面，注意一定要在关闭当前iframe层之前执行刷新
@@ -782,6 +828,16 @@
                    else {
                        parent.location.href = "../../../views/index_Mobile.html";
                    }
                            }
                            else {
                                layer.msg(data.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        complete: function (XHR, TS) { XHR = null },//回收资源
                        error: function (err) {
                            layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                });
            })

@@ -888,6 +944,7 @@
                                layer.confirm(result.data.hRemarkField, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                    btn2: function () {
                                        location.replace('Kf_MateOutBill_Check_PDA.html?OperationType=1&HInterID=0');
                                    }//关闭
                                }
                                , function () {
@@ -1067,7 +1124,7 @@
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                        success: function (result) {
                            if (result.count == 1) {
                                playSound_OK();
@@ -1114,6 +1171,7 @@
                                        layer.confirm(result.data.hRemarkField, {
                                            icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                            btn2: function () {
                                                location.replace('Kf_MateOutBill_Check_PDA.html?OperationType=1&HInterID=0');
                                            }//关闭
                                        }
                                        , function () {
@@ -1154,6 +1212,52 @@
                                $("#HQty").val("");
                                //显示表体明细
                                DisBillEntryList();
                            }
                            //启用先进先出仅提示控制，条码不在先进先出列表中时提示
                            else if (result.count == 2) {
                                playSound();
                                element.tabChange('tab-Kf_MateOutBill_Check_PDA', '2');
                                layer.confirm(result.Message, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['允许', '不允许'],
                                    btn2: function () {
                                    }//关闭
                                }
                                , function () {
                                    $.ajax({
                                        type: "GET",
                                        url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
                                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                                        success: function (result) {
                                            if (result.count == 1) {
                                                //清空数量
                                                $("#HQty").val("");
                                                layer.closeAll();
                                                //显示表体明细
                                                DisBillEntryList();
                                            }
                                            else {
                                                playSound();
                                                layer.msg(result.Message, {
                                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                                }, function () {
                                                    $("#HBarCode").select();
                                                    $("#HBarCode").focus();
                                                });
                                            }
                                        },
                                        complete: function (XHR, TS) { XHR = null },//回收资源
                                        error: function (err) {
                                            playSound();
                                            layer.msg("错误！" + err, {
                                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                            }, function () {
                                                $("#HBarCode").select();
                                                $("#HBarCode").focus();
                                            });
                                        }
                                    });
                                });//清空
                            }
                            else {
                                playSound();
@@ -1241,6 +1345,13 @@
                            listOption.totalRow = true;
                            table.cache['wl-table'] = null;         //清空表格缓存数据
                            table.render(listOption);
                            if (result.data.FIFOlist.length != 0) {
                                if (result.data.FIFOlist[0].HMaterID != 0) {
                                    FIFOListOption.data = result.data.FIFOlist;
                                    table.cache['FIFOList-table'] = null;         //清空表格缓存数据
                                    table.render(FIFOListOption);
                                }
                            }

                            //条码信息
                            $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx.cs

File was deleted

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx.designer.cs

File was deleted

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ßͶ²úÑéÊÕµ¥/Sc_MouldBatchWorkCheckBillEdit.html

@@ -29,6 +29,7 @@
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                            <li lay-id="2" style="padding:1px;">制单信息</li>
                            <li lay-id="3" style="padding:1px;">附件信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <!--基本信息-->
@@ -93,7 +94,8 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;" readonly>
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" disabled>>
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" disabled>
                                                    >
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
@@ -174,6 +176,32 @@
                                    </div>
                                </div>
                            </div>
                            <!--附件信息-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-upload">
                                        <button type="button" class="layui-btn" id="testList">
                                            é€‰æ‹©æ–‡ä»¶
                                        </button><input class="layui-upload-file" type="file" accept=""
                                                        name="file" multiple="">
                                        <div class="layui-upload-list">
                                            <table class="layui-table" lay-filter="mainTable">
                                                <thead>
                                                    <tr>
                                                        <th>文件名</th>
                                                        <th>图片</th>
                                                        <th>大小</th>
                                                        <th>状态</th>
                                                        <th>操作</th>
                                                    </tr>
                                                </thead>
                                                <tbody id="ProImgByList" class="ProImgByList">
                                                </tbody>
                                            </table>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
@@ -197,7 +225,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {

            //#region å…¬å…±å˜é‡

@@ -206,7 +234,8 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
                , element = layui.element
                , upload = layui.upload;
            var HModName = "Sc_MouldUpperBillEdit";
            var option = [];
            //记录组织的值
@@ -249,6 +278,15 @@
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
                document.getElementById('testList').addEventListener('click', function () {
                    // è§¦å‘文件输入框的点击事件
                    document.getElementById('HBillNo').click();
                    if ($("#HBillNo").val() == "" || $("#HBillNo").val() == null || $("#HBillNo").val() == undefined) {
                        layer.msg('请先输入物料代码等信息后在上传图片！', { time: 3 * 1000, icon: 3 });
                    }
                });
                PicUpload();
                
            }
            else if (OperationType == 2) {
                //禁用组织选项
@@ -263,10 +301,15 @@
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
                //文件选择初始化
                PicUpload();
            }
            else if (OperationType == 3) {
                //禁用组织选项
                RoadBillMain(linterid);
                //文件选择初始化
                PicUpload();
                getFile();
            }

            //#region  åˆå§‹åŒ–组织
@@ -589,7 +632,110 @@

                })
            }
            //#region æ–‡ä»¶ä¸Šä¼ 
            function PicUpload() {
                //多图片上传
                //多文件列表示例
                var ProImgByList = $('#ProImgByList')
                    , uploadListIns = upload.render({
                        elem: '#testList'

                        , url: GetWEBURL() + "/Gy_Mater/UploadFile"
                        , accept: 'file'
                        , multiple: true
                        , auto: false
                        //, bindAction: '#testListAction' //按扭绑定
                        , data: { "HNumber": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
                        , choose: function (obj) {
                            var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
                            //读取本地文件
                            obj.preview(function (index, file, result) {
                                var tr = $(['<tr id="upload-' + index + '">'
                                    , '<td>' + file.name + '</td>'
                                    , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
                                    , '<td>等待上传</td>'
                                    , '<td>'
                                    , '<button class="layui-btn layui-btn-xs demo-reload ">上传</button>'
                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                                    , '</td>'
                                    , '</tr>'].join(''));


                                //单个重传
                                tr.find('.demo-reload').on('click', function () {
                                    obj.upload(index, file);
                                    return false;
                                });

                                //删除
                                tr.find('.demo-delete').on('click', function () {
                                    delete files[index]; //删除对应的文件
                                    tr.remove();
                                    uploadListIns.config.elem.next()[0].value = ''; //清空 input file å€¼ï¼Œä»¥å…åˆ é™¤åŽå‡ºçŽ°åŒåæ–‡ä»¶ä¸å¯é€‰
                                });

                                ProImgByList.append(tr);

                            });
                        }
                        , done: function (res, index, upload) {
                            if (res.code == 1) { //上传成功
                                var tr = ProImgByList.find('tr#upload-' + index)
                                    , tds = tr.children();
                                tds.eq(3).html('<span style="color: #5FB878;">上传成功</span>');
                                tds.eq(4).html(''); //清空操作

                                return delete this.files[index]; //删除文件队列已经上传成功的文件
                            }
                            this.error(index, upload);
                        }
                        , error: function (index, upload) {
                            var tr = ProImgByList.find('tr#upload-' + index)
                                , tds = tr.children();
                            tds.eq(2).html('<span style="color: #FF5722;">上传失败[检查文件名及文件格式]</span>');
                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示上传
                        }
                    });
            }
            //#endregion
            //#region ç¼–辑时,获取已上传的文件列表
            function getFile() {
                var ProImgByList = $('#ProImgByList')
                $.ajax({
                    url: GetWEBURL() + '/Gy_Mater/Filelist',
                    type: "GET",
                    data: { "HNumber": $("#HBillNo").val() },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var index = 0;
                            for (var i = 0; i < data1.data.length; i++) {
                                var tr = $(['<tr id="upload-' + i + '">'
                                    , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
                                    , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
                                    , '<td>' + data1.data[i].HFileName + '</td>'
                                    , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + data1.data[i].HFileName + '">' + '</td>'
                                    , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
                                    , '<td style="color: #5FB878;">上传成功</td>'
                                    , '<td style="display:none">' + data1.data[i].url + '</td>'
                                    , '<td>'
                                    , '<button class="layui-btn layui-btn-xs  demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>下载</button>'
                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>'
                                    , '</td>'
                                    , '</tr>'].join(''));

                                $('#ProImgByList').append(tr);
                            }

                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //编辑 é¡µé¢èµ‹å€¼
            function RoadBillMain(linterid)//加载表头
            {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillListLink.html

@@ -426,14 +426,7 @@
                    case 'btn-print':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        var ModRightName = 'Gy_BarCodeBillList_Print';
                        $.ajax({
                            url: GetWEBURL() + 'Gy_BarCodeBillList/GetBarCodeBillPermission',
                            type: "GET",
                            async: false,
                            data: { "user": sessionStorage["HUserName"]},
                            success: function (res) {
                                if (res.data == 1) {
                        
                                    if (checkStatus.data.length > 0) {
                                        var rows = '';
                                        for (var i = 0; i < data.length; i++) {
@@ -454,12 +447,9 @@
                                    else {
                                        layer.msg(get_MessageError('[0000-1-016]请选择数据打印！', sessionStorage["HTranSlate"]));
                                    }
                                }
                                else {
                                    layer.alert(get_MessageError("无打印权限!", sessionStorage["HTranSlate"]), { icon: 5 });
                                }
                            }
                        });
                                
                            
                       
                        break;
                    case 'btn-print-zx':
                        PrintZX();

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_SachetBarCodePrint.html

@@ -351,7 +351,7 @@

                                //自动打印
                                if (option.data.length > 0) {
                                    get_BatchPrint();
                                    get_BatchPrint(HICMOInterID, HICMOEntryID);
                                }                                
                            }
                            else {
@@ -369,18 +369,18 @@
            //批量打印
            var time;
            var num = 0;
            function get_BatchPrint() {
            function get_BatchPrint(HICMOInterID, HICMOEntryID) {
                //打印间隔
                var HTime = $("#HTime").val();

                time = setInterval(function () {
                    dy_PL(option.data);
                    dy_PL(HICMOInterID, HICMOEntryID, option.data);
                }, HTime*1000);
            }

            function dy_PL(rest) {
                var HItemID = rest[num].HBarCodeID.toString();
                var sWhere = "select top 1 HBarCode æ¡ç ç¼–号,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HItemID = " + HItemID
            function dy_PL(HICMOInterID, HICMOEntryID,rest) {
                //var HItemID = rest[num].HBarCodeID.toString();
                var sWhere = "select top 1 a.HItemID,HBarCode æ¡ç ç¼–号,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HSourceInterID = " + HICMOInterID + " and a.HSourceEntryID = " + HICMOEntryID + " and a.HPrintQty = 0 order by a.HItemID asc";

                $.ajax({
                    type: "GET",
@@ -427,18 +427,18 @@
                                    num++;
                                }

                                //var sql = "update a set HPrintQty = HPrintQty + 1 from Gy_BarCodeBill a with(nolock) where HItemID = " + HInterID ;
                                //$.ajax({
                                //    type: "GET",
                                //    url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //方法所在页面和方法名
                                //    async: false,
                                //    data: { "sWhere": sql },
                                //    success: function (result) {
                                var sql = "update a set HPrintQty = HPrintQty + 1 from Gy_BarCodeBill a with(nolock) where HItemID = " + data.data[0].HItemID;
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //方法所在页面和方法名
                                    async: false,
                                    data: { "sWhere": sql },
                                    success: function (result) {
                                //        if (result.data.code != 1) {
                                //            layer.alert("更新打印日期异常：" + result.data.Message);
                                //        }
                                //    }
                                //})
                                    }
                                })

                            } else {
                                layer.msg("查无数据!");