#

luxiaotao1123

2021-05-27 87b9fcdce2b5459b54498d9b21c66031d06c5e5e

#

 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -550,7 +550,7 @@

                    // 头
                    getOrderResult0.setNumber(order.getOrderNo());
                    getOrderResult0.setVchType(11); // todo:luxiaotao
                    getOrderResult0.setVchType(11);
                    getOrderResult0.setBillDate(order.getOrderTime());
                    getOrderResult0.setBTypeID(order.getTel());
                    getOrderResult0.setKTypeID("宏挺仓库");
@@ -628,7 +628,7 @@

                    // 头
                    getOrderResult0.setNumber(order.getOrderNo());
                    getOrderResult0.setVchType(6); // todo:luxiaotao
                    getOrderResult0.setVchType(6);
                    getOrderResult0.setBillDate(order.getOrderTime());
                    getOrderResult0.setBTypeID(order.getTel());
                    getOrderResult0.setKTypeID("宏挺仓库");

 src/main/java/zy/cloud/wms/common/service/erp/ErpService.java

@@ -34,9 +34,6 @@
     * 单据上报
     */
    public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
        if (true) {
//            return true;
        }
        try {
            if (Cools.isEmpty(dtos)) {
                return false;

 src/main/java/zy/cloud/wms/common/web/BaseController.java

@@ -91,7 +91,7 @@
        map.put("pageNumber", pageNumber);
        map.put("pageSize", pageSize);

        // 全字段模糊搜索 todo
        // 全字段模糊搜索
        if (!Cools.isEmpty(map.get("condition"))) {
            Set<String> columns = new HashSet<>();
            for (Field field : Cools.getAllFields(cls)){

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -816,9 +816,11 @@
        String docNum = null;
        Long docId = null;
        switch (check.getSettle()) {
            case 1:    // 盘盈
                docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                docId = 14L; // 报溢单
            case 1:    // 盘盈 todo 前期用采购单上报
//                docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
//                docId = 14L; // 报溢单
                docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                docId = 34L; // 采购单
                break;
            case 2:    // 盘亏
                docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);

 src/main/webapp/views/index.html

@@ -26,7 +26,6 @@
      font-weight: bold
    }

    /*todo:luxiaotao*/
    .layui-layout-admin .layui-logo {
      letter-spacing: 2px;
      font-size: 22px;

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

@@ -25,7 +25,7 @@

        /* 导航 */
        .nav {
            background-color: #fff; /*todo*/
            background-color: #fff;
            color: #000;
            list-style-type: none;
            position: fixed;
@@ -35,7 +35,7 @@
        }
        .nav li {
            float: left;
            border-right: 1px solid #f1f1f1; /*todo*/
            border-right: 1px solid #f1f1f1;
        }
        .nav li a {
            font-size: 20px;
@@ -55,7 +55,7 @@
            color: #666;
        }
        .nav-select {
            background-color: #f1f1f1;  /*todo*/
            background-color: #f1f1f1;
            color: #000;
        }