Merge branch 'csc'

Demo

2024-03-05 46c887694fdde580355014847da7e39b4ab301cc

Merge branch 'csc'

 Pda/View/AsnSetting/productEnterQuantity.html

@@ -248,7 +248,7 @@
                    </table>
                    <!-- 分页 -->
                    <table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
                        <tr style="display: ;">
                        <tr >
                            <td class="page-prev">上一页</td>
                            <td class="page-num page-num-select">1</td>
                            <td class="page-num">2</td>
@@ -404,7 +404,7 @@
                    </table>
                    <!-- 分页 -->
                    <table id="tableBoxPages1" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
                        <tr style="display: ;">
                        <tr>
                            <td class="page-prev">上一页</td>
                            <td class="page-num page-num-select">1</td>
                            <td class="page-num">2</td>

 Pda/View/SoSetting/productOut.html

@@ -135,6 +135,17 @@
        .layui-form-switch {
            margin-top: 0;
        }
        ul {
            list-style-type: none;
            padding: 0;
        }

        li {
            cursor: pointer;
            background-color: lightgray;
            padding: 10px;
            margin-bottom: 5px;
        }
    </style>
    <link rel="stylesheet" href="/css/adapter.css" />
</head>
@@ -158,227 +169,386 @@
                </ul>
            </div>

            <div id="" class="layout-bill-info">
                <form class="layui-form" action="" style="height: auto;">
            <ul>
                <li id="option1">标签</li>
                <li id="option2">数量</li>
            </ul>

                    <div id="layout-bill" class="layui-form-item layout-dropdownlist">
                        <label class="layui-form-label lableWidth">出库单：</label>
                        <div class="layui-input-block" id="selectDiv">
                            <select id="bar" lay-filter="getbar" lay-search>
                                <option value=""></option>
                            </select>
                            <img src="/assets/down_arraw.png">
                        </div>
                    </div>
                    <div id="layout-skuLotNo" class="layui-form-item layout-dropdownlist">
                        <label class="layui-form-label lableWidth">物料 - 批次：</label>
                        <div class="layui-input-block">
                            <select id="skuLotNo" lay-filter="getSkuLotNo" lay-search>
                                <option value=""></option>
                            </select>
                            <img src="/assets/down_arraw.png">
                        </div>
                    </div>
                    <div id="" class="layout-tab-page">
                        <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label" style="width: 50%;">计划数量：</label>
                                        <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                            <input id="planQty" type="text" lay-verify="" disabled placeholder=""
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                                <td>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label" style="width: 50%">完成数量：</label>
                                        <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                            <input id="finishQty" type="text" lay-verify="" disabled placeholder=""
                                                class="layui-input">
                                        </div>
                                    </div>
            <br />

                                </td>
                                <td>
                                    <div class="layui-form-item">
                                        <label class="layui-form-label" style="width: 34%;">出库口：</label>
                                        <div class="layui-input-block" style="width: 66%;margin-left:34%;">
                                            <input id="outModel" type="text" lay-verify="" disabled placeholder=""
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr>
                            <tr>
                                <td colspan="3">
                                    <div class="layui-form-item">
                                        <label class="layui-form-label" style="width: 17%;">规格：</label>
                                        <div class="layui-input-block" style="width: 83%;margin-left:17%;">
                                            <input id="standard" type="text" lay-verify="" disabled placeholder=""
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
								
                            </tr>
                        </table>
                    </div>
            <!-- 有码 -->
            <div id="content1">
				
                <div id="" class="layout-bill-info">
                    <form class="layui-form" action="" style="height: auto;">

                    <div id="layout-pallet" class="layui-form-item layout-input">
                        <label class="layui-form-label lableWidth">托盘条码：</label>
                        <div class="layui-input-block">
                            <input id="palletNo" type="text" lay-verify="stock" placeholder="请扫描托盘条码" autocomplete="off"
                                class="layui-input" style="height:24px">
                        </div>
                    </div>
                    <div id="" class="layui-form-item layout-input">
                        <label class="layui-form-label" lang>是否整托出库：</label>
                        <div class="layui-input-block">
                            <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="是|否"
                                lay-filter="IsZhengTuo">
                        </div>
                    </div>
                    <div id="BoxDIv" class="layout-tab-page">
                        <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td>
                                    <div class="layui-form-item layout-input">
                                        <label class="layui-form-label lableWidth">外箱条码：</label>
                                        <div class="layui-input-block">
                                            <input id="boxNo" type="text" placeholder="请扫描外箱条码" autocomplete="off"
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr>
                            <!-- <tr>
                                <td>
                                    <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                        <label class="layui-form-label lableWidth">内箱条码：</label>
                                        <div class="layui-input-block">
                                            <input id="boxNo2" type="text" placeholder="请扫描外箱条码" autocomplete="off"
                                                class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr> -->
                            <tr>
                                <td>
                                    <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                        <label class="layui-form-label lableWidth">追溯条码：</label>
                                        <div class="layui-input-block">
                                            <input id="boxNo3" type="text" lang langholder placeholder="请扫描追溯条码"
                                                autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </td>
                            </tr>						
                        </table>						
                    </div>
                    <div id="" class="layout-tab-page">
                        <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
                            <tr>
                                <td>
                                    <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
                                        <tr>
                                            <td>
                                                <div class="layui-form-item">
                                                    <label class="layui-form-label lableWidth">待拣数量：</label>
                                                    <div class="layui-input-block">
                                                        <input id="pickQty" type="text" lay-verify="" disabled
                                                            placeholder="" class="layui-input">
                                                    </div>
                                                </div>
                                            </td>
                                            <td>
                                                <div class="layui-form-item">
                                                    <label class="layui-form-label lableWidth">已拣数量：</label>
                                                    <div class="layui-input-block">
                                                        <input id="pickedQty" type="text" lay-verify="" disabled
                                                            placeholder="" class="layui-input">
                                                    </div>
                                                </div>
                                            </td>
                                            <!-- <td>
                                                <div class="layui-form-item ">
                                                    <label class="layui-form-label lableWidth">箱内数量：</label>
                                                    <div class="layui-input-block">
                                                        <input id="boxQty" class="layui-input" style="border: 0;"
                                                            type="text" lay-verify="" disabled placeholder="">
                                                    </div>
                                                </div>
                                            </td> -->
                                        </tr>
                                    </table>
                                </td>
                            </tr>
                        </table>
                        <table class="layout-tab-content">
                            <tr>
                                <td style="width: 33%;"></td>
                                <td>
                                    <button class="layout-btn layout-btn-red" lang type="button" lay-submit
                                        lay-filter="formPickScatter">拣货</button>
                                </td>
                                <td style="width: 33%;"></td>
                                <!-- <td>
                                    <div id="layout-qty" class="layui-form-item out-scatter-num" style="margin-top: 15px;">
                                        <label class="layui-form-label lableWidth" >拣货数量：</label>
                                        <div id="" class="local-input">
                                            <div class="layui-input-block">
                                                <input id="qty" type="number" placeholder="请输入拣货数量"
                                                    autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
                                                    oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                            </div>
                                        </div>
                                        <div id="" class="local-ok">
                                            <button type="button" lay-submit lay-filter="formPickScatter">确认</button>
                                        </div>
                                    </div>
                                </td> -->
                            </tr>
                        </table>
                        <div id="" style="text-align: right;margin-top: 10px;">
                            <div id="" class="cut-line">
                                <img src="/assets/fengexian.png">
                        <div id="layout-bill" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label lableWidth">出库单：</label>
                            <div class="layui-input-block" id="selectDiv">
                                <select id="bar" lay-filter="getbar" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                    </div>
                        <div id="layout-skuLotNo" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label lableWidth">物料 - 批次：</label>
                            <div class="layui-input-block">
                                <select id="skuLotNo" lay-filter="getSkuLotNo" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div id="" class="layout-tab-page">
                            <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
                                <tr>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 50%;">计划数量：</label>
                                            <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                                <input id="planQty" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 50%">完成数量：</label>
                                            <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                                <input id="finishQty" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>

                </form>
                                    </td>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 34%;">出库口：</label>
                                            <div class="layui-input-block" style="width: 66%;margin-left:34%;">
                                                <input id="outModel" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                </tr>
                                <tr>
                                    <td colspan="3">
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 17%;">规格：</label>
                                            <div class="layui-input-block" style="width: 83%;margin-left:17%;">
                                                <input id="standard" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
									
                                </tr>
                            </table>
                        </div>

                        <div id="layout-pallet" class="layui-form-item layout-input">
                            <label class="layui-form-label lableWidth">托盘条码：</label>
                            <div class="layui-input-block">
                                <input id="palletNo" type="text" lay-verify="stock" placeholder="请扫描托盘条码" autocomplete="off"
                                    class="layui-input" style="height:24px">
                            </div>
                        </div>
                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>是否整托出库：</label>
                            <div class="layui-input-block">
                                <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="是|否"
                                    lay-filter="IsZhengTuo">
                            </div>
                        </div>
                        <div id="BoxDIv" class="layout-tab-page">
                            <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
                                <tr>
                                    <td>
                                        <div class="layui-form-item layout-input">
                                            <label class="layui-form-label lableWidth">外箱条码：</label>
                                            <div class="layui-input-block">
                                                <input id="boxNo" type="text" placeholder="请扫描外箱条码" autocomplete="off"
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                </tr>
                                <!-- <tr>
                                    <td>
                                        <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                            <label class="layui-form-label lableWidth">内箱条码：</label>
                                            <div class="layui-input-block">
                                                <input id="boxNo2" type="text" placeholder="请扫描外箱条码" autocomplete="off"
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                </tr> -->
                                <tr>
                                    <td>
                                        <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                            <label class="layui-form-label lableWidth">追溯条码：</label>
                                            <div class="layui-input-block">
                                                <input id="boxNo3" type="text" lang langholder placeholder="请扫描追溯条码"
                                                    autocomplete="off" class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                </tr>						
                            </table>						
                        </div>
                        <div id="" class="layout-tab-page">
                            <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
                                <tr>
                                    <td>
                                        <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
                                            <tr>
                                                <td>
                                                    <div class="layui-form-item">
                                                        <label class="layui-form-label lableWidth">待拣数量：</label>
                                                        <div class="layui-input-block">
                                                            <input id="pickQty" type="text" lay-verify="" disabled
                                                                placeholder="" class="layui-input">
                                                        </div>
                                                    </div>
                                                </td>
                                                <td>
                                                    <div class="layui-form-item">
                                                        <label class="layui-form-label lableWidth">已拣数量：</label>
                                                        <div class="layui-input-block">
                                                            <input id="pickedQty" type="text" lay-verify="" disabled
                                                                placeholder="" class="layui-input">
                                                        </div>
                                                    </div>
                                                </td>
                                                <!-- <td>
                                                    <div class="layui-form-item ">
                                                        <label class="layui-form-label lableWidth">箱内数量：</label>
                                                        <div class="layui-input-block">
                                                            <input id="boxQty" class="layui-input" style="border: 0;"
                                                                type="text" lay-verify="" disabled placeholder="">
                                                        </div>
                                                    </div>
                                                </td> -->
                                            </tr>
                                        </table>
                                    </td>
                                </tr>
                            </table>
                            <table class="layout-tab-content">
                                <tr>
                                    <td style="width: 33%;"></td>
                                    <td>
                                        <button class="layout-btn layout-btn-red" lang type="button" lay-submit
                                            lay-filter="formPickScatter">拣货</button>
                                    </td>
                                    <td style="width: 33%;"></td>
                                    <!-- <td>
                                        <div id="layout-qty" class="layui-form-item out-scatter-num" style="margin-top: 15px;">
                                            <label class="layui-form-label lableWidth" >拣货数量：</label>
                                            <div id="" class="local-input">
                                                <div class="layui-input-block">
                                                    <input id="qty" type="number" placeholder="请输入拣货数量"
                                                        autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
                                                        oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                                </div>
                                            </div>
                                            <div id="" class="local-ok">
                                                <button type="button" lay-submit lay-filter="formPickScatter">确认</button>
                                            </div>
                                        </div>
                                    </td> -->
                                </tr>
                            </table>
                            <div id="" style="text-align: right;margin-top: 10px;">
                                <div id="" class="cut-line">
                                    <img src="/assets/fengexian.png">
                                </div>
                            </div>
                        </div>

                    </form>
                </div>

                <div class="layout-tbl-paging" id="">
                    <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                        <tr id="tableHead">
                            <th style="width: 54%;">容器编码</th>
                            <th style="width: 20%;">箱内<br>数量</th>
                            <th style="width: 20%;">已拣<br>数量</th>
                            <!-- <th style="width: 14%;">已拣<br>数量</th> -->
                            <!-- <th style="width: 8%;">拣货</th> -->
                        </tr>
                        <tr id="boxCell" style="display: none;">
                            <td name="boxNo">AG000001</td> 
                            <td name="qty">30</td>
                            <td name="pickedQty">30</td> 
                        </tr>
                    </table>

                    <!-- 分页 -->
                    <table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
                        <tr>
                            <td class="page-prev">上一页</td>
                            <td class="page-num page-num-select">1</td>
                            <td class="page-num">2</td>
                            <td class="page-num">3</td>
                            <td class="page-num">4</td>
                            <td class="page-num">5</td>
                            <td class="page-next">下一页</td>
                        </tr>
                    </table>
                </div>
            </div>
            <!-- 无码 -->
            <div id="content2">
				
                <div id="" class="layout-bill-info">
                    <form class="layui-form" action="" style="height: auto;">

                        <div id="layout-bill2" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label lableWidth">出库单：</label>
                            <div class="layui-input-block" id="selectDiv2">
                                <select id="bar2" lay-filter="getbar2" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div id="layout-skuLotNo2" class="layui-form-item layout-dropdownlist">
                            <label class="layui-form-label lableWidth">物料 - 批次：</label>
                            <div class="layui-input-block">
                                <select id="skuLotNo2" lay-filter="getSkuLotNo2" lay-search>
                                    <option value=""></option>
                                </select>
                                <img src="/assets/down_arraw.png">
                            </div>
                        </div>
                        <div id="" class="layout-tab-page">
                            <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
                                <tr>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 50%;">计划数量：</label>
                                            <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                                <input id="planQty2" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
                                    <td>
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 50%">完成数量：</label>
                                            <div class="layui-input-block" style="width: 50%;margin-left:50%;">
                                                <input id="finishQty2" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>

                                    </td> 
                                </tr>
                                <tr>
                                    <td colspan="3">
                                        <div class="layui-form-item">
                                            <label class="layui-form-label" style="width: 17%;">规格：</label>
                                            <div class="layui-input-block" style="width: 83%;margin-left:17%;">
                                                <input id="standard2" type="text" lay-verify="" disabled placeholder=""
                                                    class="layui-input">
                                            </div>
                                        </div>
                                    </td>
									
                                </tr>
                            </table>
                        </div>

                        <div id="layout-pallet" class="layui-form-item layout-input">
                            <label class="layui-form-label lableWidth">托盘条码：</label>
                            <div class="layui-input-block">
                                <input id="palletNo2" type="text" lay-verify="stock" placeholder="请扫描托盘条码" autocomplete="off"
                                    class="layui-input" style="height:24px">
                            </div>
                        </div>
                        <div class="layui-form-item layout-input" style="display: flex; justify-content: space-between;">
                            <div style="width: 48%;">
                                <label class="layui-form-label" style="width: 34%;">出库口：</label>
                                <div class="layui-input-block" style="width: 66%;margin-left:34%;">
                                    <input id="outModel2" type="text" lay-verify="" disabled placeholder=""
                                        class="layui-input" > <!-- style="border: 0px;" -->
                                </div>
                            </div>
                            <div style="width: 48%;">
                                <label class="layui-form-label" style="width: 70px;">已拣数量：</label>
                                <div class="layui-input-block" style="width: 120px; margin-left:70px;">
                                    <input id="pickedQty2" type="text" lay-verify="" disabled
                                    placeholder="" class="layui-input" >
                                </div>
                            </div>
                        </div>
						 
                        <div id="" class="layout-tab-page">
							 
                            <table class="layout-tab-content">
                                <tr>
                                    <td>
                                        <div id="layout-qty" class="layui-form-item out-scatter-num" >
                                            <label class="layui-form-label lableWidth" >拣货数量：</label>
                                            <div id="" class="local-input">
                                                <div class="layui-input-block">
                                                    <input id="pickQty2" type="number" placeholder="请输入拣货数量"
                                                        autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
                                                        oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                                </div>
                                            </div>
                                            <div id="" class="local-ok">
                                                <button type="button" lay-submit lay-filter="formPickScatter2">确认</button>
                                            </div>
                                        </div>
                                    </td>
                                </tr>
                            </table>
                            <div id="" style="text-align: right;margin-top: 10px;">
                                <div id="" class="cut-line">
                                    <img src="/assets/fengexian.png">
                                </div>
                            </div>
                        </div>

                    </form>
                </div>

                <div class="layout-tbl-paging" id="">
                    <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                        <tr id="tableHead">
                            <th style="width: 54%;">物料编码</th>
                            <th style="width: 20%;">托内<br>数量</th>
                            <th style="width: 20%;">已拣<br>数量</th>
                            <!-- <th style="width: 14%;">已拣<br>数量</th> -->
                            <!-- <th style="width: 8%;">拣货</th> -->
                        </tr>
                        <tr id="boxCell2" style="display: none;">
                            <td name="SkuNo2">AG000001</td> 
                            <td name="qty2">30</td>
                            <td name="pickedQty2">30</td> 
                        </tr>
                    </table>

                    <!-- 分页 -->
                    <table id="tableBoxPages2" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
                        <tr>
                            <td class="page-prev">上一页</td>
                            <td class="page-num page-num-select">1</td>
                            <td class="page-num">2</td>
                            <td class="page-num">3</td>
                            <td class="page-num">4</td>
                            <td class="page-num">5</td>
                            <td class="page-next">下一页</td>
                        </tr>
                    </table>
                </div>
            </div>

            <div class="layout-tbl-paging" id="">
                <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
                    <tr id="tableHead">
                        <th style="width: 54%;">容器编码</th>
                        <th style="width: 20%;">箱内<br>数量</th>
                        <th style="width: 20%;">已拣<br>数量</th>
                        <!-- <th style="width: 14%;">已拣<br>数量</th> -->
                        <!-- <th style="width: 8%;">拣货</th> -->
                    </tr>
                    <tr id="boxCell" style="display: none;">
                        <td name="boxNo">AG000001</td> 
                        <td name="qty">30</td>
                        <td name="pickedQty">30</td> 
                    </tr>
                </table>

                <!-- 分页 -->
                <table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
                    <tr>
                        <td class="page-prev">上一页</td>
                        <td class="page-num page-num-select">1</td>
                        <td class="page-num">2</td>
                        <td class="page-num">3</td>
                        <td class="page-num">4</td>
                        <td class="page-num">5</td>
                        <td class="page-next">下一页</td>
                    </tr>
                </table>
            </div>
        </div>

    </div>
@@ -392,6 +562,38 @@
    <script>
        layui.use(['form', 'jquery'], function () {
            var form = layui.form;

             /* 标签切换代码 */

             var xianshiyemian = 0;

            $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //选中后颜色
            $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //默认颜色
            $('#content2').hide();
            $(document).ready(function () {
                $('#option1').click(function () {
                    // qingkong();
                    xianshiyemian = 0;
                    $('#content1').show();
                    $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //选中后颜色

                    $('#content2').hide();
                    $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //默认颜色
                    $("#palletNo").focus();//光标默认选中
                });

                $('#option2').click(function () {
                    // qingkong();
                    xianshiyemian = 1;
                    $('#content1').hide();
                    $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //默认颜色

                    $('#content2').show();
                    $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //选中后颜色
                    $("#palletNo2").focus();//光标默认选中
                });
            });


            //当前分页
            var curPageIndex = 1
@@ -856,94 +1058,284 @@
                    setCurPage(1)
                }
                
                //设置当前分页
                function setCurPage(pageIndex){
                    let totalTrNum = $("#tableBoxList tr").length
                    if(totalTrNum <= 2 ){
                        //console.log("tableBoxList 为空 totalTrNum: " + totalTrNum)
                        //curPageIndex = 1
                        return
                    }
					
                    let pageNum = getBoxPageNum()
                    if(pageIndex > pageNum){
                        //console.log("设置的页码超出页数, pageIndex : " + pageIndex)
                        //curPageIndex = 1
                        return
                    }
					
                    let startIndex = (pageIndex - 1) * 10 + 1
                    let n = totalTrNum - startIndex
                    let endIndex = 0
                    if(n > 9){
                        endIndex = startIndex + 9
            //设置当前分页
            function setCurPage(pageIndex){
                let totalTrNum = $("#tableBoxList tr").length
                if(totalTrNum <= 2 ){
                    //console.log("tableBoxList 为空 totalTrNum: " + totalTrNum)
                    //curPageIndex = 1
                    return
                }
				
                let pageNum = getBoxPageNum()
                if(pageIndex > pageNum){
                    //console.log("设置的页码超出页数, pageIndex : " + pageIndex)
                    //curPageIndex = 1
                    return
                }
				
                let startIndex = (pageIndex - 1) * 10 + 1
                let n = totalTrNum - startIndex
                let endIndex = 0
                if(n > 9){
                    endIndex = startIndex + 9
                }else{
                    endIndex = startIndex + n
                }
                //console.log("startIndex is "+startIndex)
                //console.log("endIndex is "+endIndex)
                //startIndex =2
                //endIndex = 2
                let trs = $("#tableBoxList tr")
                //console.log("行数 "+trs.length)
                let d = 0
                for(let i = 2; i < trs.length; i++){
                    //console.log("行索引 " + trs.eq(i).attr('index'))
                    let t = trs.eq(i)
                    d = t.attr('index')
                    if(d >= startIndex && d <= endIndex){
                        //console.log("需要显示")
                        //显示行
                        t.show()
                    }else{
                        endIndex = startIndex + n
                        //隐藏行
                        t.hide()
                    }
                    //console.log("startIndex is "+startIndex)
                    //console.log("endIndex is "+endIndex)
                    //startIndex =2
                    //endIndex = 2
                    let trs = $("#tableBoxList tr")
                    //console.log("行数 "+trs.length)
                    let d = 0
                    for(let i = 2; i < trs.length; i++){
                        //console.log("行索引 " + trs.eq(i).attr('index'))
                        let t = trs.eq(i)
                        d = t.attr('index')
                        if(d >= startIndex && d <= endIndex){
                            //console.log("需要显示")
                            //显示行
                            t.show()
                        }else{
                            //隐藏行
                            t.hide()
                        }
                    }
					
                    curPageIndex = pageIndex
					
                    let ptr = $("#tableBoxPages tr")
                    for(let i = 1; i < pageNum+1; i++){
                        ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
                        if(i == curPageIndex){
                            ptr.eq(0).find("td").eq(i).addClass("page-num-select")
                        }
                    }
                    //console.log("totalTrNum is " + totalTrNum)
                }
                
                function onClickPrevPage(){
                    //console.log("上一页按钮被点击")
                    if(curPageIndex == 1){
                        return
                curPageIndex = pageIndex
				
                let ptr = $("#tableBoxPages tr")
                for(let i = 1; i < pageNum+1; i++){
                    ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
                    if(i == curPageIndex){
                        ptr.eq(0).find("td").eq(i).addClass("page-num-select")
                    }
                    setCurPage(curPageIndex - 1)
                }
                //console.log("totalTrNum is " + totalTrNum)
            }
			
            function onClickPrevPage(){
                //console.log("上一页按钮被点击")
                if(curPageIndex == 1){
                    return
                }
                setCurPage(curPageIndex - 1)
            }
			
            function onClickNextPage(){
                //console.log("下一页按钮被点击")
                let n = getBoxPageNum()
                if(curPageIndex == n){
                    return
                }
                setCurPage(curPageIndex + 1)
            }
							
            function getBoxPageNum()
            {
                let num = $("#tableBoxList tr").length
                if(num <= 2 ){
                    return 0
                }
                
                function onClickNextPage(){
                    //console.log("下一页按钮被点击")
                    let n = getBoxPageNum()
                    if(curPageIndex == n){
                        return
                    }
                    setCurPage(curPageIndex + 1)
                let pageNum = Math.floor(num / 10);
                if(num % 10 > 0){
                    pageNum += 1;
                }
								
                function getBoxPageNum()
                {
                    let num = $("#tableBoxList tr").length
                    if(num <= 2 ){
                        return 0
                    }
					
                    let pageNum = Math.floor(num / 10);
                    if(num % 10 > 0){
                        pageNum += 1;
                    }
					
                    return pageNum
				
                return pageNum
            }


            //数量标签-------------------------------------------------------------------------------

            function clear21() {
                $('#outModel2').val("");//出库口
                $('#standard2').val("");//规格

                $('#pickQty2').val("");//待拣数量
                $('#pickedQty2').val("");//已拣数量
            }
            function clear22() {
                //物料批次
                $("#skuLotNo2").empty()
                $("#skuLotNo2").append('<option value =>' + '</option>');
                form.render('select');
            }
            function clear23() {
                $("#planQty2").val("");  //计划数量
                $("#finishQty2").val("");//完成数量
            }
            function clear24() {
                $('#boxNo2').val("");//箱码
                $('#boxQty2').val("");//箱内数量
            }
			

            //当托盘条码输入框文本改变时,检查一下托盘状态 
            $("#palletNo2").on('input', function () {
                if ($("#palletNo2").val() == "" || $("#palletNo2").val().length < 8) {
                    return
                }
                if ($("#palletNo2").val().length >= 8) {
                    $("#palletNo2").val($("#palletNo2").val().substr(-8))
                }
                checkPalletState2()
            })
            //检查托盘状态
            function checkPalletState2() {
                var param = {
                    "PalletNo": $("#palletNo2").val()
                }
                synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {
                    if (res.code == 0) { //成功 
                        updateBillList2();
                        if ($('#bar').val() == "") {
                            clear21();
                            return;
                        } else {
                            updateSkuLotNoList2();
                            updateQtyList2();
                            getBar2();
                            GetBoxInfo();
                        }

                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            }
            //初始化渲染 出库单
            function updateBillList2() {
                $("#bar2").empty()
                $("#bar2").append('<option value =>' + '</option>');
                form.render('select');

                var param = {
                    PalletNo: $("#palletNo2").val(),
                };
                synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
                                $("#bar2").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
                            } else {
                                $("#bar2").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
                            }
                        }
                        form.render('select');

                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                    }
                });
            }

            //初始化渲染 物料-批次
            function updateSkuLotNoList2() {
                clear22(); 
                var param = {
                    PalletNo: $("#palletNo2").val(),
                    SoNo: $("#bar2").val(),
                };
                synData(IP + "/PdaSo/GetSoSkuLotNoListByPallet", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
                                $("#skuLotNo2").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i].SkuName + " - " + res.data[i].LotNo + '</option>');

                            } else {
                                $("#skuLotNo2").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i].SkuName + " - " + res.data[i].LotNo + '</option>');
                            }
                        }
                        form.render('select');

                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            }

            //初始化渲单据的计划数量和完成数量
            function updateQtyList2() {
                clear23();
                var param = {
                    SoDetailId: $("#skuLotNo2").val(),
                };
                synData(IP + "/PdaSo/GetPlanAndFinishQty", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        $("#planQty2").val(res.data.PlanQty)
                        $("#finishQty2").val(res.data.FinishQty)
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            }

            //根据单据获取出库口、规格、待检数量、已拣数量
            function getBar2() {
                clear21();

                var param = {
                    PalletNo: $("#palletNo2").val(),
                    SoDetailId: $("#skuLotNo2").val(),
                }
                synData(IP + "/PdaSo/GetOutlets", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        let data = res.data
                        console.log(res.data);
                        $('#outModel2').val(res.data.OutModel);
                        $('#standard2').val(res.data.Standard);

                        $('#pickQty2').val(res.data.PickQty);
                        $('#pickedQty2').val(res.data.PickedQty);
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });

            }

            //获取托盘物料名细
            function GetBoxInfo() { 
                let param2 = {
                    "SoDetailId": $("#skuLotNo2").val(),
                    "PalletNo": $("#palletNo2").val(),
                    "BoxNo": $("#boxNo").val(),
                    "BoxNo3": $("#boxNo3").val(),
                }
                synData(IP + "/PdaSo/GetDataComBoxInfo", param2, 'post', function (res) {
                    if (res.code == 0) {
                        tableData = deepCopy(res.data)

                        refreshTable(tableData)
                    } else {
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                    }
                });
            }


        })
    </script>

 Wms/Model/ModelDto/PdaDto/PdaSoDto.cs

@@ -12,6 +12,7 @@
        public string Standard { get; set; }                       // 规格
        public decimal PickQty { get; set; }                       // 托盘待拣数量
        public decimal? PickedQty { get; set; }                       // 托盘已拣数量
        public string SkuNo { get; set; }                           // 物料编号
    }
    public class BoxInfo
    {

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -278,7 +278,19 @@
            }
        }

        //获取库内无箱码的托盘分配信息
        public List<OutPdaInfo> GetAllotPlnInfo(string soDetailId, string palletNo)
        {
            try
            {

            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
            throw new NotImplementedException();
        }

        //出库pda拣货
        public void SoSetPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, int userId)
@@ -977,5 +989,7 @@
                throw new Exception(e.Message);
            }
        }

        
    }
}

 Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs

@@ -58,6 +58,14 @@
        List<BoxInfo> GetDataComBoxInfo(string soDetailId,string palletNo, string boxNo, string boxNo3);

        /// <summary>
        /// 获取库内无箱码的托盘分配信息
        /// </summary>
        /// <param name="soDetailId">出库单明细ID</param>
        /// <param name="palletNo">托盘号</param>
        /// <returns></returns>
        List<OutPdaInfo> GetAllotPlnInfo(string soDetailId,string palletNo);

        /// <summary>
        /// 出库pda拣货
        /// </summary>
        /// <param name="soNo">出库单</param>