#
luxiaotao1123
2021-04-13 15670bf4839412f88a669e20e8a70553172a9332
#
3个文件已修改
12 ■■■■■ 已修改文件
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/orderSettle/orderSettle.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -15,7 +15,7 @@
    <properties>
        <java.version>1.8</java.version>
        <cool.version>2.0.0</cool.version>
        <cool.version>2.1.0</cool.version>
        <mysql-driver.version>5.1.47</mysql-driver.version>
        <mybatis-plus.version>2.3.2</mybatis-plus.version>
        <fastjson.version>1.2.58</fastjson.version>
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -9,8 +9,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.service.erp.entity.*;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.mapper.CustOrderMapper;
@@ -28,8 +30,8 @@
 * Created by vincent on 2020/11/27
 */
@Slf4j
//@Component
//@RestController
@Component
@RestController
public class ErpScheduler {
    public static final String URI = "http://8.133.182.21:8080/api";
@@ -401,7 +403,7 @@
                        log.warn(response);
                        Result result = JSON.parseObject(response, Result.class);
                        if (result.getCode() != 1) {
                            return;
                            continue;
                        }
                        // 转历史档
                        int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
src/main/webapp/static/js/orderSettle/orderSettle.js
@@ -119,7 +119,7 @@
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });