#

zjj

2024-09-26 398820c97c21f8e9ad509101f9952281da204dd1

#

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

@@ -1,11 +1,14 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -32,6 +35,39 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private WrkMastService wrkMastService;


    @PostMapping("/wrkMast/finish/v1")
    @AppAuth(memo = "四向车任务完成")
    public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) ShuttleFinishParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        try {
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()).eq("crn_no",7));
            if (Cools.isEmpty(wrkMast)) {
                throw new CoolException("四向库任务未找到");
            }
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
                wrkMast.setWrkSts(4L);
            }else {
                wrkMast.setWrkSts(14L);
            }
            if (!wrkMastService.updateById(wrkMast)){
                return R.error();
            }
        }catch (Exception e) {
            throw new CoolException(e);
        }


        return R.ok();
    }




 src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.entity.param;

import lombok.Data;

@Data
public class ShuttleFinishParam {
    private String taskNo;
}

 src/main/java/com/zy/asrs/entity/param/ShuttleOutTask.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.entity.param;

import lombok.Data;

@Data
public class ShuttleOutTask {
    private String taskNo;
    private String originLoc;
    private String originSite;
    private String destSite;
    private String priority;
}

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -28,4 +28,6 @@
    int saveWrkMastLog(Integer workNo);

    List<WrkMast> selectToShuttleTask();

    List<WrkMast> selectToShuttleOutTask();
}

 src/main/java/com/zy/asrs/service/WrkMastService.java

@@ -29,4 +29,5 @@
    int saveWrkMastLog(Integer wrkNo);

    List<WrkMast> selectToShuttleTask();
    List<WrkMast> selectToShuttleOutTask();
}

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

@@ -66,5 +66,8 @@
        return this.baseMapper.selectToShuttleTask();
    }

    ;
    @Override
    public List<WrkMast> selectToShuttleOutTask() {
        return this.baseMapper.selectToShuttleOutTask();
    }
}

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

@@ -3,9 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.ShuttleOutTask;
import com.zy.asrs.entity.param.ShuttleTask;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.LocMastServiceImpl;
@@ -60,8 +62,14 @@
        }
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    private void ShuttleTaskSend(){
    @Scheduled(cron = "0/3 * * * * ? ") //入库任务下发
    private void ShuttleInTaskSend(){
        List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .in("io_type", 101,110,103,104,107)
                .eq("wrk_sts", 105).eq("crn_no",7));
        if (!Cools.isEmpty(wrkMasts1)){
            return;
        }
        List<WrkMast> wrkMasts = wrkMastService.selectToShuttleTask();
        if (wrkMasts.isEmpty()) {
            return;
@@ -100,4 +108,51 @@

    }

    @Scheduled(cron = "0/3 * * * * ? ") //出库库任务下发
    private void ShuttleOutTaskSend(){
        List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .in("io_type", 1,10,53,54,57).eq("crn_no",7));
        if (!Cools.isEmpty(wrkMasts1)){
            return;
        }
        List<WrkMast> wrkMasts = wrkMastService.selectToShuttleOutTask();
        if (wrkMasts.isEmpty()) {
            return;
        }
        try {
            for (WrkMast wrkMast : wrkMasts) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
                if (locMast == null) {
                    throw new CoolException("下发四向车wcs任务失败");
                }
                String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
                ShuttleOutTask param = new ShuttleOutTask();
                param.setTaskNo(wrkMast.getWrkNo().toString());
                param.setOriginLoc(loc);
                param.setOriginSite("31004");
                param.setDestSite("31002");
                param.setPriority("11");
                String response = new HttpHandler.Builder()
                        .setUri(shuttleWcsUrl)
                        .setPath("/openapi/createOutTask")
                        .setJson(JSON.toJSONString(param))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                Integer code = jsonObject.getInteger("code");
                if (code.equals(200)) {
                    wrkMast.setWrkSts(105L);
                    if (!wrkMastService.updateById(wrkMast)) {
                        log.error("工作档[workNo={}]标记待处理失败", wrkMast.getWrkNo());
                    }
                }
            }
        }catch (Exception e){
            throw new CoolException("下发四向车wcs任务失败");
        }

    }



}

 src/main/java/com/zy/common/service/CommonService.java

@@ -890,6 +890,9 @@
        BasDevp staNo = null;

        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {

            LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", curRow).eq("bay1", 2).eq("lev1", 1));
            crnNo = locMast1.getCrnNo();
            // 获取目标站
            wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", staDescId)

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 58080
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@


 src/main/resources/mapper/WrkMastMapper.xml

@@ -105,5 +105,11 @@
           and crn_no = 7
        order by io_time,wrk_no asc
    </select>
    <select id="selectToShuttleOutTask" resultMap="BaseResultMap">
        select * from asr_wrk_mast
        where wrk_sts=11
          and crn_no = 7
        order by io_time,wrk_no asc
    </select>

</mapper>