合并代码

Demo

2024-03-07 e7864a4dcecba72ccbb06dfb6a3d4a77c65f2a3c

 HTML/views/SOSetting/ExportNotice.html

@@ -1386,10 +1386,11 @@
                        isChongFu= false;
                        if(pa == null)
                        {
                           layer.msg("请勿重复点击", {
                           layer.msg("请选择出库口", {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           });
                           isChongFu= true;
                           return;
                        }
                        if($('#UnstackWay').val()=='0'){
@@ -1398,6 +1399,21 @@
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                              isChongFu= true;
                              return;
                           }
                        }
                        console.log($("#PickingArea").val())
                        if($("#PickingArea").val() == '')
                        {
                           layer.msg("请选择出库口", {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           });
                           isChongFu= true;
                           return;
                        }
                              isChongFu= true;
                              return;
                           }
                           if(isNeedUnpack=='1'){
@@ -1406,6 +1422,7 @@
                                    icon: 2,
                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                 });
                                 isChongFu= true;
                                 return;
                              }
                           }
@@ -1415,6 +1432,7 @@
                                 icon: 2,
                                 time: 2000 //2秒关闭（如果不配置，默认是3秒）
                              });
                              isChongFu= true;
                              return;
                           }
                        }