#

1

2025-05-14 e72f4bde2d285e0f7fdcd4d21c97233998e1ff77

#

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

@@ -349,7 +349,7 @@

        Date now = new Date();
        locMast.setModiTime(now);
        taskWrk.setStatus(7);//手动完成任务
        taskWrk.setStatus(TaskStatusType.OVER2.id);//手动完成任务
        taskWrk.setModiTime(now);
        taskWrk.setCompleteTime(now);
//        try{

 src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java

@@ -6,7 +6,9 @@
    DISTRIBUTE(2,"派发"),
    COMPLETE(3,"命令完成"),
    CANCEL(4,"取消"),
    OVER(5,"完结")
    OVER(5,"完结"),
    OVER2(7,"手动完结"),
    OVER3(9,"出库到输送线")
    ;

    public Integer id;

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

@@ -248,11 +248,15 @@
            case 2:
                return "派发";
            case 3:
                return "步序完成";
                return "命令完成";
            case 4:
                return "取消";
            case 5:
                return "完结";
            case 7:
                return "手动完结";
            case 9:
                return "出库到输送线";
            default:
                return String.valueOf(this.status);
        }

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

@@ -31,6 +31,7 @@
import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -621,7 +622,7 @@
                            if (offer) {
                                log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                Date now = new Date();
                                taskWrk.setStatus(9);
                                taskWrk.setStatus(TaskStatusType.OVER3.id);
                                taskWrk.setWrkSts(14);
                                taskWrk.setModiTime(now);
                                taskWrk.setCompleteTime(now);
@@ -924,7 +925,7 @@
                                // 修改工作档状态 11.生成出库ID => 12.吊车出库中
                                Date now = new Date();
                                taskWrk.setWrkSts(12);
                                taskWrk.setStatus(2);
                                taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);
                                taskWrk.setModiTime(now);
                                taskWrk.setExecuteTime(now);
                                if (taskWrkMapper.updateById(taskWrk) == 0) {
@@ -1035,7 +1036,7 @@
                    // 修改工作档状态 11.生成出库ID => 12.吊车出库中
                    Date now = new Date();
                    taskWrk.setWrkSts(12);
                    taskWrk.setStatus(2);
                    taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);
                    taskWrk.setModiTime(now);
                    taskWrk.setExecuteTime(now);
                    if (taskWrkMapper.updateById(taskWrk) == 0) {
@@ -1119,7 +1120,7 @@
                if (!Cools.isEmpty(taskWrk)) {
                    if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
                        taskWrk.setWrkSts(4);//入库完成
                        taskWrk.setStatus(5);//完结
                        taskWrk.setStatus(TaskStatusType.OVER.id);//完结
                        //更新库位状态
                        LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                        locMast.setLocSts("F");//F.在库
@@ -1129,7 +1130,7 @@
                        locMastService.updateById(locMast);
                    } else if (taskWrk.getIoType() == 2 && taskWrk.getWrkSts() == 12) {
                        taskWrk.setWrkSts(13);//出库完成
                        taskWrk.setStatus(5);//完结
                        taskWrk.setStatus(TaskStatusType.OVER.id);//完结
                        //更新库位状态
                        LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
                        locMast.setLocSts("O");//O.空库位
@@ -1139,7 +1140,7 @@
                        locMastService.updateById(locMast);
                    } else if (taskWrk.getIoType() == 3 && taskWrk.getWrkSts() == 12) {
                        taskWrk.setWrkSts(4);//入库完成
                        taskWrk.setStatus(5);//完结
                        taskWrk.setStatus(TaskStatusType.OVER.id);//完结
                        //更新库位状态
                        LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                        locMast.setLocSts("F");//F.在库
@@ -1750,6 +1751,18 @@
                issuedPut.setTargetPosition(basDevpPositionEnd.getPlcPosition());
                issuedPut.setIsRunning(1);
                issuedPut.setDirection(basDevpPositionEnd.getRgvSign()==1);

                try{
                    if (taskWrk.getIoType()==2){
                        Date now = new Date();
                        taskWrk.setStatus(TaskStatusType.OVER.id);
                        taskWrk.setModiTime(now);//更新时间
                        taskWrk.setCompleteTime(now);//完结时间
                        taskWrkService.updateById(taskWrk);
                    }
                } catch (Exception e){

                }
            } catch (Exception e) {
                log.error("任务生成失败issued1===》异常信息：{}", e.getMessage());
                return false;

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

@@ -57,10 +57,6 @@
    public void execute() throws IOException {
        List<TaskWrk> taskWrkList = taskWrkService.selectToBeHistoryData();
        for (TaskWrk taskWrk : taskWrkList) {
            if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
                log.error("任务档转任务历史档失败" + taskWrk);
                return ;
            }
            JSONObject jsonObject = null;
            String response = null;
            boolean success = false;

 src/main/resources/application.yml

@@ -13,7 +13,8 @@
#    password: sa@123
    driver-class-name: dm.jdbc.driver.DmDriver
#    url: jdbc:dm://27.172.2.101:5236/SOURCE
    url: jdbc:dm://127.0.0.1:5236/SOURCE
    url: jdbc:dm://27.172.2.102:5236/SOURCE
#    url: jdbc:dm://127.0.0.1:5236/SOURCE
    username: SYSDBA
    password: Zy@12345
  mvc:

 src/main/resources/mapper/TaskWrkMapper.xml

@@ -131,7 +131,7 @@
        insert into "SOURCE"."wcs_task_wrk_log"
        select * from "SOURCE"."wcs_task_wrk"
        where "TASK_NO" = #{taskNo}
          and ("STATUS"=5 or "STATUS"=4 or "STATUS"=6 or "STATUS"=7  or "STATUS"=9)
          and ("STATUS"=5 or "STATUS"=4 or "STATUS"=7)
        and ("WRK_NO" not in (select "WRK_NO" from "SOURCE"."asr_bas_devp"))
    </insert>