#

gtctu

2 天以前 d029518fd1ce9170fcf276b28d76d8d7b4f3a948

#

 license.lic

Binary files differ

 pom.xml

@@ -124,7 +124,7 @@
    </dependencies>

    <build>
        <finalName>gtSxkWms</finalName>
        <finalName>gtCtuWms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -1185,6 +1185,8 @@
        // 出库
        } else if (wrkMast.getIoType() >100  && wrkMast.getWrkSts() > 10) {
            wrkMast.setWrkSts(14L);
        }else if (wrkMast.getIoType() == 200) {
            wrkMast.setWrkSts(5L);
        }
        Date now = new Date();
        wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -109,7 +109,7 @@
//
//    }

    @Scheduled(cron = "0/3 * * * * ? ") //出库库任务下发
//    @Scheduled(cron = "0/3 * * * * ? ") //出库库任务下发
    private void ShuttleOutTaskSend(){
        List<WrkMast> wrkMastsMove = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
        if (!wrkMastsMove.isEmpty()) {
@@ -158,7 +158,7 @@

    }

    @Scheduled(cron = "0/3 * * * * ? ") //移库任务下发
//    @Scheduled(cron = "0/3 * * * * ? ") //移库任务下发
    private void ShuttleMoveTaskSend(){
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no",7).eq("wrk_sts", 11).eq("io_type",11));
        if (wrkMasts.isEmpty()) {

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/gtSxkWms";
var baseUrl = "/gtCtuWms";

// 详情窗口-高度
var detailHeight = '80%';

 src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js

@@ -194,7 +194,7 @@
    function pakoutPreview(ids) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl + "/out/pakout/preview/auth/sxk",
            url: baseUrl + "/out/pakout/preview/auth/ctu",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(ids),
@@ -349,7 +349,7 @@
        // let loadIndex = layer.load(2);
        notice.msg('正在生成出库任务......', {icon: 4});
        $.ajax({
            url: baseUrl + "/out/pakout/auth/sxk",
            url: baseUrl + "/out/pakout/auth",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(tableCache),

 src/main/webapp/static/js/mergeStore/mergeStore.js

@@ -52,7 +52,7 @@
                        locDetls: locDetlData
                    }
                    $.ajax({
                        url: baseUrl+"/locMerge/out/start/sxk",
                        url: baseUrl+"/locMerge/out/start",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        contentType:'application/json;charset=UTF-8',

 src/main/webapp/static/js/order/out.js

@@ -164,7 +164,7 @@
    function pakoutPreview(ids,amount) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl + "/out/pakout/preview/auth/sxk",
            url: baseUrl + "/out/pakout/preview/auth/ctu",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(ids),
@@ -324,7 +324,7 @@
        json.ids = ids
        json.amount = amount
        $.ajax({
            url: baseUrl + "/out/pakout/previewCustomQuantity/auth/sxk",
            url: baseUrl + "/out/pakout/previewCustomQuantity/auth/ctu",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(json),
@@ -479,7 +479,7 @@
        // let loadIndex = layer.load(2);
        notice.msg('正在生成出库任务......', {icon: 4});
        $.ajax({
            url: baseUrl + "/out/pakout/auth/sxk",
            url: baseUrl + "/out/pakout/auth",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(tableCache),