Junjie
2023-10-14 525047977e8e9074a21567ae9eb5b9f6ac0c07fd
#拣料回库
5个文件已修改
24 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/BasLiftOptService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasLiftOptMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java
@@ -9,4 +9,6 @@
@Repository
public interface BasLiftOptMapper extends BaseMapper<BasLiftOpt> {
    BasLiftOpt selectByDeviceWrk(String deviceWrk);
}
src/main/java/com/zy/asrs/service/BasLiftOptService.java
@@ -5,4 +5,6 @@
public interface BasLiftOptService extends IService<BasLiftOpt> {
    BasLiftOpt selectByDeviceWrk(String deviceWrk);
}
src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java
@@ -9,4 +9,8 @@
@Service("basLiftOptService")
public class BasLiftOptServiceImpl extends ServiceImpl<BasLiftOptMapper, BasLiftOpt> implements BasLiftOptService {
    @Override
    public BasLiftOpt selectByDeviceWrk(String deviceWrk) {
        return this.baseMapper.selectByDeviceWrk(deviceWrk);
    }
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -102,6 +102,8 @@
    private RedisUtil redisUtil;
    @Autowired
    private WrkMastLocMapper wrkMastLocMapper;
    @Autowired
    private BasLiftOptService basLiftOptService;
    /**
@@ -1295,8 +1297,14 @@
                    && liftProtocol.getTaskNo() != 0
                    && !liftProtocol.getBusy()
            ) {
                BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString());
                int taskNo = liftProtocol.getTaskNo().intValue();
                if (basLiftOpt != null) {
                    taskNo = basLiftOpt.getWrkNo();
                }
                //将任务档标记为完成
                WrkMast wrkMast = wrkMastMapper.selectByWorkNo324104(liftProtocol.getTaskNo().intValue());
                WrkMast wrkMast = wrkMastMapper.selectByWorkNo324104(taskNo);
                if (wrkMast != null) {
                    switch (wrkMast.getWrkSts().intValue()) {
                        case 3://3.提升机搬运中 ==> 4.提升机搬运完成
src/main/resources/mapper/BasLiftOptMapper.xml
@@ -17,4 +17,10 @@
    </resultMap>
    <select id="selectByDeviceWrk" resultMap="BaseResultMap">
        select top 1 * from asr_bas_lift_opt
        where device_wrk = #{deviceWrk}
        order by send_time desc
    </select>
</mapper>