自动化立体仓库 - WCS系统
#
LSH
2023-11-16 ee718203195675fe7b1aab64b3c1890efafb8068
#
6个文件已修改
44 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/TaskWrkService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/TaskWrkMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -17,6 +17,8 @@
    TaskWrk selectByWrkNo(Integer wrkNo);
    List<TaskWrk> selectReceive();//获取接收任务
    TaskWrk selectPakIn(@Param("crnNo") Integer crnNo, @Param("workNo") Integer workNo, @Param("startPoint") String startPoint);
    List<TaskWrk> selectPakOut(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);
src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -11,6 +11,8 @@
    TaskWrk selectByWrkNo(Integer wrkNo);
    List<TaskWrk> selectReceive();//获取接收任务
    //派发任务
    void distribute(String taskNo, Long userId);
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -40,6 +40,8 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -91,6 +93,10 @@
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private TaskWrkMapper taskWrkMapper;
    @Autowired
    private TaskWrkService taskWrkService;
    @Autowired
    private ConfigService configService;
    @Value("${wms.url}")
    private String wmsUrl;
@@ -1362,5 +1368,25 @@
        }
    }
    //自动派发任务
    public void autoDistribute() {
        Config config = configService.selectByCode("autoDistribute");
        if (config == null) {
            return;
        }
        if (config.getValue().equals("false")) {//判断是否开启自动派发任务
            return;
        }
        for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
            try {
                taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
            } catch (CoolException e) {
                e.printStackTrace();
            }
        }
    }
}
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -32,6 +32,11 @@
    }
    @Override
    public List<TaskWrk> selectReceive() {
        return this.baseMapper.selectReceive();
    }
    @Override
    @Transactional
    public void distribute(String taskNo, Long userId) {
        TaskWrk taskWrk = this.selectByTaskNo(taskNo);
src/main/java/com/zy/core/MainProcess.java
@@ -68,6 +68,9 @@
                        i = 0;
                    }
                    //自动派发任务
                    mainService.autoDistribute();
                } catch (Exception e) {
                    e.printStackTrace();
                }
src/main/resources/mapper/TaskWrkMapper.xml
@@ -49,6 +49,12 @@
        order by io_pri desc,create_time,wrk_no ASC
    </select>
    <select id="selectReceive" resultMap="BaseResultMap">
        select * from wcs_task_wrk
        where 1=1
        and status = 1
    </select>
    <select id="selectPakOutIoType" resultMap="BaseResultMap">
        select * from dbo.wcs_task_wrk
        where crn_no=#{crnNo}