Merge branch 'csc'

Demo

2024-03-05 46c887694fdde580355014847da7e39b4ab301cc

 HTML/views/SOSetting/ExportNotice.html

@@ -66,6 +66,7 @@
                           <option value="5">中间品出库</option>
                           <option value="6">代储出库</option>
                           <option value="7">其他出库</option>
                           <option value="8">寄存出库</option>
                           <!-- 09 -->
                           <!-- <option value="0">标准销售出库</option>
                           <option value="1">非标销售出库</option>
@@ -142,7 +143,7 @@
                        <div class="layui-input-inline" style="width: 220px;">
                           <select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
                              <option value="0" selected>机器人拆垛</option>
                              <option value="1">人工拆垛</option>
                              <option value="1">PDA拆垛</option>
                           </select>
                        </div>
                     </div>
@@ -212,6 +213,8 @@
                                 return "代储出库";
                              case "7":
                                 return "其他出库";
                              case "8":
                                 return "寄存出库";
                              default:
                                 return "";
                           }
@@ -333,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">
@@ -1223,6 +1228,8 @@
                  });
               }else if(obj.event === 'outKu'){   
                  $("#UnstackWay option[value='0']").attr("selected","selected");
                  $("#LoadingArea option[value='']").attr("selected","selected");
                  $("#PickingArea option[value='']").attr("selected","selected");
                  form.render('select');                
                  var param = {
                     soNo: SoNo
@@ -1269,7 +1276,9 @@
                           }
                           var param = {
                              soNo: data.SONo, 
                              unstackingMode:$('#UnstackWay').val(),
                              outMode: pa,
                              loadingAddre:$('#LoadingArea').val()
                           };
                           console.log(param);
                           sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {