Merge branch 'csc'

chengsc

2025-05-08 8a83e6f21af0a764950e45b2565a370fff74daa5

 Pda/View/AsnSetting/requestRuku.html

@@ -209,56 +209,6 @@
            });
         }

         //申请巷道
         form.on('submit(requestRoadway)', function (data) {
            if (!$("#PalletNo").val()) {
               layer.msg('请扫描托盘条码', {
                  icon: 2,
                  time: 2000 //2秒关闭（如果不配置，默认是3秒）
               });
               return;
            }
            var param = {
               PalletNo: $("#PalletNo").val(),
               HouseNo:"W01"
            }
            sendData(IP + "/PdaAsn/RequestRoadWay", param, 'post', function (res) {
               if (res.code == 0) { //成功 
                  layer.msg(res.msg, {
                     icon: 1,
                     time: 2500 //2秒关闭（如果不配置，默认是3秒）
                  }, function () {
                     var statusVal='';
                     if(res.data.Status=="0"){
                        statusVal='等待上架';
                     }else if(res.data.Status=="1"){
                        statusVal='正在上架';
                     }else if(res.data.Status=="2"){
                        statusVal='上架完成';
                     }else if(res.data.Status=="3"){
                        statusVal='已取消';
                     }else{
                        statusVal='未上架';
                     }
                     $("#Status").val(statusVal);
                     $("#SkuNo").val(res.data.SkuNo+"-"+res.data.SkuName);
                     $("#LotNo").val(res.data.LotNo);
                     $("#RoadwayNo").val(res.data.RoadwayNo);
                     $("#LocatNo").val(res.data.LocatNo);
                  });
               } else { //不成功
                  layer.msg(res.msg, {
                     icon: 2,
                     time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  }, function () {
                     //回调
                     clearTable();
                  });
               }
            });
            return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
         });

         //申请储位
         form.on('submit(requestLocat)', function (data) {
            if (!$("#PalletNo").val()) {
@@ -273,28 +223,28 @@
               HouseNo:"W02"
            }
            sendData(IP + "/DownApi/RequestLocation", param, 'post', function (res) {
               if (res.Success == 0) { //成功 
                  layer.msg(res.msg, {
               if (res.Success == "0") { //成功 
                  layer.msg(res.Message, {
                     icon: 1,
                     time: 2500 //2秒关闭（如果不配置，默认是3秒）
                  }, function () {
                     var statusVal='';
                     if(res.data.Status=="0"){
                        statusVal='等待上架';
                     }else if(res.data.Status=="1"){
                        statusVal='正在上架';
                     }else if(res.data.Status=="2"){
                        statusVal='上架完成';
                     }else if(res.data.Status=="3"){
                        statusVal='已取消';
                     }else{
                        statusVal='未上架';
                     }
                     $("#Status").val(statusVal);
                     $("#SkuNo").val(res.data.SkuNo+"-"+res.data.SkuName);
                     $("#LotNo").val(res.data.LotNo);
                     $("#RoadwayNo").val(res.data.RoadwayNo);
                     $("#LocatNo").val(res.data.LocatNo);
                     // var statusVal='';
                     // if(res.data.Status=="0"){
                     //    statusVal='等待上架';
                     // }else if(res.data.Status=="1"){
                     //    statusVal='正在上架';
                     // }else if(res.data.Status=="2"){
                     //    statusVal='上架完成';
                     // }else if(res.data.Status=="3"){
                     //    statusVal='已取消';
                     // }else{
                     //    statusVal='未上架';
                     // }
                     // $("#Status").val(statusVal);
                     // $("#SkuNo").val(res.data.SkuNo+"-"+res.data.SkuName);
                     // $("#LotNo").val(res.data.LotNo);
                     // $("#RoadwayNo").val(res.data.RoadwayNo);
                     // $("#LocatNo").val(res.data.LocatNo);
                  });
               } else { //不成功
                  layer.msg(res.Message, {