#

lsh

2024-01-12 5d2a9f7225b046f0646f97d4ca3bd191650e6bbd

#

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

@@ -302,7 +302,7 @@
     * 测试3
     */
    @PostMapping("/cs3/auth/v1")
    @AppAuth(memo = "")
//    @AppAuth(memo = "")
    public synchronized R cs3(@RequestHeader(required = false) String appkey,
                                                @RequestBody PalletizingCompleteParam param,
                                                HttpServletRequest request) {

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

@@ -108,7 +108,7 @@
    /**
     * 工作类型
     */
    @ApiModelProperty(value = "工作类型  1:取（叠盘）  2：放 3：取放 4：拆盘")
    @ApiModelProperty(value = "工作类型  1:取（叠盘）  2：拆盘  3：取放 5：满取  6：满放")
    @TableField("wrk_type")
    private Integer wrkType;

@@ -135,6 +135,18 @@
        this.bignTime = now;
    }

    public WrkMastSta(Date now, Integer staStart) {
        this.wrkNo = staStart.longValue()+9999;
        this.wrkStart = staStart;
        this.wrkEnd = staStart;
        this.staStart = staStart;
        this.staEnd = staStart;
        this.createTime = now;
        this.updateTime = now;
        this.wrkSts = 0;
        this.bignTime = now;
    }

    public WrkMastSta(Long wrkNo, Integer wrkStart, Integer wrkEnd, Integer staStart, Integer staEnd, Date createTime, Date updateTime, Integer type, Integer wrkSts, Integer lineNumber, Integer wrkType, Date bignTime) {
        this.wrkNo = wrkNo;
        this.wrkStart = wrkStart;

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

@@ -65,6 +65,10 @@
    private LocDetlRullUpDetailService locDetlRullUpDetailService;
    @Autowired
    private WrkDetlSingleService wrkDetlSingleService;
    @Autowired
    private WrkMastStaService wrkMastStaService;
    @Autowired
    private WrkMastStaLogService wrkMastStaLogService;

    @Override
    @Transactional
@@ -970,7 +974,15 @@
    @Override
    @Transactional
    public void cs3() {

        //拆盘
        WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),118);
        wrkMastSta1.setType(2);
        wrkMastSta1.setWrkType(2);
        wrkMastStaService.insert(wrkMastSta1);
        WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),122);
        wrkMastSta2.setType(2);
        wrkMastSta2.setWrkType(2);
        wrkMastStaService.insert(wrkMastSta2);
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/

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

@@ -90,7 +90,7 @@

                if (!Cools.isEmpty(wrkMast)){
                    if (wrkTypeSign){
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
                        if (result.getCode()==200) {
                            continue;
                        } else {

 src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java

@@ -69,6 +69,7 @@
                    for (WrkDetl wrkDetl:wrkDetls){
                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
                        wrkDetlSingle.sync(wrkDetl);
                        wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
                        wrkDetlSingleService.insert(wrkDetlSingle);
                    }
                    wrkMast.setSheetNo("1");

 src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java

@@ -40,7 +40,7 @@
                case 13://出  3：取放
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fullKM(wrkMast)? 1:2);      //类型 1:非空  2:空板
                        wrkMastSta1.setType(1);      //类型 1:非空  2:空板
                        wrkMastSta1.setWrkType(3);                      //工作类型  1:取（叠盘）  2：拆盘  3：取放 5：满取  6：满放
                        wrkMastStaService.insert(wrkMastSta1);
                    }