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>
@@ -90,7 +91,7 @@
                           <option value="3">正在执行</option>
                           <option value="4">执行完毕</option>
                           <option value="5">订单关闭</option>
                           <option value="6">已复核</option>
                           <option value="6">上传完毕</option>
                        </select>
                     </div>
                  </div>
@@ -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">
@@ -362,11 +367,13 @@
                                 </a>`;
                        }                        
                        if( d.Status == '5'){
                           html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml"> 
                           html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check"> 
                              <i class="layui-icon layui-icon-ok"></i>复核
                           </a>`;
                        }
								
                        html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml"> 
                           <i class="layui-icon layui-icon-ok"></i>XML
                        </a>`;
                        html += `<a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
                           <i class="layui-icon layui-icon-edit"></i>备注</a>`;
                        return html;
@@ -1135,7 +1142,7 @@
                     var param = {
                        Id: parseInt(Id), 
                     };
                     sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function(res) {
                     sendData(IP + "/UpApi/CloseExportNotice", param, 'post', function(res) {
                        console.log(res);
                        if (res.code == 0) { //成功
                           layer.msg(res.msg, {
@@ -1221,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
@@ -1267,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) {
@@ -1371,6 +1382,29 @@
                        });
                     }
                  }); 
               }else if(obj.event === 'check'){//复核
                  // 代码区域
                  layer.confirm('确定复核此单据吗？', function(index) { 	
                     var param = {
                        Id:data.Id,
                     };
                     sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                           layer.msg(res.msg, {
                              icon: 1,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () {
                              refreshTable();
                              doing = true
                           });
                        } else { //不成功
                           layer.msg(res.msg, {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () { doing = true });
                        }
                     });
                  });
               }
            });