安瑞调整

王 垚

2022-06-24 c71eab493f627d0d932b717624859b1c21359b58

安瑞调整

 WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html

@@ -228,7 +228,7 @@
                    , data = checkStatus.data;
                var OpenTmp = data[0].模板名称;
                if (OpenTmp == '条码') {
                    window.open("../../views/SRM/HBarPlanPrint.html?linterid=&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                    window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                } else {
                    window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                }

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx.cs

@@ -22,9 +22,14 @@
            using (StreamReader streamRead = new StreamReader(stream))
            {
                linterid = streamRead.ReadToEnd();
                LogService.Write("Cache："+ linterid);
            }
            //linterid = JsonConvert.SerializeObject(linterid);
            MemoryCacheHelper.SetCache("linterid", linterid);
            var Cachekey = linterid.Split(';')[1];
            var Cachevalue = linterid.Split(';')[0];
            LogService.Write("Cachekey：" + Cachekey);
            LogService.Write("Cachevalue：" + Cachevalue);
            MemoryCacheHelper.SetCache(Cachekey, Cachevalue);
            //HttpContext.Current.Session.Remove("linterid");
            //HttpContext.Current.Session.Add("linterid", linterid);


 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/HBarPlanPrint.html

@@ -65,10 +65,10 @@
                //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
                CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
                break;
            case "SRM_POOrderBillList"://采购订单
            case "SRM_POOrderBillList"://采购订单物料条码打印
                console.log(1)
                //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
                CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_PoBarCodeBillList.aspx?linterid=1", true, "");
                CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_PoBarCodeBillList.aspx?linterid=" + value, true, "");
                console.log(2)
                break;
            case "SRM_POInStockBillList"://送货单打印

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html

@@ -539,7 +539,7 @@
                        type: "POST",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { "linterid": rows.toString() },
                        data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
                        dataType: "json",
                        success: function (data) {
                            layer.closeAll("loading");
@@ -556,7 +556,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?Type=' + openTmpListType, 'yes']
                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["HUserName"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
                        , resize: false
                        //, cancel: function () {
                        //    $(".layui-btn").removeClass("layui-btn-disabled");
@@ -610,8 +610,8 @@
                    //, { field: 'HBeginDate', title: '生产日期', width: 120, data_field: 'HBeginDate', event: "chooseHBeginDate" }
                    //, { field: 'HEndDate', title: '失效日期', width: 120, data_field: 'HEndDate', event: "chooseHEndDate" }
                    , { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//
                    , { field: 'HKFPeriod', title: '保质期', width: 100, edit: 'text', event: "inputHKFPeriod" }//
                    , { field: 'HKFDQDate', title: '到期日期', align: 'center', width: 150, data_field: 'HKFDQDate', event: "chooseHKFDQDate" }//
                    , { field: 'HKFPeriod', title: '保质期', width: 100,  event: "inputHKFPeriod" }//
                    , { field: 'HKFDQDate', title: '到期日期', align: 'center', width: 150/*, data_field: 'HKFDQDate', event: "chooseHKFDQDate" */}//
                    //, { field: 'HDate', title: '要求交货日期', width: 150 }
                    , { field: 'HPOOrderInterID', title: '采购订单主内码', width: 150, hide: true }
                    , { field: 'HPOOrderEntryID', title: '采购订单子内码', width: 150, hide: true }
@@ -827,6 +827,8 @@
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HQty == 0)
                            continue;
                        if (sSubStr[i].HQty > sSubStr[i].HNotBarcodeCount) {
                            layer.msg("明细记录第" + (i + 1) + "行,条码数量不能超出未生成数量!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
@@ -835,6 +837,17 @@
                            layer.msg("明细记录第" + (i + 1) + "行,包装数量不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HKFDate == '' || sSubStr[i].HKFDQDate == '') {
                            layer.msg("明细记录第" + (i + 1) + "行,生产日期或到期日期不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HBatchNo == '') {
                            layer.msg("明细记录第" + (i + 1) + "行,批次不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        //HKFDate 生产日期
                        //HKFDQDate 到期日期
                        //HBatchNo 批次
                    }
                }
                else {

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html

@@ -293,7 +293,7 @@
                                type: "POST",
                                url: GetWEBURL() + url, //方法所在页面和方法名
                                async: true,
                                data: { "linterid": rows.toString() },
                                data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"]},
                                dataType: "json",
                                success: function (data) {
                                    layer.closeAll("loading");
@@ -311,7 +311,7 @@
                                , maxmin: false //允许全屏最小化
                                , anim: 0 //0-6的动画形式，-1不开启
                                //, content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&HBarcode=' + rows2.toString() + '&Type=SRM_POOrderBillList', 'yes']
                                , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=&HBarcode=&Type=SRM_POOrderBillList', 'yes']
                                , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["HUserName"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
                                , resize: false
                                //, cancel: function () {
                                //    $(".layui-btn").removeClass("layui-btn-disabled");

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html

@@ -130,6 +130,7 @@
                                    <label class="layui-form-label">完成状态</label>
                                    <div class="layui-input-block" style="width:190px;">
                                        <select name="HFinishStatus" lay-filter="HFinishStatus">
                                            <option value="" selected>全部</option>
                                            <option value="未完成" selected>未完成</option>
                                            <option value="已完成">已完成</option>
                                        </select>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html

@@ -130,6 +130,7 @@
                                    <label class="layui-form-label">完成状态</label>
                                    <div class="layui-input-block" style="width:190px;">
                                        <select name="HFinishStatus" lay-filter="HFinishStatus">
                                            <option value="" selected>全部</option>
                                            <option value="未完成" selected>未完成</option>
                                            <option value="已完成">已完成</option>
                                        </select>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx

@@ -9,7 +9,7 @@
    <script runat="server"> 
        protected void Page_Load(object sender, EventArgs e)
        {
          var ids = Request.Params["linterid"];
            var ids = Request.Params["linterid"];
            var idsArray = ids.Split(',');
            var PrintIds = "";
            for (int i = 0; i < idsArray.Length; i++)
@@ -17,7 +17,7 @@
                PrintIds += "'" + idsArray[i] + "',";
            }
            PrintIds = PrintIds.Substring(0, PrintIds.Length - 1);
            LogService.Write(PrintIds);
            //LogService.Write(PrintIds);
            SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_POInStockBillList where HPrintId in("+ PrintIds+") order by 物料代码");
        }
    </script>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx.cs

@@ -17,8 +17,10 @@
            {
                try
                {
                    var linterid = MemoryCacheHelper.GetCache("linterid");
                    LogService.Write("测试linterid:" + linterid);
                    var HuserName = Request.Params["linterid"];//用户名称
                    LogService.Write("HuserName：" + HuserName);
                    var linterid = MemoryCacheHelper.GetCache(HuserName);
                    LogService.Write("linterid：" + linterid);
                    SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 物料编码,内外箱标识,当前托数");
                }
                 catch(ThreadAbortException ex)