Demo
2024-02-19 066ec607f14a28c9d8dbf1ffcb05ad7b964e1476
修改标签问题
5个文件已修改
35 ■■■■ 已修改文件
HTML/views/ASNSetting/ArrivalNotice.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/LabelBoxBuDa.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/LabelPrint.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/LabelPrintSelect.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/ArrivalNotice.html
@@ -1201,7 +1201,7 @@
                                    console.log(field);
                                    //提交 Ajax 成功后,静态更新表格中的数据
                                    //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                                    var str = "Id="+id+"&Reset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
                                    
                                    layer.open({
                                        type: 2,
HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -190,7 +190,7 @@
                GetImportId();
            });
            form.on('select(Type)', function (data) {
                console.log(data.value); //得到被选中的值
                // console.log(data.value); //得到被选中的值
                if (data.value == "1") {
                    $("#LabelStream").removeAttr("readonly")
                    $("#EndBoxCode").removeAttr("readonly")
@@ -226,14 +226,14 @@
                synData(IP + "/BllAsn/GetBuDaLabelList", param1, 'post', function (res) {
                    if (res.code == 0) { //成功    
                        var labels = "";
                        console.log(res.data);
                        // console.log(res.data);
                        for (var z = 0; z < res.data.length; z++) {
                            var idd = "";
                            if (z - 1 >= 0) {
                                idd = (z - 1).toString();
                            }
                            console.log(res.data[z]);
                            console.log(z);
                            // console.log(res.data[z]);
                            // console.log(z);
                            $("#SkuNo").attr("id", "SkuNo" + z.toString());
                            $("#SkuNo" + z.toString()).html(res.data[z].SkuNo);
                             
@@ -303,7 +303,7 @@
                            $("#imgBar" + z.toString()).attr("id", "imgBar");
                            $("#imgBar").attr("src", "");
                        }
                        console.log(labels);
                        // console.log(labels);
                        document.getElementById('print2').innerHTML = "";
                        document.getElementById('print2').innerHTML = labels;
                        $("#print2").removeClass("hideCls");
HTML/views/ASNSetting/LabelPrint.html
@@ -112,16 +112,16 @@
            var laydate = layui.laydate;
            
            var id = getQueryString('Id');
            var reset = getQueryString('Reset');
            var reset = getQueryString('IsReset');
            var arriveQty = getQueryString('ArriveQty');
            
            var productionTime = getQueryString('ProductionTime');
            var expirationTime = getQueryString('ExpirationTime');
            var storeTime = getQueryString('StoreTime');  
            
            console.log(productionTime);
            console.log(expirationTime);
            console.log(storeTime);
            // console.log(productionTime);
            // console.log(expirationTime);
            // console.log(storeTime);
            //生成
            $('#btnAdd').on('click', function () {
@@ -133,7 +133,7 @@
                    ExpirationTime:expirationTime,
                    StoreTime:storeTime
                };
                console.log(param);
                // console.log(param);
                synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
                    if (res.code == 0) { //成功  
                        layer.msg(res.msg, {
@@ -189,7 +189,7 @@
            }
            // 循环加载标签
            // 加载标签
            function div(i, isprint, bqNum) {
                             
                var param1 = {
HTML/views/ASNSetting/LabelPrintSelect.html
@@ -32,7 +32,7 @@
            <div class="layui-form-item">
                <label class="layui-form-label">重置批号</label>
                <div class="layui-input-block">
                    <select name="reset" id="reset" lay-verify="required">
                    <select name="reset" id="reset" lay-filter="reset" lay-verify="required">
                        <option value="1">是</option>
                        <option value="0">否</option>
                    </select>
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -672,7 +672,7 @@
                    }
                    else
                    {
                        var maxCode = Db.Queryable<BllLabelBoxNo>().Max(a => a.LotNo);                        // 获取今天最大批次号
                        var maxCode = Db.Queryable<BllBoxInfo>().Where(m=>m.Origin == "WMS生成").Max(a => a.LotNo);                        // 获取今天最大批次号
                        if (string.IsNullOrWhiteSpace(maxCode))
                        {
                            maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
@@ -819,7 +819,7 @@
                    }
                    else
                    {
                        var maxCode = Db.Queryable<BllLabelBoxNo>().Max(a => a.LotNo);                        // 获取今天最大批次号
                        var maxCode = Db.Queryable<BllBoxInfo>().Where(m => m.Origin == "WMS生成").Max(a => a.LotNo);                        // 获取今天最大批次号
                        if (string.IsNullOrWhiteSpace(maxCode))
                        {
                            maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
@@ -1512,7 +1512,7 @@
                                        model1.Qty = item.Qty;// 数量
                                        model1.BoxNo = item.BoxNo3;                 // 支号     
                                        model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
                                        model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
                                        // 添加到list集合
                                        printModelList.Add(model1);
@@ -1543,9 +1543,6 @@
                #endregion
                //dataContext.WmsLabelPrintLog.InsertAllOnSubmit(printlog);
                //    dataContext.SubmitChanges();
                //    return printModel;
                return printModelList;
            }
            catch (Exception e)