#

hmpc

2025-03-02 9e086905993eab6b45fb95a3faba14402404bd94

#

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

@@ -13,6 +13,7 @@

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;

/**
 * Created by vincent on 2024/10/16
@@ -57,6 +58,35 @@
    }

    /**
     * 添加出库单
     */
    @PostMapping("/task/cs/down/default/v2")
    @AppAuth(memo = "WCS任务下发")
    public synchronized R wcsTaskDistribution2(@RequestHeader(required = false) String appkey,
                                              @RequestBody List<WcsTaskDistributionParam> param1,
                                              HttpServletRequest request) {
        auth(appkey, param1, request);
        for (WcsTaskDistributionParam param:param1){
            if (Cools.isEmpty(param)) {
                return R.parse(BaseRes.PARAM);
            }
            if (Cools.isEmpty(param.getTaskNo())) {
                return R.error("工作号[taskNo]不能为空");
            }
            if (Cools.isEmpty(param.getStartSta()) || param.getStartSta$()==0) {
                return R.error("起点[startSta]不能为空");
            }
            if (Cools.isEmpty(param.getEndSta())  || param.getEndSta$()==0) {
                return R.error("终点[endSta]不能为空");
            }
//        openService.wcsTaskDistribution(param);

             openService.wcsTaskDistribution(param);
        }
        return R.ok();
    }

    /**
     * 数据同步
     */
    @PostMapping("/status/cs/default/v1")

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -498,32 +498,6 @@

    public Integer getStaNoCs(){
        switch (staNo){
            case 101:
                return 119;
            case 103:
                return 123;
            case 105:
                return 127;
            case 107:
                return 131;
            case 109:
                return 132;
            case 119:
                return 101;
            case 123:
                return 103;
            case 127:
                return 105;
            case 131:
                return 107;
            case 132:
                return 109;
        }
        return 0;
    }

    public Integer getSourceNoCs(){
        switch (sourceStaNo){
            case 120:
                return 102;
            case 124:
@@ -548,4 +522,30 @@
        return 0;
    }

    public Integer getSourceNoCs(){
        switch (sourceStaNo){
            case 101:
                return 119;
            case 103:
                return 123;
            case 105:
                return 127;
            case 107:
                return 131;
            case 109:
                return 132;
            case 119:
                return 101;
            case 123:
                return 103;
            case 127:
                return 105;
            case 131:
                return 107;
            case 132:
                return 109;
        }
        return 0;
    }

}

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

@@ -402,14 +402,14 @@
                                }
                            } else {
                                //测试用
                                wrkMast.setWrkSts(5L);
                                wrkMast.setWrkSts(4L);
                                wrkMast.setAppeTime(now);
                                wrkMastService.updateById(wrkMast);
                                WrkMast wrkMast1 = new WrkMast();
                                int workNo = commonService.getWorkNo(0);
                                wrkMast1.setWrkNo((long) workNo);
                                wrkMast1.setSourceStaNo(wrkMast.getStaNoCs());
                                wrkMast1.setStaNo(wrkMast.getSourceNoCs());
                                wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs());
                                wrkMast1.setStaNo(wrkMast.getStaNoCs());
                                wrkMast1.setWrkSts(1L);
                                wrkMast1.setIoType(1);
                                wrkMast1.setModiTime(now);