Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

test

11 小时以前 98e221d6dc26183efab868ee5f11a65d5791304e

 Pda/View/SoSetting/productOut.html

@@ -288,7 +288,7 @@
                              </div>
                           </td>
                        </tr> -->
                        <tr>
                        <!-- <tr>
                           <td>
                              <div class="layui-form-item layout-input" style="margin-top: 6px;">
                                 <label class="layui-form-label lableWidth">追溯条码：</label>
@@ -298,15 +298,14 @@
                                 </div>
                              </div>
                           </td>
                        </tr>
                        </tr> -->
                        <tr class="divPickQty1">
                           <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="pickQty1" type="number" placeholder="请输入拣货数量"
                                       autocomplete="off" class="layui-input"
                                       oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                       autocomplete="off" class="layui-input">
                                 </div>
                              </div>
                           </td>
@@ -971,20 +970,20 @@
                  });
                  return;
               }
               if (($('#boxNo3').val() != "" && ($('#pickQty1').val() != "" || $('#pickQty1').val() != 0))) {
                  layer.msg("追溯条码和拣货数量不能同时输入！", {
                     icon: 2,
                     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  });
                  return;
               }
               if ($('#pickQty1').val() != "" && $('#pickQty1').val() > parseInt($('#pickQty').val())) {
                  layer.msg("拣货数量不能大于待拣数量！", {
                     icon: 2,
                     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  });
                  return;
               }
               // if (($('#boxNo3').val() != "" && ($('#pickQty1').val() != "" || $('#pickQty1').val() != 0))) {
               //    layer.msg("追溯条码和拣货数量不能同时输入！", {
               //       icon: 2,
               //       time: 2000 //2秒关闭（如果不配置，默认是3秒）
               //    });
               //    return;
               // }
               // if ($('#pickQty1').val() != "" && $('#pickQty1').val() > parseInt($('#pickQty').val())) {
               //    layer.msg("拣货数量不能大于待拣数量！", {
               //       icon: 2,
               //       time: 2000 //2秒关闭（如果不配置，默认是3秒）
               //    });
               //    return;
               // }
            }
            // let boxQty = parseInt($('#boxQty').val())
            // let qty = parseInt($('#qty').val()) 
@@ -1017,7 +1016,7 @@
               "SoDetailId": $("#skuLotNo").val(),
               "PalletNo": $('#palletNo').val(),
               "BoxNo": $('#boxNo').val(),
               "BoxNo3": $('#boxNo3').val(),
               //"BoxNo3": $('#boxNo3').val(),
               "PickQty": $('#pickQty1').val()
            }
            sendData(IP + "/PdaSo/SoSetPick", param, 'post', function (res) {