#

cp

14 小时以前 59fbaf58a71992995c84a09ad46c2a2a60c661a0

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java

@@ -481,9 +481,9 @@
            if (!Cools.isEmpty(matParam.getAccountingClass())) {
                mat.setAccountingClass(matParam.getAccountingClass());
            }
            if (!Cools.isEmpty(matParam.getBatch())) {
                mat.setBatch(matParam.getBatch());
            }
//            if (!Cools.isEmpty(matParam.getBatch())) {
//                mat.setBatch(matParam.getBatch());
//            }
            if (!Cools.isEmpty(matParam.getInventoryAccount())) {
                mat.setInventoryAccount(matParam.getInventoryAccount());
            }

 zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml

@@ -25,6 +25,7 @@
        FROM wms_loc_detl
        INNER JOIN common_loc_mast ON wms_loc_detl.loc_no = common_loc_mast.loc_no and wms_loc_detl.host_id = common_loc_mast.host_id
        where 1=1
        order by wms_loc_detl.appe_time
        <include refid="viewStayTimeConditionSql"></include>
    </select>


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java

@@ -60,8 +60,11 @@
        if (!Cools.isEmpty(param.get("zpallet"))) {
            wrapper.like("zpallet", param.get("zpallet"));
        }
        if (!Cools.isEmpty(param.get("orderNo"))) {
            wrapper.like("order_no", param.get("orderNo"));
        if (!Cools.isEmpty(param.get("order_no"))) {
            wrapper.like("order_no", param.get("order_no"));
        }
        if (!Cools.isEmpty(param.get("wrk_no"))){
            wrapper.like("wrk_no", param.get("wrk_no"));
        }
        allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
        wrapper.orderByDesc("io_time");

 zy-asrs-wms/src/main/resources/license.lic

Binary files differ

 zy-asrs-wms/src/main/webapp/views/home/console.html

@@ -236,7 +236,7 @@
    function getCol() {
        var cols = [
            {field: 'appeTime$', title: '入库时间', align: 'center', width: 200}
            ,{field: 'stay_time', align: 'center',title: '滞留天数'}
            ,{field: 'stayTime', align: 'center',title: '滞留天数'}
            ,{field: 'loc_no', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);

 zy-asrs-wms/src/main/webapp/views/index.html

@@ -11,6 +11,7 @@
  <link rel="stylesheet" href="../static/css/admin.css?v=318" media="all">
  <link rel="stylesheet" href="../static/css/loader.css" media="all">
  <link rel="stylesheet" href="../static/css/originTable.css" media="all">
  <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css" />
  <style>
    .layui-logo img {
      width: 25px;
@@ -19,6 +20,28 @@
      font-size: 18px;
      font-weight: 400;
      /*margin-left: 5px;*/
    }

    /* 弹窗样式 */
    .popup {
      position: fixed;
      top: 0;
      left: 0;
      width: 100%;
      height: 100%;
      background-color: rgba(0,0,0,0.5);
      display: none;
      justify-content: center;
      align-items: center;
      z-index: 9999;
    }

    .popup-content {
      background-color: #fff;
      padding: 20px;
      border-radius: 5px;
      box-shadow: 0px 0px 20px rgba(0,0,0,0.3);
      text-align: center;
    }
  </style>
</head>
@@ -93,8 +116,18 @@
  <div class="layuimini-loader-inner"></div>
</div>

<!-- 弹窗内容 -->
<div class="popup" id="popup">
  <div class="popup-content">
    <h2 style="font-size: 28px;margin-bottom: 10px;">许可证即将过期</h2>
    <div id="popup-text" style="font-size: 28px;color: red"></div>
    <button style="background-color: #007bff;color: #fff;border: none;padding: 10px 20px;border-radius: 5px;cursor: pointer;font-size: 16px;" onclick="hidePopup()">关闭</button>
  </div>
</div>

<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/layui/layui.js"></script>
<script type="text/javascript" src="../static/js/tools/layx.min.js"></script>
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
@@ -104,6 +137,31 @@
      top.location.href = baseUrl + "/login";
    }
  });

  // 显示弹窗
  function showPopup(res) {
    console.log(res)
    document.getElementById('popup').style.display = 'block';
    // 获取弹出窗口内容的容器元素
    var popupText = document.getElementById('popup-text');
    // 假设后台返回的字符串为 responseString
    if (res!==""){
      // 获取当前日期
      const currentDate = new Date();
      // 创建新日期对象并添加天数
      const newDate = new Date();
      newDate.setDate(currentDate.getDate() + res + 1);
      // 将字符串设置为弹窗内容的文本
      popupText.textContent = "许可证将于" + new Intl.DateTimeFormat('zh-CN').format(newDate) + "过期，剩余有效期:" + res + "天！";
    }else {
      document.getElementById('popup').style.display = 'none';
    }
  }

  // 隐藏弹窗
  function hidePopup() {
    document.getElementById('popup').style.display = 'none';
  }

  layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
@@ -169,22 +227,26 @@
      }
    });

    // $.ajax({
    //   url: baseUrl + "/license/getLicenseDays",
    //   headers: {'token': localStorage.getItem('token')},
    //   method: 'POST',
    //   success: function (res) {
    //     if (res.code == 200) {
    //       let days = res.data
    //       if (days <= 30) {
    //         $("#licenseShow").show()
    //         $("#licenseDays").html(days)
    //       }
    //     }else {
    //       top.location.href = baseUrl + "/login";
    //     }
    //   }
    // });
    $.ajax({
      url: baseUrl + "/license/getLicenseDays",
      headers: {'token': localStorage.getItem('token')},
      method: 'POST',
      success: function (res) {
        if (res.code == 200) {
          let days = res.data
          if (days <= 30) {
            $("#licenseShow").show()
            $("#licenseDays").html(days)
          }

          if (days <= 15) {
            showPopup(days)
          }
        }else {
          top.location.href = baseUrl + "/login";
        }
      }
    });

    // 默认加载主页
    index.loadHome({

 zy-asrs-wms/src/main/webapp/views/order/order.html

@@ -112,7 +112,7 @@
    {{# } }}
    {{# } }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="dy">打印</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs " lay-event="dy">打印</a>
</script>
<!-- 表格操作列 -->
<script type="text/html" id="tbLook">