Merge remote-tracking branch 'origin/master'

luxiaotao1123

2021-03-02 e4db9c4fc4e40d7b41ee0014aaa9feb8ba9e9bf0

Merge remote-tracking branch 'origin/master'

 src/main/java/com/zy/asrs/controller/WaitPakinController.java

@@ -45,6 +45,7 @@
        else {
            wrapper.orderBy("modi_time", false);
        }
        wrapper.isNotNull("zpallet");
        return R.ok(waitPakinService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -80,6 +80,7 @@
        matCode.setMatNo(item.getMnumber()); // 物料编号
        matCode.setMatName(item.getMname()); // 物料描述
        matCode.setStr2(item.getMmodel()); // 物料类别
        matCode.setStr2(item.getMtypename());
    }

    // excel ----------------------------------------------------------------------

 src/main/java/com/zy/common/service/erp/entity/M_item.java

@@ -20,4 +20,6 @@
    // 类别
    private String Mmodel;

    private String Mtypename;

}

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -109,7 +109,7 @@
    /**
     * 成品
     */
//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
//    @PostConstruct
    public void inCPICMOExecute(){
//        List<M_item> item = erpService.getItem();
@@ -156,7 +156,7 @@
        }
    }

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    public void syncMat(){
        List<M_item> items = erpService.getItem();
        for (M_item item : items) {
@@ -166,17 +166,28 @@
                VersionUtils.setMatCode(matCode, item);
                matCode.setAppeTime(new Date());
                matCode.setModiTime(new Date());
                matCodeService.insert(matCode);
                boolean insert = matCodeService.insert(matCode);
                if (insert) {
                    log.info("=====>> 新增物料成功 ： {}", JSON.toJSONString(item));
                } else {
                    log.error("=====>> 新增物料失败！！！ ： {}", JSON.toJSONString(item));
                }
            } else {
                VersionUtils.setMatCode(matCode, item);
                matCode.setModiTime(new Date());
                matCodeService.updateById(matCode);
                boolean b = matCodeService.updateById(matCode);
                if (b) {
                    log.info("=====>> 更新物料成功 ： {}", JSON.toJSONString(item));
                } else {
                    log.error("=====>> 更新物料失败！！！ ： {}", JSON.toJSONString(item));
                }
            }
            // 更新完之后删除
            erpService.deleteItem(item.getMnumber());
        }
    }


    /**
     * 原材料出库
     */

 src/main/webapp/views/index.html

@@ -109,7 +109,7 @@
        <div class="layui-side-scroll">
          <div class="layui-logo" lay-href="home/console.html">
            <img src="../static/image/logo.png" style="display: inline-block; width: 90%;height: auto">
            <span style="margin-top: 0">中扬物流装备</span>
            <span style="margin-top: 0">中扬立库</span>
          </div>

          <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
@@ -147,7 +147,7 @@
      </div>

      <div class="layui-footer">
        Copyright © 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">浙江中扬物流装备有限公司</a>  保留所有权利
        Copyright © 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">浙江中扬立库技术有限公司</a>  保留所有权利
      </div>
      <!-- 辅助元素，一般用于移动设备下遮罩 -->
      <div class="layadmin-body-shade" layadmin-event="shade"></div>

 src/main/webapp/views/login3.html

@@ -245,7 +245,7 @@
                </script>
                <div class="content__inner">
                    <h2 class="content__title">ASRS WMS</h2>
                    <h2 class="content__subtitle">中扬物流</h2>
                    <h2 class="content__subtitle">中扬立库</h2>
                </div>

            </div>

 src/main/webapp/views/pda/combPro.html

@@ -180,11 +180,12 @@
        if (isEmpty(el.value)) {
            return;
        }
        var billNo = el.value.split(",")[0].split("=")[1];
        $.ajax({
            url: baseUrl + "/mobile/bill/query/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                billNo: el.value
                billNo: billNo
            },
            method: 'POST',
            success: function (res) {