Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2025-12-29 8f37e4d6d63ba23c0aebdccf2284baa79b3424c7

 WebTM/views/²Ö´æ¹ÜÀí/Éú²úÈë¿âµ¥/Kf_ProductInBillList.html

@@ -172,6 +172,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>托数变更</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_WMSSub" id="btn_WMSSub"><i class="layui-icon layui-icon-form"></i>条码明细</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -469,6 +470,9 @@
                    //编辑按钮
                    case 'btn_Edit': btn_Edit();
                        break;
                    //托数变更按钮
                    case "btn-tally": set_PalletChange();
                        break;
                    //删除按钮
                    case 'btn_Delete': btn_Delete();
                        break;
@@ -493,6 +497,7 @@
                    //作废按钮        ï¼ˆ1:作废、2:反作废）
                    case 'btn_Drop': set_DropBill(1);
                        break;
 
                    //反作废按钮
                    case 'btn_DeDrop': set_DropBill(2);
                        break;
@@ -1083,6 +1088,104 @@
            }
            //#endregion

            //#region æ‰˜æ•°å˜æ›´
            function set_PalletChange() {
                var checkStatus = table.checkStatus('mainTable');
                var data = checkStatus.data;

                if (data.length !== 1) {
                    layer.msg('请选择一行数据进行托数变更！');
                    return;
                }
                var rowData = data[0];
                // èŽ·å–当前托数
                var currentPallet = rowData.托数;

                // è‡ªå®šä¹‰å¼¹çª—内容
                var content = '<div style="padding: 20px;">' +
                    '<div class="layui-form-item">' +
                    '<label class="layui-form-label">当前托数</label>' +
                    '<div class="layui-input-block">' +
                    '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
                    '</div>' +
                    '</div>' +
                    '<div class="layui-form-item">' +
                    '<label class="layui-form-label">新托数</label>' +
                    '<div class="layui-input-block">' +
                    '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="请输入正整数" min="1" step="1">' +
                    '</div>' +
                    '</div>' +
                    '<div class="layui-form-item" style="color: #999; font-size: 12px;">提示：托数必须为整数（大于0）</div>' +
                    '</div>';

                layer.open({
                    type: 1,
                    title: '托数变更',
                    area: ['400px', '300px'],
                    content: content,
                    btn: ['保存', '取消'],
                    btnAlign: 'c',
                    yes: function (index, layero) {
                        var newValue = $('#newPalletValue').val();
                        var newPallet = parseInt(newValue);

                        // éªŒè¯è¾“å…¥
                        if (!newValue) {
                            layer.msg('请输入托数！', { icon: 2 });
                            $('#newPalletValue').focus();
                            return false;
                        }

                        if (isNaN(newPallet)) {
                            layer.msg('请输入有效的数字！', { icon: 2 });
                            $('#newPalletValue').focus();
                            return false;
                        }

                        if (newPallet.toString() !== newValue) {
                            layer.msg('托数不能为小数！', { icon: 2 });
                            $('#newPalletValue').focus();
                            return false;
                        }


                        // ä¿å­˜æ•°æ®
                        layer.load();
                        $.ajax({
                            url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
                            type: 'POST',
                            data: {
                                hmainid: rowData.hmainid,
                                hsubid: rowData.hsubid || 0,
                                newPallet: newPallet,
                                operator: sessionStorage["HUserName"]
                            },
                            success: function (result) {
                                layer.closeAll('loading');
                                if (result.count == 1) {
                                    layer.msg('托数变更成功！', { icon: 1 });
                                    layer.close(index);

                                    window.$("#btnSearch").click();
                                } else {
                                    layer.msg('保存失败：' + result.Message, { icon: 5 });
                                }
                            },
                            error: function () {
                                layer.closeAll('loading');
                                layer.msg('请求失败！', { icon: 5 });
                            }
                        });
                    },
                    success: function (layero, index) {
                        // è®¾ç½®è¾“入框焦点
                        $('#newPalletValue').focus().select();
                    }
                });
            }

            //#endregion

            //#region è‡ªå®šä¹‰è¿‡æ»¤ä¸‹æ‹‰æ¡†
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';