Merge branch 'wxw'

Administrator

2024-03-06 db1833f3ecc5ae4eb14eb9d1bd8990e36fa85a97

 HTML/views/SOSetting/ExportNotice.html

@@ -336,9 +336,11 @@
                        var html = ''; 
                        if(d.IsWave == '0'){
                           if(d.Status == '0' || d.Status == '1' ){
                              html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto"> 
                                       <i class="layui-icon layui-icon-ok"></i>自动分配
                                    </a>`;
                              if(d.Type != "8") {
                                 html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto"> 
                                    <i class="layui-icon layui-icon-ok"></i>自动分配
                                 </a>`;
                              }
                           }
                           if(d.Status == '0' && d.Origin == 'WMS'){
                              html += `<a class="layui-btn layui-btn-normal layui-btn-xs uptClass" lay-event="edit">
@@ -1232,6 +1234,7 @@
                  var param = {
                     soNo: SoNo
                  };
                  // 判断是否需要拆箱，需要拆箱就需要选择出库口
                  sendData(IP + "/BllSo/IsNeedUnpack", param, 'get', function(res) {
                     if (res.code == 0) { //成功
                        if(res.data=="1"){
@@ -1271,6 +1274,33 @@
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                              return;
                           }
                           if($('#UnstackWay').val()=='0'){
                              if($('#LoadingArea').val()==''){
                                 layer.msg("请选择装车口", {
                                    icon: 2,
                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                 });
                                 return;
                              }
                              if(isNeedUnpack=='1'){
                                 if(pa==''){
                                    layer.msg("请选择出库口", {
                                       icon: 2,
                                       time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                    });
                                    return;
                                 }
                              }
                           }else{
                              if(pa==''){
                                 layer.msg("请选择出库口", {
                                    icon: 2,
                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                 });
                                 return;
                              }
                           }
                           var param = {
                              soNo: data.SONo,