#
luxiaotao1123
2020-06-13 63b6ae940687d2de076ff74bff9aaa187d843d5d
#
5个文件已修改
11 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/LocMastController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/LocMastMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/service/CommonService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocMastMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -147,6 +147,7 @@
                    for (List<Integer> node : shelves.nodes){
                        if (node.contains(r)) {
                            crnNo = shelves.nodes.indexOf(node) + 1;
                            break;
                        }
                    }
                    LocMast locMast = new LocMast();
src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -4,14 +4,12 @@
import com.zy.asrs.entity.LocMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
    @Select("select top 1 * from asr_loc_mast where row1=#{row} and loc_type='O' order by loc_type desc ,lev1 asc,bay1 asc")
    LocMast queryFreeLocMast(@Param("row") Integer row);
}
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -39,6 +39,10 @@
            wrkDetl.setIoTime(new Date());
            wrkDetl.setMatnr(matCode.getMatNo()); // 物料编号
            wrkDetl.setAnfme((double) dto.getCount()); // 数量
            wrkDetl.setLgnum("待定"); // todo
            wrkDetl.setTbnum(0); // todo
            wrkDetl.setTbpos(0); // todo
            wrkDetl.setZmatid("待定"); // todo
            wrkDetl.setAppeUser(userId);
            wrkDetl.setAppeTime(new Date());
            wrkDetl.setModiUser(userId);
src/main/java/com/zy/common/service/CommonService.java
@@ -100,6 +100,7 @@
            for (List<Integer> node : shelves.nodes){
                if (node.contains(curRow)) {
                    crnNo = shelves.nodes.indexOf(node) + 1;
                    break;
                }
            }
            BasCrnp crnp = basCrnpService.selectById(crnNo);
src/main/resources/mapper/LocMastMapper.xml
@@ -35,4 +35,7 @@
    </resultMap>
    <select id="queryFreeLocMast" resultMap="BaseResultMap">
        select top 1 * from asr_loc_mast where row1=#{row} and loc_type='O' order by loc_type desc ,lev1 asc,bay1 asc
    </select>
</mapper>