Merge branch 'master' into wxw

wxw

2024-08-17 0464969366317154fdbb51e106ca778b855bdd08

 HTML/views/ASNSetting/PalletUpShelf.html

@@ -67,12 +67,12 @@
                        class="layui-input">
                  </div>
               </div>
                    <div class="layui-inline" style="margin-right: 0;">
               <div class="layui-inline" style="margin-right: 0;">
                  <label class="layui-form-label" style="width: 60px;">托盘号</label>
                  <div class="layui-input-inline" style="margin-right: 0;">
                     <div class="layui-input-inline" style="margin-right: 0;">
                        <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘号"
                           autocomplete="off" class="layui-input">
                        <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘号" autocomplete="off"
                           class="layui-input">
                     </div>
                  </div>
               </div>
@@ -83,7 +83,7 @@
                        class="layui-input">
                  </div>
               </div>
                    <div class="layui-inline" style="margin-right: 0;">
               <div class="layui-inline" style="margin-right: 0;">
                  <label class="layui-form-label" style="width: 60px;">物品名称</label>
                  <div class="layui-input-inline" style="margin-right: 0;">
                     <input type="text" id="SkuName" name="SkuName" placeholder="物料名称" autocomplete="off"
@@ -99,7 +99,7 @@
                     </div>
                  </div>
               </div>
					


               <div class="layui-inline" style="margin-right: 0;">
                  <label class="layui-form-label">状态</label>
@@ -122,35 +122,12 @@
                     lay-filter="LAY-app-contlist-search">
                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                  </button>
                  <!-- <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-normal buDaLabelClass" style="margin-left: 5px;" lay-event="BuDaLabel" id="BuDaLabel">
                     <i class="layui-icon layui-icon-print layuiadmin-button-btn"></i>补打标签
                  </button>
                  <button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-btn-danger delLabelClass" style="margin-left: 5px;" lay-event="delLabel" id="delLabel">
                     <i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除标签
                  </button> -->

               </div>
               <!-- 确认出库口弹窗 -->
               <!-- <div class="layui-inline" id="divDelLotNo" style="display: none; padding-top: 10px;">
                  <div class="layui-inline">
                     <label class="layui-form-label">入库单据</label>
                     <div class="layui-input-inline" style="width: 220px;">
                        <input type="text" id="AsnNoSelect" name="AsnNoSelect" placeholder="入库单据" autocomplete="off" class="layui-input">
								 
                     </div>
                  </div>
                  <div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
                     <label class="layui-form-label">批次号</label>
                     <div class="layui-input-inline" style="width: 220px;">
                        <select name="LotNoSelect" id="LotNoSelect" lay-search>
                           <option value=""></option> 
                        </select>
                     </div>
                  </div>							
						 
               </div> -->

            </div>
         </div>
         <div class="layui-card-body"> 
         <div class="layui-card-body">
            <div class="position-relative">
               <table id="Box-list" lay-filter="Box-list"></table>

@@ -160,7 +137,7 @@
                  </button>
               </div>

					


               <script type="text/html" id="templetStatus">
                  {{# function GetBtn1(d){
@@ -175,7 +152,7 @@
                  }}
                  {{ GetBtn1(d) }}
               </script>
					

               <script type="text/html" id="templetCreateTime">
                  {{# function GetBtn2(d){
                        return formatDate(d.CreateTime);
@@ -183,7 +160,7 @@
                  }}
                  {{ GetBtn2(d) }}
               </script>
                    <script type="text/html" id="templetUpdateTime">
               <script type="text/html" id="templetUpdateTime">
                  {{# function GetBtn3(d){
                        return formatDate(d.UpdateTime);
                     }   
@@ -217,9 +194,6 @@
   <script src="../../js/jquery-3.5.1.min.js"></script>
   <script src="../../js/jquery.cookie.js"></script>
   <script>
      // layui.extend({
      //    excel: '../../layuiadmin/layui/layui_exts/excel' // {/}的意思即代表采用自有路径，即不跟随 base 路径
      // })

      layui.config({
         base: '../../layuiadmin/' //静态资源所在路径
@@ -230,7 +204,7 @@
            table = layui.table,
            layer = layui.layer,
            laydate = layui.laydate;
			

         // 搜索方法
         form.on('submit(LAY-app-contlist-search)', function (data) {
            bindTable();
@@ -240,116 +214,24 @@
         // 页面加载绑定Table
         bindTable();

         //生成
         $('#BuDaLabel').on('click', function () {
                layer.open({
               type: 2,
               title: '打印',
               content: 'LabelBoxBuDa.html',
               maxmin: true,
               area: ['430px', '390px'],
               // btn: ['取消']
            });
            });
         $("#AsnNoSelect").on('input', function () {

            if ($("#AsnNoSelect").val() == "" || $("#AsnNoSelect").val().length < 16) {
               return
            }
            if ($("#AsnNoSelect").val().length >= 16) {
               $("#AsnNoSelect").val($("#AsnNoSelect").val().substr(-16))
            }
            GetLotNoByAsnNo()
         })
         function GetLotNoByAsnNo() {

            $("#LotNoSelect").empty()
                $("#LotNoSelect").append('<option value =>' + '</option>');
            form.render('select');
            var param = {
               asnNo: $("#AsnNoSelect").val(),
            };
            sendData(IP + "/BllAsn/GetLotNoListByAsn", param, 'get', function(res) {
               if (res.code == 0) { //成功
                  for (var i = 0; i < res.data.length; i++) {
                     $("#LotNoSelect").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
                  } 
                  form.render('select');
               } else { //不成功
                  layer.msg(res.msg, {
                     icon: 2,
                     time: 3000 //2秒关闭（如果不配置，默认是3秒）
                  }, function() {
							 
                  });
               } 
            });
         }

            //删除标签
         $('#delLabel').on('click', function () {

            layer.open({
               type: 1,
               title: '删除标签',
               content: $('#divDelLotNo'),
               maxmin: false,
               area: ['350px','340px'],
               btn: ['确定', '取消'],
               yes: function(index, layero) { 
                  var param = {
                     AsnNo: $('#AsnNoSelect').val(),
                     LotNo: $('#LotNoSelect').val(),
                  };
                  sendData(IP + "/BllAsn/DelLabelByAsnNo", param, 'post', function(res) {
                     if (res.code == 0) { //成功
                        bindTable();
                        layer.msg(res.msg, {
                           icon: 1,
                           time: 1500 //1秒关闭（如果不配置，默认是3秒）
                        }, function() {
                           $('#AsnNoSelect').val("");
                           $("#LotNoSelect").empty()
                           $("#LotNoSelect").append('<option value =>' + '</option>');
                           form.render('select');
                        });
                     } else { //不成功
                        layer.msg(res.msg, {
                           icon: 2,
                           time: 3000 //2秒关闭（如果不配置，默认是3秒）
                        }, function() {
                           bindTable();
                           $('#AsnNoSelect').val("");
                           $("#LotNoSelect").empty()
                           $("#LotNoSelect").append('<option value =>' + '</option>');
                           form.render('select');
                        });
                     }
                     layer.close(index);
                  });
               }
            });
            });

			
         //自定义表头
         var TotalColsArr = [[

            { field: 'TraceNo', title: '追溯号', align: 'center',fixed: 'left', width: 180, "disabled": true },
            { field: 'TraceNo', title: '追溯号', align: 'center', fixed: 'left', width: 180, "disabled": true },
            { field: 'TaskNo', title: '任务号', align: 'center', fixed: 'left', width: 220, "disabled": true },
            { field: 'PalletNo', title: '托盘号', align: 'center', fixed: 'left', width: 220, "disabled": true  },
            { field: 'PalletNo', title: '托盘号', align: 'center', fixed: 'left', width: 220, "disabled": true },
            { field: 'Status', title: '状态', align: 'center', templet: '#templetStatus', width: 90 },
            { field: 'SkuNo', title: '物料编码', align: 'center',  width: 140},
            { field: 'SkuName', title: '物料名称', align: 'center'},
            { field: 'LotNo', title: '批次号', align: 'center', width: 155},
            { field: 'SkuNo', title: '物料编码', align: 'center', width: 140 },
            { field: 'SkuName', title: '物料名称', align: 'center' },
            { field: 'LotNo', title: '批次号', align: 'center', width: 155 },

            { field: 'LocatName', title: '储位地址', align: 'center', width: 90 },
            { field: 'LocatNo', title: '储位地址', align: 'center', width: 90 },
            { field: 'RoadwayName', title: '所属巷道', align: 'center', width: 90 },
            { field: 'WareHouseName', title: '所属仓库', align: 'center', width: 90 },

            { field: 'CreateUserName', title: '创建人', align: 'center', width: 100 },
            { field: 'CreateTime', title: '创建时间', align: 'center', width: 160, templet: '#templetCreateTime' },
                

            { field: 'UpdateUserName', title: '更新人', align: 'center', width: 100 },
            { field: 'UpdateTime', title: '更新时间', align: 'center', width: 160, templet: '#templetUpdateTime' },
            //{ field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
@@ -374,12 +256,12 @@
                  colsJson = TotalColsArr
               }
               var param = {
                  TraceNo:$("#ASNNo").val(),
                  TraceNo: $("#ASNNo").val(),
                  TaskNo: $("#BoxNo").val(),
                  PalletNo: $("#PalletNo").val(), 
                  PalletNo: $("#PalletNo").val(),
                  SkuNo: $("#SkuNo").val(),
                  SkuName: $("#SkuName").val(),
                  LotNo: $("#LotNo").val(), 
                  LotNo: $("#LotNo").val(),
                  Status: $("#Status").val(),
               };
               table.render({
@@ -389,7 +271,7 @@
                  height: 'full-96',
                  id: 'Box-list',
                  where: param,
                  contentType: 'application/json', 
                  contentType: 'application/json',
                  headers: { ToKen: $.cookie('token') },
                  page: true,
                  even: true,
@@ -397,7 +279,7 @@
                  limits: pageLimits,
                  cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                  done: function (res) {
							

                     //自定义列宽
                     SetTableColW('Box-list', 'BllAsn/GetPalletUpShelfList', TotalColsSysArr);
                  },